rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Fix ARM dt compilation error

Browse Source
This commit is contained in:
Laura Abbott 2015-11-06 14:19:09 -08:00
parent cddb783d0d
commit 6828a7a112
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Revert-ARM-dts-twl4030-Add-iio-properties-for-bci-su.patch Normal file
View File

@ -0,0 +1,37 @@
From ebcb3fbbf9ce01d641e5e0ea7d232a6cc225fb96 Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@kernel.org>
Date: Fri, 6 Nov 2015 17:13:50 +0100
Subject: [PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci
subnode"
This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
which breaks the omap3 device tree build due to a wrong reference.
I accidently queued this change via the power supply subsystem while
telling Marek at the same time, that it should go through Tony's tree.
Following that I did miss Stephen's messages about the build failure in
linux-next and since he switched to merging an older snapshot nobody
else noticed the problem in my tree. I didn't notice myself, since I
did not build any device tree files assuming none have changed by me.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
arch/arm/boot/dts/twl4030.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 482b7aa..36ae916 100644
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -22,8 +22,6 @@
charger: bci {
compatible = "ti,twl4030-bci";
interrupts = <9>, <2>;
- io-channels = <&twl4030_madc 11>;
- io-channel-name = "vac";
bci3v1-supply = <&vusb3v1>;
};
--
2.5.0

7
kernel.spec
View File

@ -40,7 +40,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and # For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
# #
%global baserelease 1 %global baserelease 2
%global fedora_build %{baserelease} %global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching # base_sublevel is the kernel version we're starting with and patching
@ -593,6 +593,8 @@ Patch510: 0001-iwlwifi-Add-new-PCI-IDs-for-the-8260-series.patch
#CVE-2015-7990 rhbz 1276437 1276438 #CVE-2015-7990 rhbz 1276437 1276438
Patch511: RDS-fix-race-condition-when-sending-a-message-on-unb.patch Patch511: RDS-fix-race-condition-when-sending-a-message-on-unb.patch
Patch512: Revert-ARM-dts-twl4030-Add-iio-properties-for-bci-su.patch
# END OF PATCH DEFINITIONS # END OF PATCH DEFINITIONS
%endif %endif
@ -2036,6 +2038,9 @@ fi
# #
# #
%changelog %changelog
* Fri Nov 06 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git4.2
- Fix ARM dt compilation error
* Fri Nov 06 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git4.1 * Fri Nov 06 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git4.1
- Linux v4.3-7965-gd1e41ff - Linux v4.3-7965-gd1e41ff