Skip to content

Commit

Permalink
ARM: imx6: Align ssi nodes between mx6 variants
Browse files Browse the repository at this point in the history 
Since commit 98ea6ad (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: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
  • Loading branch information
Fabio Estevam authored and Shawn Guo committed Jul 18, 2014
1 parent ea336fa commit 4c03527
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
9 changes: 3 additions & 6 deletions arch/arm/boot/dts/imx6qdl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand All @@ -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>;
Expand All @@ -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>;
Expand Down
9 changes: 3 additions & 6 deletions arch/arm/boot/dts/imx6sl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand All @@ -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>;
Expand All @@ -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>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/imx6sx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand All @@ -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>,
Expand All @@ -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>,
Expand Down

0 comments on commit 4c03527

Please sign in to comment.