diff options
| author | Arnd Bergmann | 2014-11-24 22:06:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2014-11-24 22:07:57 +0100 |
| commit | da1a7592132eb8f71056bd168fccbe2801c5d697 (patch) | |
| tree | f385089b3de6a15e7a42bb4b4227d9822808c369 /arch/arm/boot/dts/sun5i-a13.dtsi | |
| parent | Revert "ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks." (diff) | |
| download | kernel-qcow2-linux-da1a7592132eb8f71056bd168fccbe2801c5d697.tar.gz kernel-qcow2-linux-da1a7592132eb8f71056bd168fccbe2801c5d697.tar.xz kernel-qcow2-linux-da1a7592132eb8f71056bd168fccbe2801c5d697.zip | |
Revert "ARM: dts: sunxi: unify APB1 clock"
This reverts commit e883d67285e9267c73f8d2b9d32aa9e712ad00a4.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: http://lkml.kernel.org/r/7h1toxr0ku.fsf@deeprootsystems.com
Diffstat (limited to 'arch/arm/boot/dts/sun5i-a13.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a13.dtsi | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index c35217ea1f64..b131068f4f35 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -161,11 +161,19 @@ clock-output-names = "apb0_codec", "apb0_pio", "apb0_ir"; }; - apb1: clk@01c20058 { + apb1_mux: apb1_mux@01c20058 { #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-apb1-clk"; + compatible = "allwinner,sun4i-a10-apb1-mux-clk"; reg = <0x01c20058 0x4>; clocks = <&osc24M>, <&pll6 1>, <&osc32k>; + clock-output-names = "apb1_mux"; + }; + + apb1: apb1@01c20058 { + #clock-cells = <0>; + compatible = "allwinner,sun4i-a10-apb1-clk"; + reg = <0x01c20058 0x4>; + clocks = <&apb1_mux>; clock-output-names = "apb1"; }; |