kernel: update 4.1 to 4.1.5

[openwrt/svn-archive/archive.git] / target / linux / sunxi / patches-4.1 / 164-2-dt-add-codec-clock-into-dtsi.patch

diff --git a/target/linux/sunxi/patches-4.1/164-2-dt-add-codec-clock-into-dtsi.patch b/target/linux/sunxi/patches-4.1/164-2-dt-add-codec-clock-into-dtsi.patch
index 05ddd4babc1548b6e665826bb2bab0a9a6795b5a..d80eae7e0b8eff3ff74e23d8008803b74ee65ebb 100644 (file)
--- a/target/linux/sunxi/patches-4.1/164-2-dt-add-codec-clock-into-dtsi.patch
+++ b/target/linux/sunxi/patches-4.1/164-2-dt-add-codec-clock-into-dtsi.patch
@@ -17,11 +17,9 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++
  3 files changed, 24 insertions(+)
 
  arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++
  3 files changed, 24 insertions(+)
 

-diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
-index fab13af..abea24e 100644

 --- a/arch/arm/boot/dts/sun4i-a10.dtsi
 +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
 --- a/arch/arm/boot/dts/sun4i-a10.dtsi
 +++ b/arch/arm/boot/dts/sun4i-a10.dtsi

-@@ -454,6 +454,14 @@
+@@ -420,6 +420,14 @@

                        clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
                        clock-output-names = "spi3";
                };
                        clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
                        clock-output-names = "spi3";
                };


@@ -36,11 +34,9 @@ index fab13af..abea24e 100644
        };
  
        soc@01c00000 {
        };
  
        soc@01c00000 {

-diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
-index a4b6a66..5c0edd6 100644

 --- a/arch/arm/boot/dts/sun5i-a13.dtsi
 +++ b/arch/arm/boot/dts/sun5i-a13.dtsi
 --- a/arch/arm/boot/dts/sun5i-a13.dtsi
 +++ b/arch/arm/boot/dts/sun5i-a13.dtsi

-@@ -292,6 +292,14 @@
+@@ -350,6 +350,14 @@

                        clock-output-names = "usb_ohci0", "usb_phy";
                };
  
                        clock-output-names = "usb_ohci0", "usb_phy";
                };
  


@@ -55,11 +51,9 @@ index a4b6a66..5c0edd6 100644
                mbus_clk: clk@01c2015c {
                        #clock-cells = <0>;
                        compatible = "allwinner,sun5i-a13-mbus-clk";
                mbus_clk: clk@01c2015c {
                        #clock-cells = <0>;
                        compatible = "allwinner,sun5i-a13-mbus-clk";

-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index 12d9ffd..400e696 100644

 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi

-@@ -468,6 +468,14 @@
+@@ -464,6 +464,14 @@

                        clock-output-names = "spi3";
                };
  
                        clock-output-names = "spi3";
                };