ARM: dts: ssi device node updates
Subsystems (2)
cover ARM: dts: ssi device node updates
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(-)
Signature · 1 line
2.0.0
PATCH 1/7 ARM: dts: imx6: ventana, Remove unused ssi2
ssi2 is not connected to any sound card so it is unused.
--- arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 ----- 1 file changed, 5 deletions(-)
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +0 -5
@@ -559,11 +559,6 @@ status = "okay"; }; -&ssi2 { - fsl,mode = "i2s-slave"; - status = "okay"; -}; - &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>;
Signature · 1 line
2.0.0
PATCH 1/7 ARM: dts: imx6: ventana, Remove unused ssi2
Quoted 25 lines · Markus Pargmann
ssi2 is not connected to any sound card so it is unused.
Cc Tim Harvey <[email protected]>Signed-off-by Markus Pargmann <[email protected]>--- arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 ----- 1 file changed, 5 deletions(-)arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +0
-6@@ -559,11 +559,6 @@ status = "okay"; }; -&ssi2 { - fsl,mode = "i2s-slave"; - status = "okay"; -}; - &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; --
Quoted 2 lines
2.0.0
Tim
PATCH 2/7 ARM: dts: imx50, add ssi dma properties
In reply to Markus PargmannReplace old ssi dma properties by the generic dma properties.
--- arch/arm/boot/dts/imx50.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx50.dtsi +6 -2
@@ -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"; };
Signature · 1 line
2.0.0
PATCH 3/7 ARM: dts: imx5*, remove fsl,ssi-dma-events
In reply to Markus PargmannAll imx5*.dtsi files define the generic dma bindings. Drop the old non-generic fsl,ssi-dma-events.
--- arch/arm/boot/dts/imx51.dtsi | 3 --- arch/arm/boot/dts/imx53.dtsi | 3 --- 2 files changed, 6 deletions(-)
arch/arm/boot/dts/imx51.dtsi +0 -3
@@ -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"; };
arch/arm/boot/dts/imx53.dtsi +0 -3
@@ -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"; };
Signature · 1 line
2.0.0
PATCH 4/7 arm: dts: imx6qdl, remove fsl,ssi-dma-events
In reply to Markus PargmannAll dtsi files where already moved to generic dma bindings. Remove the old non-generic DMA properties.
--- arch/arm/boot/dts/imx6qdl.dtsi | 3 --- 1 file changed, 3 deletions(-)
arch/arm/boot/dts/imx6qdl.dtsi +0 -3
@@ -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"; };
Signature · 1 line
2.0.0
PATCH 5/7 ARM: dts: imx2*, remove ssi fsl,mode for sgtl5000 cards
In reply to Markus PargmannThe 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.
--- arch/arm/boot/dts/imx25-pdk.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/imx25-pdk.dts +0 -1
@@ -233,7 +233,6 @@ &ssi1 { codec-handle = <&codec>; - fsl,mode = "i2s-slave"; status = "okay"; };
Signature · 1 line
2.0.0
PATCH 6/7 ARM: dts: imx5*, remove ssi fsl,mode for sgtl5000 cards
In reply to Markus PargmannThe 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.
--- 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(-)
arch/arm/boot/dts/imx51-babbage.dts +0 -1
@@ -392,7 +392,6 @@ }; &ssi2 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx53-m53evk.dts +0 -1
@@ -429,7 +429,6 @@ }; &ssi2 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx53-mba53.dts +0 -1
@@ -225,7 +225,6 @@ }; &ssi2 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx53-qsb-common.dtsi +0 -1
@@ -141,7 +141,6 @@ }; &ssi2 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx53-tx53.dtsi +0 -1
@@ -502,7 +502,6 @@ }; &ssi1 { - fsl,mode = "i2s-slave"; codec-handle = <&sgtl5000>; status = "okay"; };
arch/arm/boot/dts/imx53-voipac-bsb.dts +0 -1
@@ -154,6 +154,5 @@ }; &ssi2 { - fsl,mode = "i2s-slave"; status = "okay"; };
Signature · 1 line
2.0.0
PATCH 7/7 ARM: dts: imx6*, remove ssi fsl,mode for sgtl5000 cards
In reply to Markus PargmannThe 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.
--- 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(-)
arch/arm/boot/dts/imx6dl-riotboard.dts +0 -1
@@ -254,7 +254,6 @@ }; &ssi1 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx6q-gw5400-a.dts +0 -1
@@ -504,7 +504,6 @@ }; &ssi1 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +0 -1
@@ -489,7 +489,6 @@ }; &ssi1 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +0 -1
@@ -533,7 +533,6 @@ }; &ssi1 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +0 -1
@@ -555,7 +555,6 @@ }; &ssi1 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +0 -1
@@ -381,7 +381,6 @@ }; &ssi1 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +0 -1
@@ -381,7 +381,6 @@ }; &ssi1 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx6qdl-sabresd.dtsi +0 -1
@@ -512,7 +512,6 @@ }; &ssi2 { - fsl,mode = "i2s-slave"; status = "okay"; };
arch/arm/boot/dts/imx6qdl-wandboard.dtsi +0 -1
@@ -233,7 +233,6 @@ }; &ssi1 { - fsl,mode = "i2s-slave"; status = "okay"; };
Signature · 1 line
2.0.0
cover ARM: dts: ssi device node updates
In reply to Markus PargmannQuoted 3 lines · Markus Pargmann
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.
Quoted 10 lines
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(-)
cover ARM: dts: ssi device node updates
Hi Shawn,
Quoted 17 lines · Shawn Guo
Quoted 3 lines · Markus Pargmann
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.
Quoted 7 lines
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.
Quoted 8 lines
Quoted 3 lines
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.
Quoted 4 lines
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
Quoted 36 lines
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 cardsarch/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(-)
Signature · 11 lines
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>