kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 252-2-dt-sun7i-add-pwm-support.patch

diff --git a/target/linux/sunxi/patches-3.14/252-2-dt-sun7i-add-pwm-support.patch b/target/linux/sunxi/patches-3.14/252-2-dt-sun7i-add-pwm-support.patch
index 3bb1186523d7e855a2d2efb70c527c1247158317..dc9636b904fe9a458c3e4efa58d505b9afb626f7 100644 (file)
--- a/target/linux/sunxi/patches-3.14/252-2-dt-sun7i-add-pwm-support.patch
+++ b/target/linux/sunxi/patches-3.14/252-2-dt-sun7i-add-pwm-support.patch
@@ -11,12 +11,10 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index 2eaf7c0f..61a4b5e 100644
 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
-@@ -706,6 +706,14 @@
-                       interrupts = <0 24 4>;
+@@ -764,6 +764,14 @@
+                       status = "disabled";
                };
  
 +              pwm: pwm@01c20e00 {
@@ -30,6 +28,3 @@ index 2eaf7c0f..61a4b5e 100644
                sid: eeprom@01c23800 {
                        compatible = "allwinner,sun7i-a20-sid";
                        reg = <0x01c23800 0x200>;
--- 
-2.0.3
-