tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: imx6: change the core clock of spdif

The correct core clock of spdif is SPDIF_GCLK, which is added to
clock tree. So the dts also need to be updated.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Shengjiu Wang and committed by
Shawn Guo 833f2cbf 65425265

+23 -7
+6 -6
arch/arm/boot/dts/imx6qdl.dtsi
··· 218 218 dmas = <&sdma 14 18 0>, 219 219 <&sdma 15 18 0>; 220 220 dma-names = "rx", "tx"; 221 - clocks = <&clks IMX6QDL_CLK_SPDIF>, <&clks IMX6QDL_CLK_OSC>, 222 - <&clks IMX6QDL_CLK_SPDIF>, <&clks IMX6QDL_CLK_DUMMY>, 223 - <&clks IMX6QDL_CLK_DUMMY>, <&clks IMX6QDL_CLK_DUMMY>, 224 - <&clks IMX6QDL_CLK_DUMMY>, <&clks IMX6QDL_CLK_DUMMY>, 225 - <&clks IMX6QDL_CLK_DUMMY>; 221 + clocks = <&clks IMX6QDL_CLK_SPDIF_GCLK>, <&clks IMX6QDL_CLK_OSC>, 222 + <&clks IMX6QDL_CLK_SPDIF>, <&clks IMX6QDL_CLK_ASRC>, 223 + <&clks IMX6QDL_CLK_DUMMY>, <&clks IMX6QDL_CLK_ESAI_EXTAL>, 224 + <&clks IMX6QDL_CLK_IPG>, <&clks IMX6QDL_CLK_MLB>, 225 + <&clks IMX6QDL_CLK_DUMMY>, <&clks IMX6QDL_CLK_SPBA>; 226 226 clock-names = "core", "rxtx0", 227 227 "rxtx1", "rxtx2", 228 228 "rxtx3", "rxtx4", 229 229 "rxtx5", "rxtx6", 230 - "rxtx7"; 230 + "rxtx7", "dma"; 231 231 status = "disabled"; 232 232 }; 233 233
+16
arch/arm/boot/dts/imx6sl.dtsi
··· 135 135 ranges; 136 136 137 137 spdif: spdif@02004000 { 138 + compatible = "fsl,imx6sl-spdif", 139 + "fsl,imx35-spdif"; 138 140 reg = <0x02004000 0x4000>; 139 141 interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>; 142 + dmas = <&sdma 14 18 0>, 143 + <&sdma 15 18 0>; 144 + dma-names = "rx", "tx"; 145 + clocks = <&clks IMX6SL_CLK_SPDIF_GCLK>, <&clks IMX6SL_CLK_OSC>, 146 + <&clks IMX6SL_CLK_SPDIF>, <&clks IMX6SL_CLK_DUMMY>, 147 + <&clks IMX6SL_CLK_DUMMY>, <&clks IMX6SL_CLK_DUMMY>, 148 + <&clks IMX6SL_CLK_IPG>, <&clks IMX6SL_CLK_DUMMY>, 149 + <&clks IMX6SL_CLK_DUMMY>, <&clks IMX6SL_CLK_SPBA>; 150 + clock-names = "core", "rxtx0", 151 + "rxtx1", "rxtx2", 152 + "rxtx3", "rxtx4", 153 + "rxtx5", "rxtx6", 154 + "rxtx7", "dma"; 155 + status = "disabled"; 140 156 }; 141 157 142 158 ecspi1: ecspi@02008000 {
+1 -1
arch/arm/boot/dts/imx6sx.dtsi
··· 211 211 dmas = <&sdma 14 18 0>, 212 212 <&sdma 15 18 0>; 213 213 dma-names = "rx", "tx"; 214 - clocks = <&clks IMX6SX_CLK_SPDIF>, 214 + clocks = <&clks IMX6SX_CLK_SPDIF_GCLK>, 215 215 <&clks IMX6SX_CLK_OSC>, 216 216 <&clks IMX6SX_CLK_SPDIF>, 217 217 <&clks 0>, <&clks 0>, <&clks 0>,