mirror of
https://github.com/torvalds/linux
synced 2024-10-21 02:39:51 +00:00
Revert "ARM: dts: sunxi: unify APB1 clock"
This reverts commit e883d67285
.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: http://lkml.kernel.org/r/7h1toxr0ku.fsf@deeprootsystems.com
This commit is contained in:
parent
3fd0c05da4
commit
da1a759213
|
@ -174,11 +174,19 @@ apb0_gates: clk@01c20068 {
|
|||
"apb0_ir1", "apb0_keypad";
|
||||
};
|
||||
|
||||
apb1: clk@01c20058 {
|
||||
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 {
|
||||
#clock-cells = <0>;
|
||||
compatible = "allwinner,sun4i-a10-apb1-clk";
|
||||
reg = <0x01c20058 0x4>;
|
||||
clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
|
||||
clocks = <&apb1_mux>;
|
||||
clock-output-names = "apb1";
|
||||
};
|
||||
|
||||
|
|
|
@ -162,11 +162,19 @@ apb0_gates: clk@01c20068 {
|
|||
"apb0_ir", "apb0_keypad";
|
||||
};
|
||||
|
||||
apb1: clk@01c20058 {
|
||||
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 {
|
||||
#clock-cells = <0>;
|
||||
compatible = "allwinner,sun4i-a10-apb1-clk";
|
||||
reg = <0x01c20058 0x4>;
|
||||
clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
|
||||
clocks = <&apb1_mux>;
|
||||
clock-output-names = "apb1";
|
||||
};
|
||||
|
||||
|
|
|
@ -161,11 +161,19 @@ apb0_gates: clk@01c20068 {
|
|||
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-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 = <&osc24M>, <&pll6 1>, <&osc32k>;
|
||||
clocks = <&apb1_mux>;
|
||||
clock-output-names = "apb1";
|
||||
};
|
||||
|
||||
|
|
|
@ -222,11 +222,19 @@ apb0_gates: clk@01c20068 {
|
|||
"apb0_iis2", "apb0_keypad";
|
||||
};
|
||||
|
||||
apb1: clk@01c20058 {
|
||||
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 {
|
||||
#clock-cells = <0>;
|
||||
compatible = "allwinner,sun4i-a10-apb1-clk";
|
||||
reg = <0x01c20058 0x4>;
|
||||
clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
|
||||
clocks = <&apb1_mux>;
|
||||
clock-output-names = "apb1";
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue