aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-4.1/164-2-dt-add-codec-clock-into-dtsi.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
commit098f187e7870684bfaaa53a1fdfc9682cc1e0dae (patch)
treee4f67db9483b1ce0d774fc67ab46a18171579338 /target/linux/sunxi/patches-4.1/164-2-dt-add-codec-clock-into-dtsi.patch
parentbbf13d61b7377b5114d9c716b7326f3f2bc468c1 (diff)
downloadmaster-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.gz
master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.bz2
master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.zip
kernel: update 4.1 to 4.1.5
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-4.1/164-2-dt-add-codec-clock-into-dtsi.patch')
-rw-r--r--target/linux/sunxi/patches-4.1/164-2-dt-add-codec-clock-into-dtsi.patch12
1 files changed, 3 insertions, 9 deletions
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 05ddd4babc..d80eae7e0b 100644
--- 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(+)
-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
-@@ -454,6 +454,14 @@
+@@ -420,6 +420,14 @@
clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
clock-output-names = "spi3";
};
@@ -36,11 +34,9 @@ index fab13af..abea24e 100644
};
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
-@@ -292,6 +292,14 @@
+@@ -350,6 +350,14 @@
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";
-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
-@@ -468,6 +468,14 @@
+@@ -464,6 +464,14 @@
clock-output-names = "spi3";
};