Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c03527e authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: imx6: Align ssi nodes between mx6 variants 



Since commit 98ea6ad2 (ARM: dts: imx6: use imx51-ssi) the mx6 ssi is
compatible with imx51, so align all the mx6 variant ssi compatible strings as:

compatible = "fsl,<imx6-soc>-ssi", "fsl,imx51-ssi";

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent ea336fa8

arch/arm/boot/dts/imx6qdl.dtsi

+3 −6
Original line number Diff line number Diff line
@@ -274,8 +274,7 @@ 


				ssi1: ssi@02028000 {

					compatible = "fsl,imx6q-ssi",

							"fsl,imx51-ssi",

							"fsl,imx21-ssi";

							"fsl,imx51-ssi";

					reg = <0x02028000 0x4000>;

					interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6QDL_CLK_SSI1_IPG>;
@@ -288,8 +287,7 @@ 


				ssi2: ssi@0202c000 {

					compatible = "fsl,imx6q-ssi",

							"fsl,imx51-ssi",

							"fsl,imx21-ssi";

							"fsl,imx51-ssi";

					reg = <0x0202c000 0x4000>;

					interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6QDL_CLK_SSI2_IPG>;
@@ -302,8 +300,7 @@ 


				ssi3: ssi@02030000 {

					compatible = "fsl,imx6q-ssi",

							"fsl,imx51-ssi",

							"fsl,imx21-ssi";

							"fsl,imx51-ssi";

					reg = <0x02030000 0x4000>;

					interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6QDL_CLK_SSI3_IPG>;

arch/arm/boot/dts/imx6sl.dtsi

+3 −6
Original line number Diff line number Diff line
@@ -227,8 +227,7 @@ 


				ssi1: ssi@02028000 {

					compatible = "fsl,imx6sl-ssi",

							"fsl,imx51-ssi",

							"fsl,imx21-ssi";

							"fsl,imx51-ssi";

					reg = <0x02028000 0x4000>;

					interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6SL_CLK_SSI1>;
@@ -241,8 +240,7 @@ 


				ssi2: ssi@0202c000 {

					compatible = "fsl,imx6sl-ssi",

							"fsl,imx51-ssi",

							"fsl,imx21-ssi";

							"fsl,imx51-ssi";

					reg = <0x0202c000 0x4000>;

					interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6SL_CLK_SSI2>;
@@ -255,8 +253,7 @@ 


				ssi3: ssi@02030000 {

					compatible = "fsl,imx6sl-ssi",

							"fsl,imx51-ssi",

							"fsl,imx21-ssi";

							"fsl,imx51-ssi";

					reg = <0x02030000 0x4000>;

					interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6SL_CLK_SSI3>;

arch/arm/boot/dts/imx6sx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ 
				};



				ssi1: ssi@02028000 {

					compatible = "fsl,imx6sx-ssi", "fsl,imx21-ssi";

					compatible = "fsl,imx6sx-ssi", "fsl,imx51-ssi";

					reg = <0x02028000 0x4000>;

					interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6SX_CLK_SSI1_IPG>,
@@ -311,7 +311,7 @@ 
				};



				ssi2: ssi@0202c000 {

					compatible = "fsl,imx6sx-ssi", "fsl,imx21-ssi";

					compatible = "fsl,imx6sx-ssi", "fsl,imx51-ssi";

					reg = <0x0202c000 0x4000>;

					interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6SX_CLK_SSI2_IPG>,
@@ -324,7 +324,7 @@ 
				};



				ssi3: ssi@02030000 {

					compatible = "fsl,imx6sx-ssi", "fsl,imx21-ssi";

					compatible = "fsl,imx6sx-ssi", "fsl,imx51-ssi";

					reg = <0x02030000 0x4000>;

					interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6SX_CLK_SSI3_IPG>,