diff options
author | Nicolin Chen <b42378@freescale.com> | 2013-08-22 06:04:12 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:01:25 -0400 |
commit | 55f67e77b7aa57e4c95393ab774a91d79fba4ae8 (patch) | |
tree | f7e41e8337958bb10466c6979c222336d81380a7 /arch | |
parent | 4e8bafc4ae02deadde4fb049bab699468242e4ed (diff) |
ENGR00276249-1 ARM: imx6q: Add missing baud clock for ssi
The ssi_ipg is essential when accessing ssi register, while the baud clock
allows ssi to provide output bclk and lrclk derived from it. Thus add it.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 9 | ||||
-rw-r--r-- | arch/arm/mach-imx/clk-imx6q.c | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index b6fe966cb6f0..a39b55fd556a 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi | |||
@@ -204,7 +204,8 @@ | |||
204 | compatible = "fsl,imx6q-ssi","fsl,imx21-ssi"; | 204 | compatible = "fsl,imx6q-ssi","fsl,imx21-ssi"; |
205 | reg = <0x02028000 0x4000>; | 205 | reg = <0x02028000 0x4000>; |
206 | interrupts = <0 46 0x04>; | 206 | interrupts = <0 46 0x04>; |
207 | clocks = <&clks 178>; | 207 | clocks = <&clks 178>, <&clks 157>; |
208 | clock-names = "ipg", "baud"; | ||
208 | dmas = <&sdma 37 1 0>, | 209 | dmas = <&sdma 37 1 0>, |
209 | <&sdma 38 1 0>; | 210 | <&sdma 38 1 0>; |
210 | dma-names = "rx", "tx"; | 211 | dma-names = "rx", "tx"; |
@@ -215,7 +216,8 @@ | |||
215 | compatible = "fsl,imx6q-ssi","fsl,imx21-ssi"; | 216 | compatible = "fsl,imx6q-ssi","fsl,imx21-ssi"; |
216 | reg = <0x0202c000 0x4000>; | 217 | reg = <0x0202c000 0x4000>; |
217 | interrupts = <0 47 0x04>; | 218 | interrupts = <0 47 0x04>; |
218 | clocks = <&clks 179>; | 219 | clocks = <&clks 179>, <&clks 158>; |
220 | clock-names = "ipg", "baud"; | ||
219 | dmas = <&sdma 41 1 0>, | 221 | dmas = <&sdma 41 1 0>, |
220 | <&sdma 42 1 0>; | 222 | <&sdma 42 1 0>; |
221 | dma-names = "rx", "tx"; | 223 | dma-names = "rx", "tx"; |
@@ -226,7 +228,8 @@ | |||
226 | compatible = "fsl,imx6q-ssi","fsl,imx21-ssi"; | 228 | compatible = "fsl,imx6q-ssi","fsl,imx21-ssi"; |
227 | reg = <0x02030000 0x4000>; | 229 | reg = <0x02030000 0x4000>; |
228 | interrupts = <0 48 0x04>; | 230 | interrupts = <0 48 0x04>; |
229 | clocks = <&clks 180>; | 231 | clocks = <&clks 180>, <&clks 159>; |
232 | clock-names = "ipg", "baud"; | ||
230 | dmas = <&sdma 45 1 0>, | 233 | dmas = <&sdma 45 1 0>, |
231 | <&sdma 46 1 0>; | 234 | <&sdma 46 1 0>; |
232 | dma-names = "rx", "tx"; | 235 | dma-names = "rx", "tx"; |
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index 3844e5230798..7960b2a3832a 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c | |||
@@ -399,6 +399,9 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) | |||
399 | clk[ssi1_ipg] = imx_clk_gate2("ssi1_ipg", "ipg", base + 0x7c, 18); | 399 | clk[ssi1_ipg] = imx_clk_gate2("ssi1_ipg", "ipg", base + 0x7c, 18); |
400 | clk[ssi2_ipg] = imx_clk_gate2("ssi2_ipg", "ipg", base + 0x7c, 20); | 400 | clk[ssi2_ipg] = imx_clk_gate2("ssi2_ipg", "ipg", base + 0x7c, 20); |
401 | clk[ssi3_ipg] = imx_clk_gate2("ssi3_ipg", "ipg", base + 0x7c, 22); | 401 | clk[ssi3_ipg] = imx_clk_gate2("ssi3_ipg", "ipg", base + 0x7c, 22); |
402 | clk[ssi1] = imx_clk_gate2("ssi1", "ssi1_podf", base + 0x7c, 18); | ||
403 | clk[ssi2] = imx_clk_gate2("ssi2", "ssi2_podf", base + 0x7c, 20); | ||
404 | clk[ssi3] = imx_clk_gate2("ssi3", "ssi3_podf", base + 0x7c, 22); | ||
402 | clk[uart_ipg] = imx_clk_gate2("uart_ipg", "ipg", base + 0x7c, 24); | 405 | clk[uart_ipg] = imx_clk_gate2("uart_ipg", "ipg", base + 0x7c, 24); |
403 | clk[uart_serial] = imx_clk_gate2("uart_serial", "uart_serial_podf", base + 0x7c, 26); | 406 | clk[uart_serial] = imx_clk_gate2("uart_serial", "uart_serial_podf", base + 0x7c, 26); |
404 | clk[usboh3] = imx_clk_gate2("usboh3", "ipg", base + 0x80, 0); | 407 | clk[usboh3] = imx_clk_gate2("usboh3", "ipg", base + 0x80, 0); |