From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6] ARM: DTS: imx5* imx6*, use imx51-ssi
Date: Sun, 16 Feb 2014 23:08:27 +0100 [thread overview]
Message-ID: <20140216220827.GC31006@pengutronix.de> (raw)
In-Reply-To: <1390220023-6423-1-git-send-email-mpa@pengutronix.de>
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 |
next prev parent reply other threads:[~2014-02-16 22:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2014-02-17 1:26 ` Shawn Guo
2014-02-17 9:27 ` Markus Pargmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140216220827.GC31006@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).