diff options
author | Zoltan HERPAI <wigyori@uid0.hu> | 2014-08-27 12:09:46 +0000 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2014-08-27 12:09:46 +0000 |
commit | d0d3be5d8287ff737cfe4381c44706f1d8f7b881 (patch) | |
tree | ab287cf326cc235e7ee9161a13b57f4bd0fecc5b /target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch | |
parent | 6e912a1e62ebb1ab2fdd3f63bff61936be65a84b (diff) | |
download | master-187ad058-d0d3be5d8287ff737cfe4381c44706f1d8f7b881.tar.gz master-187ad058-d0d3be5d8287ff737cfe4381c44706f1d8f7b881.tar.bz2 master-187ad058-d0d3be5d8287ff737cfe4381c44706f1d8f7b881.zip |
sunxi: initial 3.14 patchset
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42313 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch')
-rw-r--r-- | target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch b/target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch new file mode 100644 index 0000000000..6b14459100 --- /dev/null +++ b/target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch @@ -0,0 +1,56 @@ +From 95c1fe603fbea0fd01d98262bd5ff7d5442a86db Mon Sep 17 00:00:00 2001 +From: Maxime Ripard <maxime.ripard@free-electrons.com> +Date: Mon, 24 Feb 2014 17:29:06 +0100 +Subject: [PATCH] ARM: sun6i: dt: Fix mod0 compatible + +The module 0 clock compatibles were changed between the time the patch was sent +and it was merged. Update the compatibles. + +Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> +--- + arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi +index af6f87c..42f310a 100644 +--- a/arch/arm/boot/dts/sun6i-a31.dtsi ++++ b/arch/arm/boot/dts/sun6i-a31.dtsi +@@ -200,7 +200,7 @@ + + spi0_clk: clk@01c200a0 { + #clock-cells = <0>; +- compatible = "allwinner,sun4i-mod0-clk"; ++ compatible = "allwinner,sun4i-a10-mod0-clk"; + reg = <0x01c200a0 0x4>; + clocks = <&osc24M>, <&pll6>; + clock-output-names = "spi0"; +@@ -208,7 +208,7 @@ + + spi1_clk: clk@01c200a4 { + #clock-cells = <0>; +- compatible = "allwinner,sun4i-mod0-clk"; ++ compatible = "allwinner,sun4i-a10-mod0-clk"; + reg = <0x01c200a4 0x4>; + clocks = <&osc24M>, <&pll6>; + clock-output-names = "spi1"; +@@ -216,7 +216,7 @@ + + spi2_clk: clk@01c200a8 { + #clock-cells = <0>; +- compatible = "allwinner,sun4i-mod0-clk"; ++ compatible = "allwinner,sun4i-a10-mod0-clk"; + reg = <0x01c200a8 0x4>; + clocks = <&osc24M>, <&pll6>; + clock-output-names = "spi2"; +@@ -224,7 +224,7 @@ + + spi3_clk: clk@01c200ac { + #clock-cells = <0>; +- compatible = "allwinner,sun4i-mod0-clk"; ++ compatible = "allwinner,sun4i-a10-mod0-clk"; + reg = <0x01c200ac 0x4>; + clocks = <&osc24M>, <&pll6>; + clock-output-names = "spi3"; +-- +2.0.3 + |