| Message ID | 20200222064445.14903-2-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | bb3f46726bb94292c672a5f34a544e398436af7f |
| Headers | show |
| Series | [1/4] ARM: dts: uniphier: change SD/eMMC node names to follow json-schema | expand |
On Sat, Feb 22, 2020 at 3:45 PM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > Follow the standard nodename pattern "^mmc(@.*)?$" defined in > Documentation/devicetree/bindings/mmc/mmc-controller.yaml > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Applied to linux-uniphier. > arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 2 +- > arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 ++-- > arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi > index 5b18bda9c5a6..7510db465f33 100644 > --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi > +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi > @@ -433,7 +433,7 @@ > }; > }; > > - emmc: sdhc@5a000000 { > + emmc: mmc@5a000000 { > compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; > reg = <0x5a000000 0x400>; > interrupts = <0 78 4>; > diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi > index f2dc5f695020..8d360c5cc32b 100644 > --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi > +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi > @@ -559,7 +559,7 @@ > }; > }; > > - emmc: sdhc@5a000000 { > + emmc: mmc@5a000000 { > compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; > reg = <0x5a000000 0x400>; > interrupts = <0 78 4>; > @@ -578,7 +578,7 @@ > cdns,phy-dll-delay-sdclk-hsmmc = <21>; > }; > > - sd: sdhc@5a400000 { > + sd: mmc@5a400000 { > compatible = "socionext,uniphier-sd-v3.1.1"; > status = "disabled"; > reg = <0x5a400000 0x800>; > diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi > index 73e7e1203b09..d51b0735917c 100644 > --- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi > +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi > @@ -353,7 +353,7 @@ > }; > }; > > - emmc: sdhc@5a000000 { > + emmc: mmc@5a000000 { > compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; > reg = <0x5a000000 0x400>; > interrupts = <0 78 4>; > @@ -372,7 +372,7 @@ > cdns,phy-dll-delay-sdclk-hsmmc = <21>; > }; > > - sd: sdhc@5a400000 { > + sd: mmc@5a400000 { > compatible = "socionext,uniphier-sd-v3.1.1"; > status = "disabled"; > reg = <0x5a400000 0x800>; > -- > 2.17.1 >
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi index 5b18bda9c5a6..7510db465f33 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi @@ -433,7 +433,7 @@ }; }; - emmc: sdhc@5a000000 { + emmc: mmc@5a000000 { compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; reg = <0x5a000000 0x400>; interrupts = <0 78 4>; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index f2dc5f695020..8d360c5cc32b 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -559,7 +559,7 @@ }; }; - emmc: sdhc@5a000000 { + emmc: mmc@5a000000 { compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; reg = <0x5a000000 0x400>; interrupts = <0 78 4>; @@ -578,7 +578,7 @@ cdns,phy-dll-delay-sdclk-hsmmc = <21>; }; - sd: sdhc@5a400000 { + sd: mmc@5a400000 { compatible = "socionext,uniphier-sd-v3.1.1"; status = "disabled"; reg = <0x5a400000 0x800>; diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi index 73e7e1203b09..d51b0735917c 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi @@ -353,7 +353,7 @@ }; }; - emmc: sdhc@5a000000 { + emmc: mmc@5a000000 { compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; reg = <0x5a000000 0x400>; interrupts = <0 78 4>; @@ -372,7 +372,7 @@ cdns,phy-dll-delay-sdclk-hsmmc = <21>; }; - sd: sdhc@5a400000 { + sd: mmc@5a400000 { compatible = "socionext,uniphier-sd-v3.1.1"; status = "disabled"; reg = <0x5a400000 0x800>;
Follow the standard nodename pattern "^mmc(@.*)?$" defined in Documentation/devicetree/bindings/mmc/mmc-controller.yaml Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 ++-- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)