diff options
| author | Michael Turquette <mturquette@linaro.org> | 2014-11-25 03:08:53 +0100 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2014-11-25 03:08:53 +0100 |
| commit | b082915c9d4b15590558766979aed78424690057 (patch) | |
| tree | 22ea44f38cefc5954b5bebf63c845b409eac13a6 /arch/arm/boot/dts/sun5i-a13.dtsi | |
| parent | Merge branch 'clk-fixes' into clk-next (diff) | |
| parent | clk: sunxi: gmac-tx-clk mux is not a CLK_MUX_INDEX_BIT mux (diff) | |
| download | linux-b082915c9d4b15590558766979aed78424690057.tar.xz linux-b082915c9d4b15590558766979aed78424690057.zip | |
Merge tag 'sunxi-clocks-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next
Allwinner Clocks additions for 3.19
A few patches that should go through the clock tree, mostly fixes, cleanups,
and new clocks additions to start to support the A80.
Diffstat (limited to 'arch/arm/boot/dts/sun5i-a13.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a13.dtsi | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index b131068f4f35..c35217ea1f64 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -161,19 +161,11 @@ clock-output-names = "apb0_codec", "apb0_pio", "apb0_ir"; }; - apb1_mux: apb1_mux@01c20058 { - #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-apb1-mux-clk"; - reg = <0x01c20058 0x4>; - clocks = <&osc24M>, <&pll6 1>, <&osc32k>; - clock-output-names = "apb1_mux"; - }; - - apb1: apb1@01c20058 { + apb1: clk@01c20058 { #clock-cells = <0>; compatible = "allwinner,sun4i-a10-apb1-clk"; reg = <0x01c20058 0x4>; - clocks = <&apb1_mux>; + clocks = <&osc24M>, <&pll6 1>, <&osc32k>; clock-output-names = "apb1"; }; |