From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 9/9] ARM: DTS: imx5* imx6*, use imx51-ssi
Date: Wed, 18 Dec 2013 12:57:45 +0100 [thread overview]
Message-ID: <1387367865-26391-10-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1387367865-26391-1-git-send-email-mpa@pengutronix.de>
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>
---
arch/arm/boot/dts/imx51.dtsi | 3 ++-
arch/arm/boot/dts/imx53.dtsi | 10 +++++++---
arch/arm/boot/dts/imx6qdl.dtsi | 12 +++++++++---
arch/arm/boot/dts/imx6sl.dtsi | 12 +++++++++---
4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 4bcdd3a..1496421 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -155,7 +155,8 @@
};
ssi2: ssi at 70014000 {
- compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
+ compatible = "fsl,imx51-ssi",
+ "fsl,imx21-ssi";
reg = <0x70014000 0x4000>;
interrupts = <30>;
clocks = <&clks 49>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 4307e80..034b8b0 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -149,7 +149,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 49>;
@@ -1049,7 +1051,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 48>;
@@ -1076,7 +1079,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 50>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 59154dc..c51440b 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -232,7 +232,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 0x04>;
clocks = <&clks 178>;
@@ -245,7 +247,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 0x04>;
clocks = <&clks 179>;
@@ -258,7 +262,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 0x04>;
clocks = <&clks 180>;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 28558f1..1e7b712 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -195,7 +195,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 0x04>;
clocks = <&clks IMX6SL_CLK_SSI1>;
@@ -207,7 +209,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 0x04>;
clocks = <&clks IMX6SL_CLK_SSI2>;
@@ -219,7 +223,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 0x04>;
clocks = <&clks IMX6SL_CLK_SSI3>;
--
1.8.5.1
next prev parent reply other threads:[~2013-12-18 11:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-18 11:57 [PATCH v3 0/9] ASoC: fsl-ssi: offline/online configuration and cleanups Markus Pargmann
2013-12-18 11:57 ` [PATCH v3 1/9] ASoC: fsl-ssi: Fix probe error handling Markus Pargmann
2013-12-19 13:03 ` Mark Brown
2013-12-20 9:52 ` Markus Pargmann
2013-12-18 11:57 ` [PATCH v3 2/9] ASoC: fsl-ssi: Move sysfs stats to debugfs Markus Pargmann
2013-12-18 11:57 ` [PATCH v3 3/9] ASoC: fsl-ssi: Add imx51-ssi and of_device_id matching Markus Pargmann
2013-12-18 11:57 ` [PATCH v3 4/9] ASoC: fsl-ssi: Fix interrupt mapping and release Markus Pargmann
2013-12-20 9:05 ` Nicolin Chen
2013-12-20 10:31 ` Markus Pargmann
2013-12-18 11:57 ` [PATCH v3 5/9] ASoC: fsl-ssi: Add offline_config flag Markus Pargmann
2013-12-19 13:16 ` Mark Brown
2013-12-20 10:08 ` Markus Pargmann
2013-12-18 11:57 ` [PATCH v3 6/9] ASoC: fsl-ssi: Add configuration helper functions Markus Pargmann
2013-12-18 11:57 ` [PATCH v3 7/9] ASoC: fsl-ssi: Move RX/TX configuration to seperate functions Markus Pargmann
2013-12-18 11:57 ` [PATCH v3 8/9] ASoC: fsl-ssi: Drop ac97 specific trigger function Markus Pargmann
2013-12-18 11:57 ` Markus Pargmann [this message]
2013-12-18 13:58 ` [PATCH v3 9/9] ARM: DTS: imx5* imx6*, use imx51-ssi Shawn Guo
2013-12-18 14:10 ` 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=1387367865-26391-10-git-send-email-mpa@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).