diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-27 21:52:33 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-27 21:52:33 +0200 |
| commit | 4dc7ed32f398fa76b9e1d243a852420b1dad0150 (patch) | |
| tree | a040f8c006ea7a7a3c962f135c8efd8b72cbc4b4 /arch | |
| parent | Merge tag 'v3.18-rockchip-cpuclk' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | clk: sunxi: Add sun8i MBUS clock support (diff) | |
| download | linux-4dc7ed32f398fa76b9e1d243a852420b1dad0150.tar.xz linux-4dc7ed32f398fa76b9e1d243a852420b1dad0150.zip | |
Merge tag 'sunxi-clocks-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next
Allwinner Clocks Additions for 3.18
The most important part of this serie is the addition of the phase API to
handle the MMC clocks in the Allwinner SoCs.
Apart from that, the A23 gained a new mbus driver, and there's a fix for a
incorrect divider table on the APB0 clock.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a10s.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a13.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun7i-a20.dtsi | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index 24b0ad3a7c07..82094283473d 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -287,7 +287,7 @@ mbus_clk: clk@01c2015c { #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-mod0-clk"; + compatible = "allwinner,sun5i-a13-mbus-clk"; reg = <0x01c2015c 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "mbus"; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index bf86e65dd167..53e0e72a9d32 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -285,7 +285,7 @@ mbus_clk: clk@01c2015c { #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-mod0-clk"; + compatible = "allwinner,sun5i-a13-mbus-clk"; reg = <0x01c2015c 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "mbus"; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 4011628c7381..2edef89ef0a5 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -346,7 +346,7 @@ mbus_clk: clk@01c2015c { #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-mod0-clk"; + compatible = "allwinner,sun5i-a13-mbus-clk"; reg = <0x01c2015c 0x4>; clocks = <&osc24M>, <&pll6 2>, <&pll5 1>; clock-output-names = "mbus"; |