* [PATCH 0/7] ARM: dts: ssi device node updates
@ 2014-06-17 9:06 Markus Pargmann
2014-06-17 9:06 ` [PATCH 1/7] ARM: dts: imx6: ventana, Remove unused ssi2 Markus Pargmann
` (7 more replies)
0 siblings, 8 replies; 11+ messages in thread
From: Markus Pargmann @ 2014-06-17 9:06 UTC (permalink / raw)
To: linux-arm-kernel
This series cleans up some old or unnecessary properties from the dts files.
Patch 1 removes an enabled ssi unit that is not used.
Patch 2 adds ssi DMA properties based on the previous definiton of
fsl,ssi-dma-events for imx50.
Patches 3 and 4 remove the old non-generic fsl,ssi-dma-events property. The
generic dmas property is still present and used.
Patch 5,6 and 7 remove the fsl,mode properties for ssi units that are
connected with sgtl5000 cards. The sgtl5000 already configures the connection
between codec and CPU DAI correctly, so we don't need fsl,mode here.
Regards,
Markus
Markus Pargmann (7):
ARM: dts: imx6: ventana, Remove unused ssi2
ARM: dts: imx50, add ssi dma properties
ARM: dts: imx5*, remove fsl,ssi-dma-events
arm: dts: imx6qdl, remove fsl,ssi-dma-events
ARM: dts: imx2*, remove ssi fsl,mode for sgtl5000 cards
ARM: dts: imx5*, remove ssi fsl,mode for sgtl5000 cards
ARM: dts: imx6*, remove ssi fsl,mode for sgtl5000 cards
arch/arm/boot/dts/imx25-pdk.dts | 1 -
arch/arm/boot/dts/imx50.dtsi | 8 ++++++--
arch/arm/boot/dts/imx51-babbage.dts | 1 -
arch/arm/boot/dts/imx51.dtsi | 3 ---
arch/arm/boot/dts/imx53-m53evk.dts | 1 -
arch/arm/boot/dts/imx53-mba53.dts | 1 -
arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 -
arch/arm/boot/dts/imx53-tx53.dtsi | 1 -
arch/arm/boot/dts/imx53-voipac-bsb.dts | 1 -
arch/arm/boot/dts/imx53.dtsi | 3 ---
arch/arm/boot/dts/imx6dl-riotboard.dts | 1 -
arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 -
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 6 ------
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 -
arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
20 files changed, 6 insertions(+), 32 deletions(-)
--
2.0.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/7] ARM: dts: imx6: ventana, Remove unused ssi2
2014-06-17 9:06 [PATCH 0/7] ARM: dts: ssi device node updates Markus Pargmann
@ 2014-06-17 9:06 ` Markus Pargmann
2014-06-23 20:23 ` Tim Harvey
2014-06-17 9:06 ` [PATCH 2/7] ARM: dts: imx50, add ssi dma properties Markus Pargmann
` (6 subsequent siblings)
7 siblings, 1 reply; 11+ messages in thread
From: Markus Pargmann @ 2014-06-17 9:06 UTC (permalink / raw)
To: linux-arm-kernel
ssi2 is not connected to any sound card so it is unused.
Cc: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index 698d3063b295..3245ae85f12b 100644
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -559,11 +559,6 @@
status = "okay";
};
-&ssi2 {
- fsl,mode = "i2s-slave";
- status = "okay";
-};
-
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
--
2.0.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/7] ARM: dts: imx50, add ssi dma properties
2014-06-17 9:06 [PATCH 0/7] ARM: dts: ssi device node updates Markus Pargmann
2014-06-17 9:06 ` [PATCH 1/7] ARM: dts: imx6: ventana, Remove unused ssi2 Markus Pargmann
@ 2014-06-17 9:06 ` Markus Pargmann
2014-06-17 9:06 ` [PATCH 3/7] ARM: dts: imx5*, remove fsl,ssi-dma-events Markus Pargmann
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Markus Pargmann @ 2014-06-17 9:06 UTC (permalink / raw)
To: linux-arm-kernel
Replace old ssi dma properties by the generic dma properties.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
arch/arm/boot/dts/imx50.dtsi | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 6a201cf54366..c0e0f60ab6b2 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -151,8 +151,10 @@
reg = <0x50014000 0x4000>;
interrupts = <30>;
clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
+ dmas = <&sdma 24 1 0>,
+ <&sdma 25 1 0>;
+ dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};
@@ -457,8 +459,10 @@
reg = <0x63fcc000 0x4000>;
interrupts = <29>;
clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
+ dmas = <&sdma 28 0 0>,
+ <&sdma 29 0 0>;
+ dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};
--
2.0.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/7] ARM: dts: imx5*, remove fsl,ssi-dma-events
2014-06-17 9:06 [PATCH 0/7] ARM: dts: ssi device node updates Markus Pargmann
2014-06-17 9:06 ` [PATCH 1/7] ARM: dts: imx6: ventana, Remove unused ssi2 Markus Pargmann
2014-06-17 9:06 ` [PATCH 2/7] ARM: dts: imx50, add ssi dma properties Markus Pargmann
@ 2014-06-17 9:06 ` Markus Pargmann
2014-06-17 9:06 ` [PATCH 4/7] arm: dts: imx6qdl, " Markus Pargmann
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Markus Pargmann @ 2014-06-17 9:06 UTC (permalink / raw)
To: linux-arm-kernel
All imx5*.dtsi files define the generic dma bindings. Drop the old
non-generic fsl,ssi-dma-events.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
arch/arm/boot/dts/imx51.dtsi | 3 ---
arch/arm/boot/dts/imx53.dtsi | 3 ---
2 files changed, 6 deletions(-)
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index bebbf3ba0d5e..17c05a6fa776 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -218,7 +218,6 @@
<&sdma 25 1 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};
@@ -508,7 +507,6 @@
<&sdma 29 0 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};
@@ -564,7 +562,6 @@
<&sdma 47 0 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <47 46 37 35>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 6456a0084388..d8d3f979f599 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -231,7 +231,6 @@
<&sdma 25 1 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};
@@ -661,7 +660,6 @@
<&sdma 29 0 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};
@@ -689,7 +687,6 @@
<&sdma 47 0 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <47 46 45 44>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};
--
2.0.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/7] arm: dts: imx6qdl, remove fsl,ssi-dma-events
2014-06-17 9:06 [PATCH 0/7] ARM: dts: ssi device node updates Markus Pargmann
` (2 preceding siblings ...)
2014-06-17 9:06 ` [PATCH 3/7] ARM: dts: imx5*, remove fsl,ssi-dma-events Markus Pargmann
@ 2014-06-17 9:06 ` Markus Pargmann
2014-06-17 9:06 ` [PATCH 5/7] ARM: dts: imx2*, remove ssi fsl,mode for sgtl5000 cards Markus Pargmann
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Markus Pargmann @ 2014-06-17 9:06 UTC (permalink / raw)
To: linux-arm-kernel
All dtsi files where already moved to generic dma bindings. Remove the
old non-generic DMA properties.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index ce0599134a69..d2393d77a82e 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -272,7 +272,6 @@
<&sdma 38 1 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <38 37>;
status = "disabled";
};
@@ -287,7 +286,6 @@
<&sdma 42 1 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <42 41>;
status = "disabled";
};
@@ -302,7 +300,6 @@
<&sdma 46 1 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <46 45>;
status = "disabled";
};
--
2.0.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/7] ARM: dts: imx2*, remove ssi fsl,mode for sgtl5000 cards
2014-06-17 9:06 [PATCH 0/7] ARM: dts: ssi device node updates Markus Pargmann
` (3 preceding siblings ...)
2014-06-17 9:06 ` [PATCH 4/7] arm: dts: imx6qdl, " Markus Pargmann
@ 2014-06-17 9:06 ` Markus Pargmann
2014-06-17 9:06 ` [PATCH 6/7] ARM: dts: imx5*, " Markus Pargmann
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Markus Pargmann @ 2014-06-17 9:06 UTC (permalink / raw)
To: linux-arm-kernel
The DAI mode is and should be configured by the sound card driver as
codec and ssi have to be in the right modes to communicate with each
other. It is possible to operate the ssi unit or the codec in master mode,
sometimes even on the same board in different configurations.
With the latest changes in the fsl-ssi driver, the 'fsl,mode' property
is only handled as a fallback property. If the sound card sets the DAI
mode correctly, this fallback configuration is dropped.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
arch/arm/boot/dts/imx25-pdk.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx25-pdk.dts b/arch/arm/boot/dts/imx25-pdk.dts
index c608942b8a3b..8f9a424a80d6 100644
--- a/arch/arm/boot/dts/imx25-pdk.dts
+++ b/arch/arm/boot/dts/imx25-pdk.dts
@@ -233,7 +233,6 @@
&ssi1 {
codec-handle = <&codec>;
- fsl,mode = "i2s-slave";
status = "okay";
};
--
2.0.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 6/7] ARM: dts: imx5*, remove ssi fsl,mode for sgtl5000 cards
2014-06-17 9:06 [PATCH 0/7] ARM: dts: ssi device node updates Markus Pargmann
` (4 preceding siblings ...)
2014-06-17 9:06 ` [PATCH 5/7] ARM: dts: imx2*, remove ssi fsl,mode for sgtl5000 cards Markus Pargmann
@ 2014-06-17 9:06 ` Markus Pargmann
2014-06-17 9:06 ` [PATCH 7/7] ARM: dts: imx6*, " Markus Pargmann
2014-06-20 12:33 ` [PATCH 0/7] ARM: dts: ssi device node updates Shawn Guo
7 siblings, 0 replies; 11+ messages in thread
From: Markus Pargmann @ 2014-06-17 9:06 UTC (permalink / raw)
To: linux-arm-kernel
The DAI mode is and should be configured by the sound card driver as
codec and ssi have to be in the right modes to communicate with each
other. It is possible to operate the ssi unit or the codec in master mode,
sometimes even on the same board in different configurations.
With the latest changes in the fsl-ssi driver, the 'fsl,mode' property
is only handled as a fallback property. If the sound card sets the DAI
mode correctly, this fallback configuration is dropped.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
arch/arm/boot/dts/imx51-babbage.dts | 1 -
arch/arm/boot/dts/imx53-m53evk.dts | 1 -
arch/arm/boot/dts/imx53-mba53.dts | 1 -
arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 -
arch/arm/boot/dts/imx53-tx53.dtsi | 1 -
arch/arm/boot/dts/imx53-voipac-bsb.dts | 1 -
6 files changed, 6 deletions(-)
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 6bc3243a80d3..3b3ad3419c67 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -392,7 +392,6 @@
};
&ssi2 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index d5d146a8b149..3569acbc9339 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -429,7 +429,6 @@
};
&ssi2 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx53-mba53.dts b/arch/arm/boot/dts/imx53-mba53.dts
index 3e3f17aa93a1..2e44d2aba14e 100644
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@ -225,7 +225,6 @@
};
&ssi2 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index fd8c60dde7de..181ae5ebf23f 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -141,7 +141,6 @@
};
&ssi2 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index e348796ba689..704bd72cbfec 100644
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -502,7 +502,6 @@
};
&ssi1 {
- fsl,mode = "i2s-slave";
codec-handle = <&sgtl5000>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx53-voipac-bsb.dts b/arch/arm/boot/dts/imx53-voipac-bsb.dts
index 7f6711a48615..c17d3ad6dba5 100644
--- a/arch/arm/boot/dts/imx53-voipac-bsb.dts
+++ b/arch/arm/boot/dts/imx53-voipac-bsb.dts
@@ -154,6 +154,5 @@
};
&ssi2 {
- fsl,mode = "i2s-slave";
status = "okay";
};
--
2.0.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 7/7] ARM: dts: imx6*, remove ssi fsl,mode for sgtl5000 cards
2014-06-17 9:06 [PATCH 0/7] ARM: dts: ssi device node updates Markus Pargmann
` (5 preceding siblings ...)
2014-06-17 9:06 ` [PATCH 6/7] ARM: dts: imx5*, " Markus Pargmann
@ 2014-06-17 9:06 ` Markus Pargmann
2014-06-20 12:33 ` [PATCH 0/7] ARM: dts: ssi device node updates Shawn Guo
7 siblings, 0 replies; 11+ messages in thread
From: Markus Pargmann @ 2014-06-17 9:06 UTC (permalink / raw)
To: linux-arm-kernel
The DAI mode is and should be configured by the sound card driver as
codec and ssi have to be in the right modes to communicate with each
other. It is possible to operate the ssi unit or the codec in master mode,
sometimes even on the same board in different configurations.
With the latest changes in the fsl-ssi driver, the 'fsl,mode' property
is only handled as a fallback property. If the sound card sets the DAI
mode correctly, this fallback configuration is dropped.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
arch/arm/boot/dts/imx6dl-riotboard.dts | 1 -
arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 -
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 -
9 files changed, 9 deletions(-)
diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
index 909fafc0b650..80c926894d1e 100644
--- a/arch/arm/boot/dts/imx6dl-riotboard.dts
+++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
@@ -254,7 +254,6 @@
};
&ssi1 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts
index 3689eaa58826..c5de2b768b63 100644
--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -504,7 +504,6 @@
};
&ssi1 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index 367af3ec9435..00b515c46929 100644
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -489,7 +489,6 @@
};
&ssi1 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index c91b5a6c769b..39554077e28e 100644
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -533,7 +533,6 @@
};
&ssi1 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index 3245ae85f12b..50ff650a5d11 100644
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -555,7 +555,6 @@
};
&ssi1 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index 4c4b17596c8b..42ff525ebe13 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -381,7 +381,6 @@
};
&ssi1 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
index 6df6127bf835..0a36129152e0 100644
--- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@@ -381,7 +381,6 @@
};
&ssi1 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 40ea36534643..3e1eb5ed4aef 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -512,7 +512,6 @@
};
&ssi2 {
- fsl,mode = "i2s-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
index 5c6f10c43f65..13eae9e5bae8 100644
--- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
@@ -233,7 +233,6 @@
};
&ssi1 {
- fsl,mode = "i2s-slave";
status = "okay";
};
--
2.0.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 0/7] ARM: dts: ssi device node updates
2014-06-17 9:06 [PATCH 0/7] ARM: dts: ssi device node updates Markus Pargmann
` (6 preceding siblings ...)
2014-06-17 9:06 ` [PATCH 7/7] ARM: dts: imx6*, " Markus Pargmann
@ 2014-06-20 12:33 ` Shawn Guo
2014-06-23 9:54 ` Markus Pargmann
7 siblings, 1 reply; 11+ messages in thread
From: Shawn Guo @ 2014-06-20 12:33 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jun 17, 2014 at 11:06:28AM +0200, Markus Pargmann wrote:
> This series cleans up some old or unnecessary properties from the dts files.
>
> Patch 1 removes an enabled ssi unit that is not used.
Instead of holding the whole series by waiting ACK from ventana board
maintainer on the first patch, I choose to keep the ssi node and remove
fsl,mode property. The ssi node can be removed later in another patch
after board maintainer confirms.
>
> Patch 2 adds ssi DMA properties based on the previous definiton of
> fsl,ssi-dma-events for imx50.
>
> Patches 3 and 4 remove the old non-generic fsl,ssi-dma-events property. The
> generic dmas property is still present and used.
>
> Patch 5,6 and 7 remove the fsl,mode properties for ssi units that are
> connected with sgtl5000 cards. The sgtl5000 already configures the connection
> between codec and CPU DAI correctly, so we don't need fsl,mode here.
There are some a number of new boards on my imx/dt branch across
different i.MX series. Since the last 3 patches are all about board
level files, I just squashed them and made the same change for those
new boards in there.
Also, I updated the patch subject a little bit, primarily on prefix.
And the last one should be about audio cards, not only sgtl5000. So in
all, the new summary looks like the following.
Markus Pargmann (4):
ARM: dts: imx50: add ssi dma properties
ARM: dts: imx5: remove fsl,ssi-dma-events
ARM: dts: imx6qdl: remove fsl,ssi-dma-events
ARM: dts: imx: remove ssi fsl,mode for audio cards
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 1 -
arch/arm/boot/dts/imx25-pdk.dts | 1 -
arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 1 -
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 -
arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 1 -
arch/arm/boot/dts/imx50.dtsi | 8 ++++++--
arch/arm/boot/dts/imx51-babbage.dts | 1 -
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 -
arch/arm/boot/dts/imx51.dtsi | 3 ---
arch/arm/boot/dts/imx53-m53evk.dts | 1 -
arch/arm/boot/dts/imx53-mba53.dts | 1 -
arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 -
arch/arm/boot/dts/imx53-tx53.dtsi | 1 -
arch/arm/boot/dts/imx53-voipac-bsb.dts | 1 -
arch/arm/boot/dts/imx53.dtsi | 3 ---
arch/arm/boot/dts/imx6dl-riotboard.dts | 1 -
arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 -
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 --
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-tx6.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 -
arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
arch/arm/boot/dts/imx6sl-evk.dts | 1 -
27 files changed, 6 insertions(+), 35 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/7] ARM: dts: ssi device node updates
2014-06-20 12:33 ` [PATCH 0/7] ARM: dts: ssi device node updates Shawn Guo
@ 2014-06-23 9:54 ` Markus Pargmann
0 siblings, 0 replies; 11+ messages in thread
From: Markus Pargmann @ 2014-06-23 9:54 UTC (permalink / raw)
To: linux-arm-kernel
Hi Shawn,
On Fri, Jun 20, 2014 at 08:33:38PM +0800, Shawn Guo wrote:
> On Tue, Jun 17, 2014 at 11:06:28AM +0200, Markus Pargmann wrote:
> > This series cleans up some old or unnecessary properties from the dts files.
> >
> > Patch 1 removes an enabled ssi unit that is not used.
>
> Instead of holding the whole series by waiting ACK from ventana board
> maintainer on the first patch, I choose to keep the ssi node and remove
> fsl,mode property. The ssi node can be removed later in another patch
> after board maintainer confirms.
>
> >
> > Patch 2 adds ssi DMA properties based on the previous definiton of
> > fsl,ssi-dma-events for imx50.
> >
> > Patches 3 and 4 remove the old non-generic fsl,ssi-dma-events property. The
> > generic dmas property is still present and used.
> >
> > Patch 5,6 and 7 remove the fsl,mode properties for ssi units that are
> > connected with sgtl5000 cards. The sgtl5000 already configures the connection
> > between codec and CPU DAI correctly, so we don't need fsl,mode here.
>
> There are some a number of new boards on my imx/dt branch across
> different i.MX series. Since the last 3 patches are all about board
> level files, I just squashed them and made the same change for those
> new boards in there.
Okay thanks.
>
> Also, I updated the patch subject a little bit, primarily on prefix.
> And the last one should be about audio cards, not only sgtl5000. So in
> all, the new summary looks like the following.
Oh right, I overlooked that I also changed it for another sound card.
Thanks,
Markus
>
> Markus Pargmann (4):
> ARM: dts: imx50: add ssi dma properties
> ARM: dts: imx5: remove fsl,ssi-dma-events
> ARM: dts: imx6qdl: remove fsl,ssi-dma-events
> ARM: dts: imx: remove ssi fsl,mode for audio cards
>
> arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 1 -
> arch/arm/boot/dts/imx25-pdk.dts | 1 -
> arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 1 -
> arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 -
> arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 1 -
> arch/arm/boot/dts/imx50.dtsi | 8 ++++++--
> arch/arm/boot/dts/imx51-babbage.dts | 1 -
> arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 -
> arch/arm/boot/dts/imx51.dtsi | 3 ---
> arch/arm/boot/dts/imx53-m53evk.dts | 1 -
> arch/arm/boot/dts/imx53-mba53.dts | 1 -
> arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 -
> arch/arm/boot/dts/imx53-tx53.dtsi | 1 -
> arch/arm/boot/dts/imx53-voipac-bsb.dts | 1 -
> arch/arm/boot/dts/imx53.dtsi | 3 ---
> arch/arm/boot/dts/imx6dl-riotboard.dts | 1 -
> arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 -
> arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 -
> arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 -
> arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 --
> arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 -
> arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 -
> arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 -
> arch/arm/boot/dts/imx6qdl-tx6.dtsi | 1 -
> arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 -
> arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
> arch/arm/boot/dts/imx6sl-evk.dts | 1 -
> 27 files changed, 6 insertions(+), 35 deletions(-)
>
--
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/20140623/fea53e1a/attachment.sig>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/7] ARM: dts: imx6: ventana, Remove unused ssi2
2014-06-17 9:06 ` [PATCH 1/7] ARM: dts: imx6: ventana, Remove unused ssi2 Markus Pargmann
@ 2014-06-23 20:23 ` Tim Harvey
0 siblings, 0 replies; 11+ messages in thread
From: Tim Harvey @ 2014-06-23 20:23 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jun 17, 2014 at 2:06 AM, Markus Pargmann <mpa@pengutronix.de> wrote:
> ssi2 is not connected to any sound card so it is unused.
>
> Cc: Tim Harvey <tharvey@gateworks.com>
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
> arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
> index 698d3063b295..3245ae85f12b 100644
> --- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
> @@ -559,11 +559,6 @@
> status = "okay";
> };
>
> -&ssi2 {
> - fsl,mode = "i2s-slave";
> - status = "okay";
> -};
> -
> &uart1 {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_uart1>;
> --
> 2.0.0
>
Acked-by: Tim Harvey <tharvey@gateworks.com>
Tim
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-06-23 20:23 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-17 9:06 [PATCH 0/7] ARM: dts: ssi device node updates Markus Pargmann
2014-06-17 9:06 ` [PATCH 1/7] ARM: dts: imx6: ventana, Remove unused ssi2 Markus Pargmann
2014-06-23 20:23 ` Tim Harvey
2014-06-17 9:06 ` [PATCH 2/7] ARM: dts: imx50, add ssi dma properties Markus Pargmann
2014-06-17 9:06 ` [PATCH 3/7] ARM: dts: imx5*, remove fsl,ssi-dma-events Markus Pargmann
2014-06-17 9:06 ` [PATCH 4/7] arm: dts: imx6qdl, " Markus Pargmann
2014-06-17 9:06 ` [PATCH 5/7] ARM: dts: imx2*, remove ssi fsl,mode for sgtl5000 cards Markus Pargmann
2014-06-17 9:06 ` [PATCH 6/7] ARM: dts: imx5*, " Markus Pargmann
2014-06-17 9:06 ` [PATCH 7/7] ARM: dts: imx6*, " Markus Pargmann
2014-06-20 12:33 ` [PATCH 0/7] ARM: dts: ssi device node updates Shawn Guo
2014-06-23 9:54 ` 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).