* [PATCH v5] ARM: DTS: imx5* imx6*, use imx51-ssi
@ 2014-01-17 9:07 Markus Pargmann
2014-01-18 8:38 ` Shawn Guo
0 siblings, 1 reply; 6+ messages in thread
From: Markus Pargmann @ 2014-01-17 9:07 UTC (permalink / raw)
To: linux-arm-kernel
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 imx5/imx6 SoCs.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
Hi Shawn,
This is the patch including the two added compatibles in imx50.dtsi for
fsl,imx51-ssi. That is the only change in v5.
Regards,
Markus
arch/arm/boot/dts/imx50.dtsi | 6 +++++-
arch/arm/boot/dts/imx53.dtsi | 10 +++++++---
arch/arm/boot/dts/imx6qdl.dtsi | 12 +++++++++---
arch/arm/boot/dts/imx6sl.dtsi | 12 +++++++++---
4 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 01c0499..47df15f 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -140,7 +140,9 @@
};
ssi2: ssi at 50014000 {
- compatible = "fsl,imx50-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx50-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x50014000 0x4000>;
interrupts = <30>;
clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
@@ -446,6 +448,8 @@
ssi1: ssi at 63fcc000 {
compatible = "fsl,imx50-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx50-ssi", "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x63fcc000 0x4000>;
interrupts = <29>;
clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 4dbde25..73e103b 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -171,7 +171,9 @@
};
ssi2: ssi at 50014000 {
- compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx53-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x50014000 0x4000>;
interrupts = <30>;
clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
@@ -590,7 +592,8 @@
};
ssi1: ssi at 63fcc000 {
- compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x63fcc000 0x4000>;
interrupts = <29>;
clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
@@ -617,7 +620,8 @@
};
ssi3: ssi at 63fe8000 {
- compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x63fe8000 0x4000>;
interrupts = <96>;
clocks = <&clks IMX5_CLK_SSI3_IPG_GATE>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 8a86502..cf7956e 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -247,7 +247,9 @@
};
ssi1: ssi at 02028000 {
- compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6q-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x02028000 0x4000>;
interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 178>;
@@ -260,7 +262,9 @@
};
ssi2: ssi at 0202c000 {
- compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6q-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x0202c000 0x4000>;
interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 179>;
@@ -273,7 +277,9 @@
};
ssi3: ssi at 02030000 {
- compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6q-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x02030000 0x4000>;
interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 180>;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index a449c4f..95bb37b 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -226,7 +226,9 @@
};
ssi1: ssi at 02028000 {
- compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6sl-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x02028000 0x4000>;
interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_SSI1>;
@@ -238,7 +240,9 @@
};
ssi2: ssi at 0202c000 {
- compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6sl-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x0202c000 0x4000>;
interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_SSI2>;
@@ -250,7 +254,9 @@
};
ssi3: ssi at 02030000 {
- compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6sl-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x02030000 0x4000>;
interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_SSI3>;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5] ARM: DTS: imx5* imx6*, use imx51-ssi
2014-01-17 9:07 [PATCH v5] ARM: DTS: imx5* imx6*, use imx51-ssi Markus Pargmann
@ 2014-01-18 8:38 ` Shawn Guo
2014-01-20 12:13 ` [PATCH v6] " Markus Pargmann
0 siblings, 1 reply; 6+ messages in thread
From: Shawn Guo @ 2014-01-18 8:38 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 17, 2014 at 10:07:42AM +0100, Markus Pargmann wrote:
> 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 imx5/imx6 SoCs.
>
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
> Hi Shawn,
>
> This is the patch including the two added compatibles in imx50.dtsi for
> fsl,imx51-ssi. That is the only change in v5.
>
> Regards,
>
> Markus
>
>
> arch/arm/boot/dts/imx50.dtsi | 6 +++++-
> arch/arm/boot/dts/imx53.dtsi | 10 +++++++---
> arch/arm/boot/dts/imx6qdl.dtsi | 12 +++++++++---
> arch/arm/boot/dts/imx6sl.dtsi | 12 +++++++++---
> 4 files changed, 30 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
> index 01c0499..47df15f 100644
> --- a/arch/arm/boot/dts/imx50.dtsi
> +++ b/arch/arm/boot/dts/imx50.dtsi
> @@ -140,7 +140,9 @@
> };
>
> ssi2: ssi at 50014000 {
> - compatible = "fsl,imx50-ssi", "fsl,imx21-ssi";
> + compatible = "fsl,imx50-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x50014000 0x4000>;
> interrupts = <30>;
> clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
> @@ -446,6 +448,8 @@
>
> ssi1: ssi at 63fcc000 {
> compatible = "fsl,imx50-ssi", "fsl,imx21-ssi";
This line should removed then. I fixed it up and applied the patch.
Shawn
> + compatible = "fsl,imx50-ssi", "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x63fcc000 0x4000>;
> interrupts = <29>;
> clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
> diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
> index 4dbde25..73e103b 100644
> --- a/arch/arm/boot/dts/imx53.dtsi
> +++ b/arch/arm/boot/dts/imx53.dtsi
> @@ -171,7 +171,9 @@
> };
>
> ssi2: ssi at 50014000 {
> - compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
> + compatible = "fsl,imx53-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x50014000 0x4000>;
> interrupts = <30>;
> clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
> @@ -590,7 +592,8 @@
> };
>
> ssi1: ssi at 63fcc000 {
> - compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
> + compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x63fcc000 0x4000>;
> interrupts = <29>;
> clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
> @@ -617,7 +620,8 @@
> };
>
> ssi3: ssi at 63fe8000 {
> - compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
> + compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x63fe8000 0x4000>;
> interrupts = <96>;
> clocks = <&clks IMX5_CLK_SSI3_IPG_GATE>;
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index 8a86502..cf7956e 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -247,7 +247,9 @@
> };
>
> ssi1: ssi at 02028000 {
> - compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6q-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x02028000 0x4000>;
> interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks 178>;
> @@ -260,7 +262,9 @@
> };
>
> ssi2: ssi at 0202c000 {
> - compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6q-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x0202c000 0x4000>;
> interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks 179>;
> @@ -273,7 +277,9 @@
> };
>
> ssi3: ssi at 02030000 {
> - compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6q-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x02030000 0x4000>;
> interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks 180>;
> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
> index a449c4f..95bb37b 100644
> --- a/arch/arm/boot/dts/imx6sl.dtsi
> +++ b/arch/arm/boot/dts/imx6sl.dtsi
> @@ -226,7 +226,9 @@
> };
>
> ssi1: ssi at 02028000 {
> - compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6sl-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x02028000 0x4000>;
> interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks IMX6SL_CLK_SSI1>;
> @@ -238,7 +240,9 @@
> };
>
> ssi2: ssi at 0202c000 {
> - compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6sl-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x0202c000 0x4000>;
> interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks IMX6SL_CLK_SSI2>;
> @@ -250,7 +254,9 @@
> };
>
> ssi3: ssi at 02030000 {
> - compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6sl-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x02030000 0x4000>;
> interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks IMX6SL_CLK_SSI3>;
> --
> 1.8.5.2
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v6] ARM: DTS: imx5* imx6*, use imx51-ssi
2014-01-18 8:38 ` Shawn Guo
@ 2014-01-20 12:13 ` Markus Pargmann
2014-02-16 22:08 ` Markus Pargmann
0 siblings, 1 reply; 6+ messages in thread
From: Markus Pargmann @ 2014-01-20 12:13 UTC (permalink / raw)
To: linux-arm-kernel
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 imx5/imx6 SoCs.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
Hi Shawn,
Sorry for that last patch. I fixed it in this patch.
Thanks,
Markus
arch/arm/boot/dts/imx50.dtsi | 7 +++++--
arch/arm/boot/dts/imx53.dtsi | 10 +++++++---
arch/arm/boot/dts/imx6qdl.dtsi | 12 +++++++++---
arch/arm/boot/dts/imx6sl.dtsi | 12 +++++++++---
4 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 01c0499..24df4f4f 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -140,7 +140,9 @@
};
ssi2: ssi at 50014000 {
- compatible = "fsl,imx50-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx50-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x50014000 0x4000>;
interrupts = <30>;
clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
@@ -445,7 +447,8 @@
};
ssi1: ssi at 63fcc000 {
- compatible = "fsl,imx50-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx50-ssi", "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x63fcc000 0x4000>;
interrupts = <29>;
clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 4dbde25..73e103b 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -171,7 +171,9 @@
};
ssi2: ssi at 50014000 {
- compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx53-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x50014000 0x4000>;
interrupts = <30>;
clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
@@ -590,7 +592,8 @@
};
ssi1: ssi at 63fcc000 {
- compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x63fcc000 0x4000>;
interrupts = <29>;
clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
@@ -617,7 +620,8 @@
};
ssi3: ssi at 63fe8000 {
- compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x63fe8000 0x4000>;
interrupts = <96>;
clocks = <&clks IMX5_CLK_SSI3_IPG_GATE>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 8a86502..cf7956e 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -247,7 +247,9 @@
};
ssi1: ssi at 02028000 {
- compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6q-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x02028000 0x4000>;
interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 178>;
@@ -260,7 +262,9 @@
};
ssi2: ssi at 0202c000 {
- compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6q-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x0202c000 0x4000>;
interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 179>;
@@ -273,7 +277,9 @@
};
ssi3: ssi at 02030000 {
- compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6q-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x02030000 0x4000>;
interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 180>;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index a449c4f..95bb37b 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -226,7 +226,9 @@
};
ssi1: ssi at 02028000 {
- compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6sl-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x02028000 0x4000>;
interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_SSI1>;
@@ -238,7 +240,9 @@
};
ssi2: ssi at 0202c000 {
- compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6sl-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x0202c000 0x4000>;
interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_SSI2>;
@@ -250,7 +254,9 @@
};
ssi3: ssi at 02030000 {
- compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
+ compatible = "fsl,imx6sl-ssi",
+ "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x02030000 0x4000>;
interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_SSI3>;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v6] ARM: DTS: imx5* imx6*, use imx51-ssi
2014-01-20 12:13 ` [PATCH v6] " Markus Pargmann
@ 2014-02-16 22:08 ` Markus Pargmann
2014-02-17 1:26 ` Shawn Guo
0 siblings, 1 reply; 6+ messages in thread
From: Markus Pargmann @ 2014-02-16 22:08 UTC (permalink / raw)
To: linux-arm-kernel
Hi Shawn,
On Mon, Jan 20, 2014 at 01:13:43PM +0100, Markus Pargmann wrote:
> 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 imx5/imx6 SoCs.
>
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
> Hi Shawn,
>
> Sorry for that last patch. I fixed it in this patch.
Ping. Should I send this again after rebasing it onto your latest branch?
Regards,
Markus
>
> Thanks,
>
> Markus
>
> arch/arm/boot/dts/imx50.dtsi | 7 +++++--
> arch/arm/boot/dts/imx53.dtsi | 10 +++++++---
> arch/arm/boot/dts/imx6qdl.dtsi | 12 +++++++++---
> arch/arm/boot/dts/imx6sl.dtsi | 12 +++++++++---
> 4 files changed, 30 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
> index 01c0499..24df4f4f 100644
> --- a/arch/arm/boot/dts/imx50.dtsi
> +++ b/arch/arm/boot/dts/imx50.dtsi
> @@ -140,7 +140,9 @@
> };
>
> ssi2: ssi at 50014000 {
> - compatible = "fsl,imx50-ssi", "fsl,imx21-ssi";
> + compatible = "fsl,imx50-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x50014000 0x4000>;
> interrupts = <30>;
> clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
> @@ -445,7 +447,8 @@
> };
>
> ssi1: ssi at 63fcc000 {
> - compatible = "fsl,imx50-ssi", "fsl,imx21-ssi";
> + compatible = "fsl,imx50-ssi", "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x63fcc000 0x4000>;
> interrupts = <29>;
> clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
> diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
> index 4dbde25..73e103b 100644
> --- a/arch/arm/boot/dts/imx53.dtsi
> +++ b/arch/arm/boot/dts/imx53.dtsi
> @@ -171,7 +171,9 @@
> };
>
> ssi2: ssi at 50014000 {
> - compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
> + compatible = "fsl,imx53-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x50014000 0x4000>;
> interrupts = <30>;
> clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
> @@ -590,7 +592,8 @@
> };
>
> ssi1: ssi at 63fcc000 {
> - compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
> + compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x63fcc000 0x4000>;
> interrupts = <29>;
> clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
> @@ -617,7 +620,8 @@
> };
>
> ssi3: ssi at 63fe8000 {
> - compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
> + compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x63fe8000 0x4000>;
> interrupts = <96>;
> clocks = <&clks IMX5_CLK_SSI3_IPG_GATE>;
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index 8a86502..cf7956e 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -247,7 +247,9 @@
> };
>
> ssi1: ssi at 02028000 {
> - compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6q-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x02028000 0x4000>;
> interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks 178>;
> @@ -260,7 +262,9 @@
> };
>
> ssi2: ssi at 0202c000 {
> - compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6q-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x0202c000 0x4000>;
> interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks 179>;
> @@ -273,7 +277,9 @@
> };
>
> ssi3: ssi at 02030000 {
> - compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6q-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x02030000 0x4000>;
> interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks 180>;
> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
> index a449c4f..95bb37b 100644
> --- a/arch/arm/boot/dts/imx6sl.dtsi
> +++ b/arch/arm/boot/dts/imx6sl.dtsi
> @@ -226,7 +226,9 @@
> };
>
> ssi1: ssi at 02028000 {
> - compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6sl-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x02028000 0x4000>;
> interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks IMX6SL_CLK_SSI1>;
> @@ -238,7 +240,9 @@
> };
>
> ssi2: ssi at 0202c000 {
> - compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6sl-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x0202c000 0x4000>;
> interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks IMX6SL_CLK_SSI2>;
> @@ -250,7 +254,9 @@
> };
>
> ssi3: ssi at 02030000 {
> - compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
> + compatible = "fsl,imx6sl-ssi",
> + "fsl,imx51-ssi",
> + "fsl,imx21-ssi";
> reg = <0x02030000 0x4000>;
> interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks IMX6SL_CLK_SSI3>;
> --
> 1.8.5.2
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v6] ARM: DTS: imx5* imx6*, use imx51-ssi
2014-02-16 22:08 ` Markus Pargmann
@ 2014-02-17 1:26 ` Shawn Guo
2014-02-17 9:27 ` Markus Pargmann
0 siblings, 1 reply; 6+ messages in thread
From: Shawn Guo @ 2014-02-17 1:26 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Feb 16, 2014 at 11:08:27PM +0100, Markus Pargmann wrote:
> Hi Shawn,
>
> On Mon, Jan 20, 2014 at 01:13:43PM +0100, Markus Pargmann wrote:
> > 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 imx5/imx6 SoCs.
> >
> > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> > ---
> > Hi Shawn,
> >
> > Sorry for that last patch. I fixed it in this patch.
>
> Ping. Should I send this again after rebasing it onto your latest branch?
I believe I've applied the v5 with a minor fix [1]. I split it into 2
though, one for imx5 [2] and the other for imx6 [2], because I have to
make my imx/dt pull request small to please arm-soc folks.
Shawn
[1] http://thread.gmane.org/gmane.linux.alsa.devel/117689/focus=117729
[2] http://git.linaro.org/people/shawn.guo/linux-2.6.git/commitdiff/28f93d0bbe171cf0c9051f22b550890740776bbb
[3] http://git.linaro.org/people/shawn.guo/linux-2.6.git/commitdiff/98ea6ad2edd21f953a43bd27182000a18a44dc20
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v6] ARM: DTS: imx5* imx6*, use imx51-ssi
2014-02-17 1:26 ` Shawn Guo
@ 2014-02-17 9:27 ` Markus Pargmann
0 siblings, 0 replies; 6+ messages in thread
From: Markus Pargmann @ 2014-02-17 9:27 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 17, 2014 at 09:26:45AM +0800, Shawn Guo wrote:
> On Sun, Feb 16, 2014 at 11:08:27PM +0100, Markus Pargmann wrote:
> > Hi Shawn,
> >
> > On Mon, Jan 20, 2014 at 01:13:43PM +0100, Markus Pargmann wrote:
> > > 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 imx5/imx6 SoCs.
> > >
> > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> > > ---
> > > Hi Shawn,
> > >
> > > Sorry for that last patch. I fixed it in this patch.
> >
> > Ping. Should I send this again after rebasing it onto your latest branch?
>
> I believe I've applied the v5 with a minor fix [1]. I split it into 2
> though, one for imx5 [2] and the other for imx6 [2], because I have to
> make my imx/dt pull request small to please arm-soc folks.
Oh thanks, I didn't notice that you applied v5 already.
Regards,
Markus
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140217/e892f742/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-17 9:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-17 9:07 [PATCH v5] ARM: DTS: imx5* imx6*, use imx51-ssi Markus Pargmann
2014-01-18 8:38 ` Shawn Guo
2014-01-20 12:13 ` [PATCH v6] " Markus Pargmann
2014-02-16 22:08 ` Markus Pargmann
2014-02-17 1:26 ` Shawn Guo
2014-02-17 9:27 ` Markus Pargmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).