diff options
| author | Shengjiu Wang <shengjiu.wang@nxp.com> | 2020-06-02 12:44:50 +0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2020-07-13 12:44:42 +0200 |
| commit | 5da1b522cf7dc51f7fde2cca8d90406b0291c503 (patch) | |
| tree | 503caaab8e618963a0922079e64475230a577e11 | |
| parent | ARM: dts: imx: Change usdhc node name on i.MX6/i.MX7 SoCs (diff) | |
| download | linux-5da1b522cf7dc51f7fde2cca8d90406b0291c503.tar.xz linux-5da1b522cf7dc51f7fde2cca8d90406b0291c503.zip | |
ARM: dts: imx6sll: Make ssi node name same as other platforms
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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
| -rw-r--r-- | arch/arm/boot/dts/imx6sll.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi index b715aa7ed599..3d1a689f5dec 100644 --- a/arch/arm/boot/dts/imx6sll.dtsi +++ b/arch/arm/boot/dts/imx6sll.dtsi @@ -261,7 +261,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>; @@ -274,7 +274,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>; @@ -287,7 +287,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>; |