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: use imx51-ssi

imx51-ssi and imx21-ssi are different IPs. imx51-ssi supports online
reconfiguration and needs this for correct interaction with SDMA. This
patch adds imx51-ssi before each imx21-ssi for all imx6 SoCs.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

authored by

Markus Pargmann and committed by
Shawn Guo 98ea6ad2 fb06d65c

+18 -6
+9 -3
arch/arm/boot/dts/imx6qdl.dtsi
··· 251 251 }; 252 252 253 253 ssi1: ssi@02028000 { 254 - compatible = "fsl,imx6q-ssi","fsl,imx21-ssi"; 254 + compatible = "fsl,imx6q-ssi", 255 + "fsl,imx51-ssi", 256 + "fsl,imx21-ssi"; 255 257 reg = <0x02028000 0x4000>; 256 258 interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>; 257 259 clocks = <&clks 178>; ··· 266 264 }; 267 265 268 266 ssi2: ssi@0202c000 { 269 - compatible = "fsl,imx6q-ssi","fsl,imx21-ssi"; 267 + compatible = "fsl,imx6q-ssi", 268 + "fsl,imx51-ssi", 269 + "fsl,imx21-ssi"; 270 270 reg = <0x0202c000 0x4000>; 271 271 interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>; 272 272 clocks = <&clks 179>; ··· 281 277 }; 282 278 283 279 ssi3: ssi@02030000 { 284 - compatible = "fsl,imx6q-ssi","fsl,imx21-ssi"; 280 + compatible = "fsl,imx6q-ssi", 281 + "fsl,imx51-ssi", 282 + "fsl,imx21-ssi"; 285 283 reg = <0x02030000 0x4000>; 286 284 interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>; 287 285 clocks = <&clks 180>;
+9 -3
arch/arm/boot/dts/imx6sl.dtsi
··· 225 225 }; 226 226 227 227 ssi1: ssi@02028000 { 228 - compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi"; 228 + compatible = "fsl,imx6sl-ssi", 229 + "fsl,imx51-ssi", 230 + "fsl,imx21-ssi"; 229 231 reg = <0x02028000 0x4000>; 230 232 interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>; 231 233 clocks = <&clks IMX6SL_CLK_SSI1>; ··· 239 237 }; 240 238 241 239 ssi2: ssi@0202c000 { 242 - compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi"; 240 + compatible = "fsl,imx6sl-ssi", 241 + "fsl,imx51-ssi", 242 + "fsl,imx21-ssi"; 243 243 reg = <0x0202c000 0x4000>; 244 244 interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>; 245 245 clocks = <&clks IMX6SL_CLK_SSI2>; ··· 253 249 }; 254 250 255 251 ssi3: ssi@02030000 { 256 - compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi"; 252 + compatible = "fsl,imx6sl-ssi", 253 + "fsl,imx51-ssi", 254 + "fsl,imx21-ssi"; 257 255 reg = <0x02030000 0x4000>; 258 256 interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>; 259 257 clocks = <&clks IMX6SL_CLK_SSI3>;