On Sat, Feb 22, 2020 at 3:45 PM Masahiro Yamada
<yamada.masahiro@xxxxxxxxxxxxx> wrote:
>
> Follow the standard nodename pattern "^mmc(@.*)?$" defined in
> Documentation/devicetree/bindings/mmc/mmc-controller.yaml
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
> ---
Applied to linux-uniphier.
> arch/arm/boot/dts/uniphier-ld4.dtsi | 4 ++--
> arch/arm/boot/dts/uniphier-pro4.dtsi | 6 +++---
> arch/arm/boot/dts/uniphier-pro5.dtsi | 4 ++--
> arch/arm/boot/dts/uniphier-pxs2.dtsi | 4 ++--
> arch/arm/boot/dts/uniphier-sld8.dtsi | 4 ++--
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
> index 64ec46c72a4c..f3a20dc0b22b 100644
> --- a/arch/arm/boot/dts/uniphier-ld4.dtsi
> +++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
> @@ -245,7 +245,7 @@
> #dma-cells = <1>;
> };
>
> - sd: sdhc@5a400000 {
> + sd: mmc@5a400000 {
> compatible = "socionext,uniphier-sd-v2.91";
> status = "disabled";
> reg = <0x5a400000 0x200>;
> @@ -265,7 +265,7 @@
> sd-uhs-sdr50;
> };
>
> - emmc: sdhc@5a500000 {
> + emmc: mmc@5a500000 {
> compatible = "socionext,uniphier-sd-v2.91";
> status = "disabled";
> reg = <0x5a500000 0x200>;
> diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
> index 2ec04d7972ef..e96b5796f0f8 100644
> --- a/arch/arm/boot/dts/uniphier-pro4.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
> @@ -279,7 +279,7 @@
> #dma-cells = <1>;
> };
>
> - sd: sdhc@5a400000 {
> + sd: mmc@5a400000 {
> compatible = "socionext,uniphier-sd-v2.91";
> status = "disabled";
> reg = <0x5a400000 0x200>;
> @@ -299,7 +299,7 @@
> sd-uhs-sdr50;
> };
>
> - emmc: sdhc@5a500000 {
> + emmc: mmc@5a500000 {
> compatible = "socionext,uniphier-sd-v2.91";
> status = "disabled";
> reg = <0x5a500000 0x200>;
> @@ -317,7 +317,7 @@
> non-removable;
> };
>
> - sd1: sdhc@5a600000 {
> + sd1: mmc@5a600000 {
> compatible = "socionext,uniphier-sd-v2.91";
> status = "disabled";
> reg = <0x5a600000 0x200>;
> diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
> index ea3961f920a0..f794a0676760 100644
> --- a/arch/arm/boot/dts/uniphier-pro5.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
> @@ -469,7 +469,7 @@
> resets = <&sys_rst 2>, <&sys_rst 2>;
> };
>
> - emmc: sdhc@68400000 {
> + emmc: mmc@68400000 {
> compatible = "socionext,uniphier-sd-v3.1";
> status = "disabled";
> reg = <0x68400000 0x800>;
> @@ -485,7 +485,7 @@
> non-removable;
> };
>
> - sd: sdhc@68800000 {
> + sd: mmc@68800000 {
> compatible = "socionext,uniphier-sd-v3.1";
> status = "disabled";
> reg = <0x68800000 0x800>;
> diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> index 13b0d4a7741f..04d6bef3a00f 100644
> --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> @@ -446,7 +446,7 @@
> };
> };
>
> - emmc: sdhc@5a000000 {
> + emmc: mmc@5a000000 {
> compatible = "socionext,uniphier-sd-v3.1.1";
> status = "disabled";
> reg = <0x5a000000 0x800>;
> @@ -462,7 +462,7 @@
> non-removable;
> };
>
> - sd: sdhc@5a400000 {
> + sd: mmc@5a400000 {
> compatible = "socionext,uniphier-sd-v3.1.1";
> status = "disabled";
> reg = <0x5a400000 0x800>;
> diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
> index 4fc6676f5486..beb1eac85436 100644
> --- a/arch/arm/boot/dts/uniphier-sld8.dtsi
> +++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
> @@ -249,7 +249,7 @@
> #dma-cells = <1>;
> };
>
> - sd: sdhc@5a400000 {
> + sd: mmc@5a400000 {
> compatible = "socionext,uniphier-sd-v2.91";
> status = "disabled";
> reg = <0x5a400000 0x200>;
> @@ -269,7 +269,7 @@
> sd-uhs-sdr50;
> };
>
> - emmc: sdhc@5a500000 {
> + emmc: mmc@5a500000 {
> compatible = "socionext,uniphier-sd-v2.91";
> status = "disabled";
> reg = <0x5a500000 0x200>;
> --
> 2.17.1
>
--
Best Regards
Masahiro Yamada
