Commit f6c3b046 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard

ARM: sun6i: DT: Add PLL6 multiple outputs

PLL6 on sun6i has multiple outputs, just like the other sunxi platforms.
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent ba61e893
...@@ -132,11 +132,11 @@ pll1: clk@01c20000 { ...@@ -132,11 +132,11 @@ pll1: clk@01c20000 {
}; };
pll6: clk@01c20028 { pll6: clk@01c20028 {
#clock-cells = <0>; #clock-cells = <1>;
compatible = "allwinner,sun6i-a31-pll6-clk"; compatible = "allwinner,sun6i-a31-pll6-clk";
reg = <0x01c20028 0x4>; reg = <0x01c20028 0x4>;
clocks = <&osc24M>; clocks = <&osc24M>;
clock-output-names = "pll6"; clock-output-names = "pll6", "pll6x2";
}; };
cpu: cpu@01c20050 { cpu: cpu@01c20050 {
...@@ -166,7 +166,7 @@ ahb1_mux: ahb1_mux@01c20054 { ...@@ -166,7 +166,7 @@ ahb1_mux: ahb1_mux@01c20054 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun6i-a31-ahb1-mux-clk"; compatible = "allwinner,sun6i-a31-ahb1-mux-clk";
reg = <0x01c20054 0x4>; reg = <0x01c20054 0x4>;
clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>; clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>;
clock-output-names = "ahb1_mux"; clock-output-names = "ahb1_mux";
}; };
...@@ -221,7 +221,7 @@ apb2_mux: apb2_mux@01c20058 { ...@@ -221,7 +221,7 @@ apb2_mux: apb2_mux@01c20058 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-apb1-mux-clk"; compatible = "allwinner,sun4i-a10-apb1-mux-clk";
reg = <0x01c20058 0x4>; reg = <0x01c20058 0x4>;
clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
clock-output-names = "apb2_mux"; clock-output-names = "apb2_mux";
}; };
...@@ -248,7 +248,7 @@ mmc0_clk: clk@01c20088 { ...@@ -248,7 +248,7 @@ mmc0_clk: clk@01c20088 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-mod0-clk"; compatible = "allwinner,sun4i-a10-mod0-clk";
reg = <0x01c20088 0x4>; reg = <0x01c20088 0x4>;
clocks = <&osc24M>, <&pll6>; clocks = <&osc24M>, <&pll6 0>;
clock-output-names = "mmc0"; clock-output-names = "mmc0";
}; };
...@@ -256,7 +256,7 @@ mmc1_clk: clk@01c2008c { ...@@ -256,7 +256,7 @@ mmc1_clk: clk@01c2008c {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-mod0-clk"; compatible = "allwinner,sun4i-a10-mod0-clk";
reg = <0x01c2008c 0x4>; reg = <0x01c2008c 0x4>;
clocks = <&osc24M>, <&pll6>; clocks = <&osc24M>, <&pll6 0>;
clock-output-names = "mmc1"; clock-output-names = "mmc1";
}; };
...@@ -264,7 +264,7 @@ mmc2_clk: clk@01c20090 { ...@@ -264,7 +264,7 @@ mmc2_clk: clk@01c20090 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-mod0-clk"; compatible = "allwinner,sun4i-a10-mod0-clk";
reg = <0x01c20090 0x4>; reg = <0x01c20090 0x4>;
clocks = <&osc24M>, <&pll6>; clocks = <&osc24M>, <&pll6 0>;
clock-output-names = "mmc2"; clock-output-names = "mmc2";
}; };
...@@ -272,7 +272,7 @@ mmc3_clk: clk@01c20094 { ...@@ -272,7 +272,7 @@ mmc3_clk: clk@01c20094 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-mod0-clk"; compatible = "allwinner,sun4i-a10-mod0-clk";
reg = <0x01c20094 0x4>; reg = <0x01c20094 0x4>;
clocks = <&osc24M>, <&pll6>; clocks = <&osc24M>, <&pll6 0>;
clock-output-names = "mmc3"; clock-output-names = "mmc3";
}; };
...@@ -280,7 +280,7 @@ spi0_clk: clk@01c200a0 { ...@@ -280,7 +280,7 @@ spi0_clk: clk@01c200a0 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-mod0-clk"; compatible = "allwinner,sun4i-a10-mod0-clk";
reg = <0x01c200a0 0x4>; reg = <0x01c200a0 0x4>;
clocks = <&osc24M>, <&pll6>; clocks = <&osc24M>, <&pll6 0>;
clock-output-names = "spi0"; clock-output-names = "spi0";
}; };
...@@ -288,7 +288,7 @@ spi1_clk: clk@01c200a4 { ...@@ -288,7 +288,7 @@ spi1_clk: clk@01c200a4 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-mod0-clk"; compatible = "allwinner,sun4i-a10-mod0-clk";
reg = <0x01c200a4 0x4>; reg = <0x01c200a4 0x4>;
clocks = <&osc24M>, <&pll6>; clocks = <&osc24M>, <&pll6 0>;
clock-output-names = "spi1"; clock-output-names = "spi1";
}; };
...@@ -296,7 +296,7 @@ spi2_clk: clk@01c200a8 { ...@@ -296,7 +296,7 @@ spi2_clk: clk@01c200a8 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-mod0-clk"; compatible = "allwinner,sun4i-a10-mod0-clk";
reg = <0x01c200a8 0x4>; reg = <0x01c200a8 0x4>;
clocks = <&osc24M>, <&pll6>; clocks = <&osc24M>, <&pll6 0>;
clock-output-names = "spi2"; clock-output-names = "spi2";
}; };
...@@ -304,7 +304,7 @@ spi3_clk: clk@01c200ac { ...@@ -304,7 +304,7 @@ spi3_clk: clk@01c200ac {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-mod0-clk"; compatible = "allwinner,sun4i-a10-mod0-clk";
reg = <0x01c200ac 0x4>; reg = <0x01c200ac 0x4>;
clocks = <&osc24M>, <&pll6>; clocks = <&osc24M>, <&pll6 0>;
clock-output-names = "spi3"; clock-output-names = "spi3";
}; };
...@@ -364,7 +364,7 @@ dma: dma-controller@01c02000 { ...@@ -364,7 +364,7 @@ dma: dma-controller@01c02000 {
/* DMA controller requires AHB1 clocked from PLL6 */ /* DMA controller requires AHB1 clocked from PLL6 */
assigned-clocks = <&ahb1_mux>; assigned-clocks = <&ahb1_mux>;
assigned-clock-parents = <&pll6>; assigned-clock-parents = <&pll6 0>;
}; };
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
...@@ -844,7 +844,7 @@ prcm@01f01400 { ...@@ -844,7 +844,7 @@ prcm@01f01400 {
ar100: ar100_clk { ar100: ar100_clk {
compatible = "allwinner,sun6i-a31-ar100-clk"; compatible = "allwinner,sun6i-a31-ar100-clk";
#clock-cells = <0>; #clock-cells = <0>;
clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
clock-output-names = "ar100"; clock-output-names = "ar100";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment