summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/sun5i-a10s.dtsi
diff options
context:
space:
mode:
authorEmilio López <emilio@elopez.com.ar>2014-11-06 11:40:30 +0800
committerMaxime Ripard <maxime.ripard@free-electrons.com>2014-11-23 17:02:55 +0100
commitacbcc0f03b15585387f9ca69c2a976b02cb69023 (patch)
treee9fb232a6d5d07429af14d5057581dc380b75e42 /arch/arm/boot/dts/sun5i-a10s.dtsi
parent93746e70be83a3f113134a16065957b324af50f7 (diff)
downloadop-kernel-dev-acbcc0f03b15585387f9ca69c2a976b02cb69023.zip
op-kernel-dev-acbcc0f03b15585387f9ca69c2a976b02cb69023.tar.gz
ARM: dts: sunxi: unify APB1 clock
With the new factors infrastructure in place, we can unify apb1 and apb1_mux as a single clock now. Signed-off-by: Emilio López <emilio@elopez.com.ar> [wens@csie.org: Change apb1 node label to "apb1"; reword commit title] Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/sun5i-a10s.dtsi')
-rw-r--r--arch/arm/boot/dts/sun5i-a10s.dtsi12
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 531272c..d2a8514 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -162,19 +162,11 @@
"apb0_ir", "apb0_keypad";
};
- 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";
};
OpenPOWER on IntegriCloud