diff options
author | Dinh Nguyen <dinguyen@altera.com> | 2014-02-19 15:56:38 -0500 |
---|---|---|
committer | Dinh Nguyen <dinguyen@altera.com> | 2014-03-02 15:58:08 -0500 |
commit | f1ce1a99f289474cf047923981369d5ba140c125 (patch) | |
tree | aa2f3c7f5502f37dc4e9b196d965cec2180d1808 | |
parent | 73960387b22dfb3f9088852cc41f1a995cd0b502 (diff) |
dts: socfpga: Update clock entry to support multiple parents
The periph_pll and sdram_pll can have multiple parents. Update the device tree
to list all the possible parents for the PLLs. Add an entry for the the
f2s_sdram_ref_clk, which is a possible parent for the sdram_pll.
Also remove the clock-frequency entry in the f2s_periph_ref_clk, as this
property should be placed in dts file.
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
-rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 3796141fb8bd..3ce09e39dc9c 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi | |||
@@ -92,7 +92,12 @@ | |||
92 | #address-cells = <1>; | 92 | #address-cells = <1>; |
93 | #size-cells = <0>; | 93 | #size-cells = <0>; |
94 | 94 | ||
95 | osc: osc1 { | 95 | osc1: osc1 { |
96 | #clock-cells = <0>; | ||
97 | compatible = "fixed-clock"; | ||
98 | }; | ||
99 | |||
100 | osc2: osc2 { | ||
96 | #clock-cells = <0>; | 101 | #clock-cells = <0>; |
97 | compatible = "fixed-clock"; | 102 | compatible = "fixed-clock"; |
98 | }; | 103 | }; |
@@ -100,7 +105,11 @@ | |||
100 | f2s_periph_ref_clk: f2s_periph_ref_clk { | 105 | f2s_periph_ref_clk: f2s_periph_ref_clk { |
101 | #clock-cells = <0>; | 106 | #clock-cells = <0>; |
102 | compatible = "fixed-clock"; | 107 | compatible = "fixed-clock"; |
103 | clock-frequency = <10000000>; | 108 | }; |
109 | |||
110 | f2s_sdram_ref_clk: f2s_sdram_ref_clk { | ||
111 | #clock-cells = <0>; | ||
112 | compatible = "fixed-clock"; | ||
104 | }; | 113 | }; |
105 | 114 | ||
106 | main_pll: main_pll { | 115 | main_pll: main_pll { |
@@ -108,7 +117,7 @@ | |||
108 | #size-cells = <0>; | 117 | #size-cells = <0>; |
109 | #clock-cells = <0>; | 118 | #clock-cells = <0>; |
110 | compatible = "altr,socfpga-pll-clock"; | 119 | compatible = "altr,socfpga-pll-clock"; |
111 | clocks = <&osc>; | 120 | clocks = <&osc1>; |
112 | reg = <0x40>; | 121 | reg = <0x40>; |
113 | 122 | ||
114 | mpuclk: mpuclk { | 123 | mpuclk: mpuclk { |
@@ -162,7 +171,7 @@ | |||
162 | #size-cells = <0>; | 171 | #size-cells = <0>; |
163 | #clock-cells = <0>; | 172 | #clock-cells = <0>; |
164 | compatible = "altr,socfpga-pll-clock"; | 173 | compatible = "altr,socfpga-pll-clock"; |
165 | clocks = <&osc>; | 174 | clocks = <&osc1>, <&osc2>, <&f2s_periph_ref_clk>; |
166 | reg = <0x80>; | 175 | reg = <0x80>; |
167 | 176 | ||
168 | emac0_clk: emac0_clk { | 177 | emac0_clk: emac0_clk { |
@@ -213,7 +222,7 @@ | |||
213 | #size-cells = <0>; | 222 | #size-cells = <0>; |
214 | #clock-cells = <0>; | 223 | #clock-cells = <0>; |
215 | compatible = "altr,socfpga-pll-clock"; | 224 | compatible = "altr,socfpga-pll-clock"; |
216 | clocks = <&osc>; | 225 | clocks = <&osc1>, <&osc2>, <&f2s_sdram_ref_clk>; |
217 | reg = <0xC0>; | 226 | reg = <0xC0>; |
218 | 227 | ||
219 | ddr_dqs_clk: ddr_dqs_clk { | 228 | ddr_dqs_clk: ddr_dqs_clk { |