| Message ID | 1591094690-30514-1-git-send-email-shengjiu.wang@nxp.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5da1b522cf7dc51f7fde2cca8d90406b0291c503 |
| Headers | show |
| Series | ARM: dts: imx6sll: Make ssi node name same as other platforms | expand |
On Tue, Jun 02, 2020 at 06:44:50PM +0800, Shengjiu Wang wrote: > In imx6sll.dtsi, the ssi node name is different with other > platforms (imx6qdl, imx6sl, imx6sx), but the > sound/soc/fsl/fsl-asoc-card.c machine driver needs to check > ssi node name for audmux configuration, then different ssi > node name causes issue on imx6sll platform. > > So we change ssi node name to make all platforms have same > name. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> Applied, thanks.
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi index edd3abb9a9f1..51e59e16f6c9 100644 --- a/arch/arm/boot/dts/imx6sll.dtsi +++ b/arch/arm/boot/dts/imx6sll.dtsi @@ -271,7 +271,7 @@ status = "disabled"; }; - ssi1: ssi-controller@2028000 { + ssi1: ssi@2028000 { compatible = "fsl,imx6sl-ssi", "fsl,imx51-ssi"; reg = <0x02028000 0x4000>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; @@ -284,7 +284,7 @@ status = "disabled"; }; - ssi2: ssi-controller@202c000 { + ssi2: ssi@202c000 { compatible = "fsl,imx6sl-ssi", "fsl,imx51-ssi"; reg = <0x0202c000 0x4000>; interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; @@ -297,7 +297,7 @@ status = "disabled"; }; - ssi3: ssi-controller@2030000 { + ssi3: ssi@2030000 { compatible = "fsl,imx6sl-ssi", "fsl,imx51-ssi"; reg = <0x02030000 0x4000>; interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
In imx6sll.dtsi, the ssi node name is different with other platforms (imx6qdl, imx6sl, imx6sx), but the sound/soc/fsl/fsl-asoc-card.c machine driver needs to check ssi node name for audmux configuration, then different ssi node name causes issue on imx6sll platform. So we change ssi node name to make all platforms have same name. Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- arch/arm/boot/dts/imx6sll.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)