projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-a23.dtsi
diff --git
a/arch/arm/boot/dts/sun8i-a23.dtsi
b/arch/arm/boot/dts/sun8i-a23.dtsi
index
6086adb
..
0746cd1
100644
(file)
--- a/
arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/
arch/arm/boot/dts/sun8i-a23.dtsi
@@
-189,19
+189,11
@@
"apb1_daudio0", "apb1_daudio1";
};
"apb1_daudio0", "apb1_daudio1";
};
- apb2
_mux: apb2_mux_
clk@01c20058 {
+ apb2
:
clk@01c20058 {
#clock-cells = <0>;
#clock-cells = <0>;
- compatible = "allwinner,sun4i-a10-apb1-
mux-
clk";
+ compatible = "allwinner,sun4i-a10-apb1-clk";
reg = <0x01c20058 0x4>;
clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
reg = <0x01c20058 0x4>;
clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
- clock-output-names = "apb2_mux";
- };
-
- apb2: apb2_clk@01c20058 {
- #clock-cells = <0>;
- compatible = "allwinner,sun6i-a31-apb2-div-clk";
- reg = <0x01c20058 0x4>;
- clocks = <&apb2_mux>;
clock-output-names = "apb2";
};
clock-output-names = "apb2";
};