aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
committerLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
commit02629d8f87303a03e3ac36f48c508242d9b8cb09 (patch)
tree250a83e0d0e2cf5c7fe49e0a2087f3739f4509c2 /target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch
parent7be0ed78e7cf578aa89996d408703ea2ab79a1e8 (diff)
downloadupstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.gz
upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.bz2
upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.zip
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42463
Diffstat (limited to 'target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch')
-rw-r--r--target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch11
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch b/target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch
index fd06b0bf89..4b16ab2035 100644
--- a/target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch
+++ b/target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch
@@ -11,12 +11,10 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
-diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
-index 8810ce4..4dc3761 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
-@@ -563,6 +563,14 @@
- interrupts = <24>;
+@@ -628,6 +628,14 @@
+ status = "disabled";
};
+ pwm: pwm@01c20e00 {
@@ -28,8 +26,5 @@ index 8810ce4..4dc3761 100644
+ };
+
sid: eeprom@01c23800 {
- compatible = "allwinner,sun4i-a10-sid";
+ compatible = "allwinner,sun4i-sid";
reg = <0x01c23800 0x10>;
---
-2.0.3
-