* [PATCH 2/4] arm64: dts: uniphier: change SD/eMMC node names to follow json-schema
2020-02-22 6:44 [PATCH 1/4] ARM: dts: uniphier: change SD/eMMC node names to follow json-schema Masahiro Yamada
@ 2020-02-22 6:44 ` Masahiro Yamada
2020-02-29 6:11 ` Masahiro Yamada
2020-02-22 6:44 ` [PATCH 3/4] ARM: dts: uniphier: rename aidet " Masahiro Yamada
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2020-02-22 6:44 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Rob Herring, devicetree, linux-kernel, masahiroy,
Masahiro Yamada, Mark Rutland
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(-)
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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 2/4] arm64: dts: uniphier: change SD/eMMC node names to follow json-schema
2020-02-22 6:44 ` [PATCH 2/4] arm64: " Masahiro Yamada
@ 2020-02-29 6:11 ` Masahiro Yamada
0 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2020-02-29 6:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Rob Herring, DTML, Linux Kernel Mailing List, Mark Rutland
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
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] ARM: dts: uniphier: rename aidet node names to follow json-schema
2020-02-22 6:44 [PATCH 1/4] ARM: dts: uniphier: change SD/eMMC node names to follow json-schema Masahiro Yamada
2020-02-22 6:44 ` [PATCH 2/4] arm64: " Masahiro Yamada
@ 2020-02-22 6:44 ` Masahiro Yamada
2020-02-29 6:10 ` Masahiro Yamada
2020-02-22 6:44 ` [PATCH 4/4] arm64: " Masahiro Yamada
2020-02-29 6:11 ` [PATCH 1/4] ARM: dts: uniphier: change SD/eMMC " Masahiro Yamada
3 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2020-02-22 6:44 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Rob Herring, devicetree, linux-kernel, masahiroy,
Masahiro Yamada, Mark Rutland
Follow the standard nodename pattern "^interrupt-controller(@[0-9a-f,]+)*$"
defined in schemas/interrupt-controller.yaml of dt-schema.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/arm/boot/dts/uniphier-ld4.dtsi | 2 +-
arch/arm/boot/dts/uniphier-pro4.dtsi | 2 +-
arch/arm/boot/dts/uniphier-pro5.dtsi | 2 +-
arch/arm/boot/dts/uniphier-pxs2.dtsi | 2 +-
arch/arm/boot/dts/uniphier-sld8.dtsi | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
index f3a20dc0b22b..23b8fd627c00 100644
--- a/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -375,7 +375,7 @@
interrupt-controller;
};
- aidet: aidet@61830000 {
+ aidet: interrupt-controller@61830000 {
compatible = "socionext,uniphier-ld4-aidet";
reg = <0x61830000 0x200>;
interrupt-controller;
diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
index e96b5796f0f8..eb06c353970f 100644
--- a/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -426,7 +426,7 @@
};
};
- aidet: aidet@5fc20000 {
+ aidet: interrupt-controller@5fc20000 {
compatible = "socionext,uniphier-pro4-aidet";
reg = <0x5fc20000 0x200>;
interrupt-controller;
diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
index f794a0676760..c95eb44c816d 100644
--- a/arch/arm/boot/dts/uniphier-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
@@ -408,7 +408,7 @@
};
};
- aidet: aidet@5fc20000 {
+ aidet: interrupt-controller@5fc20000 {
compatible = "socionext,uniphier-pro5-aidet";
reg = <0x5fc20000 0x200>;
interrupt-controller;
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index 04d6bef3a00f..c054d0175df9 100644
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -508,7 +508,7 @@
};
};
- aidet: aidet@5fc20000 {
+ aidet: interrupt-controller@5fc20000 {
compatible = "socionext,uniphier-pxs2-aidet";
reg = <0x5fc20000 0x200>;
interrupt-controller;
diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index beb1eac85436..a05061038e78 100644
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -379,7 +379,7 @@
interrupt-controller;
};
- aidet: aidet@61830000 {
+ aidet: interrupt-controller@61830000 {
compatible = "socionext,uniphier-sld8-aidet";
reg = <0x61830000 0x200>;
interrupt-controller;
--
2.17.1
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 3/4] ARM: dts: uniphier: rename aidet node names to follow json-schema
2020-02-22 6:44 ` [PATCH 3/4] ARM: dts: uniphier: rename aidet " Masahiro Yamada
@ 2020-02-29 6:10 ` Masahiro Yamada
0 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2020-02-29 6:10 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Rob Herring, DTML, Linux Kernel Mailing List, Mark Rutland
On Sat, Feb 22, 2020 at 3:45 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> Follow the standard nodename pattern "^interrupt-controller(@[0-9a-f,]+)*$"
> defined in schemas/interrupt-controller.yaml of dt-schema.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
Applied to linux-uniphier.
> arch/arm/boot/dts/uniphier-ld4.dtsi | 2 +-
> arch/arm/boot/dts/uniphier-pro4.dtsi | 2 +-
> arch/arm/boot/dts/uniphier-pro5.dtsi | 2 +-
> arch/arm/boot/dts/uniphier-pxs2.dtsi | 2 +-
> arch/arm/boot/dts/uniphier-sld8.dtsi | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
> index f3a20dc0b22b..23b8fd627c00 100644
> --- a/arch/arm/boot/dts/uniphier-ld4.dtsi
> +++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
> @@ -375,7 +375,7 @@
> interrupt-controller;
> };
>
> - aidet: aidet@61830000 {
> + aidet: interrupt-controller@61830000 {
> compatible = "socionext,uniphier-ld4-aidet";
> reg = <0x61830000 0x200>;
> interrupt-controller;
> diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
> index e96b5796f0f8..eb06c353970f 100644
> --- a/arch/arm/boot/dts/uniphier-pro4.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
> @@ -426,7 +426,7 @@
> };
> };
>
> - aidet: aidet@5fc20000 {
> + aidet: interrupt-controller@5fc20000 {
> compatible = "socionext,uniphier-pro4-aidet";
> reg = <0x5fc20000 0x200>;
> interrupt-controller;
> diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
> index f794a0676760..c95eb44c816d 100644
> --- a/arch/arm/boot/dts/uniphier-pro5.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
> @@ -408,7 +408,7 @@
> };
> };
>
> - aidet: aidet@5fc20000 {
> + aidet: interrupt-controller@5fc20000 {
> compatible = "socionext,uniphier-pro5-aidet";
> reg = <0x5fc20000 0x200>;
> interrupt-controller;
> diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> index 04d6bef3a00f..c054d0175df9 100644
> --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> @@ -508,7 +508,7 @@
> };
> };
>
> - aidet: aidet@5fc20000 {
> + aidet: interrupt-controller@5fc20000 {
> compatible = "socionext,uniphier-pxs2-aidet";
> reg = <0x5fc20000 0x200>;
> interrupt-controller;
> diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
> index beb1eac85436..a05061038e78 100644
> --- a/arch/arm/boot/dts/uniphier-sld8.dtsi
> +++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
> @@ -379,7 +379,7 @@
> interrupt-controller;
> };
>
> - aidet: aidet@61830000 {
> + aidet: interrupt-controller@61830000 {
> compatible = "socionext,uniphier-sld8-aidet";
> reg = <0x61830000 0x200>;
> interrupt-controller;
> --
> 2.17.1
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/4] arm64: dts: uniphier: rename aidet node names to follow json-schema
2020-02-22 6:44 [PATCH 1/4] ARM: dts: uniphier: change SD/eMMC node names to follow json-schema Masahiro Yamada
2020-02-22 6:44 ` [PATCH 2/4] arm64: " Masahiro Yamada
2020-02-22 6:44 ` [PATCH 3/4] ARM: dts: uniphier: rename aidet " Masahiro Yamada
@ 2020-02-22 6:44 ` Masahiro Yamada
2020-02-29 6:10 ` Masahiro Yamada
2020-02-29 6:11 ` [PATCH 1/4] ARM: dts: uniphier: change SD/eMMC " Masahiro Yamada
3 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2020-02-22 6:44 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Rob Herring, devicetree, linux-kernel, masahiroy,
Masahiro Yamada, Mark Rutland
Follow the standard nodename pattern "^interrupt-controller(@[0-9a-f,]+)*$"
defined in schemas/interrupt-controller.yaml of dt-schema.
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 | 2 +-
arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index 7510db465f33..2e53daca9f5c 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -566,7 +566,7 @@
};
};
- aidet: aidet@5fc20000 {
+ aidet: interrupt-controller@5fc20000 {
compatible = "socionext,uniphier-ld11-aidet";
reg = <0x5fc20000 0x200>;
interrupt-controller;
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index 8d360c5cc32b..be984200a70e 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -664,7 +664,7 @@
};
};
- aidet: aidet@5fc20000 {
+ aidet: interrupt-controller@5fc20000 {
compatible = "socionext,uniphier-ld20-aidet";
reg = <0x5fc20000 0x200>;
interrupt-controller;
diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
index d51b0735917c..994fea7b12c1 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
@@ -462,7 +462,7 @@
};
};
- aidet: aidet@5fc20000 {
+ aidet: interrupt-controller@5fc20000 {
compatible = "socionext,uniphier-pxs3-aidet";
reg = <0x5fc20000 0x200>;
interrupt-controller;
--
2.17.1
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 4/4] arm64: dts: uniphier: rename aidet node names to follow json-schema
2020-02-22 6:44 ` [PATCH 4/4] arm64: " Masahiro Yamada
@ 2020-02-29 6:10 ` Masahiro Yamada
0 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2020-02-29 6:10 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Rob Herring, DTML, Linux Kernel Mailing List, Mark Rutland
On Sat, Feb 22, 2020 at 3:45 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> Follow the standard nodename pattern "^interrupt-controller(@[0-9a-f,]+)*$"
> defined in schemas/interrupt-controller.yaml of dt-schema.
>
> 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 | 2 +-
> arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
> index 7510db465f33..2e53daca9f5c 100644
> --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
> +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
> @@ -566,7 +566,7 @@
> };
> };
>
> - aidet: aidet@5fc20000 {
> + aidet: interrupt-controller@5fc20000 {
> compatible = "socionext,uniphier-ld11-aidet";
> reg = <0x5fc20000 0x200>;
> interrupt-controller;
> diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
> index 8d360c5cc32b..be984200a70e 100644
> --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
> +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
> @@ -664,7 +664,7 @@
> };
> };
>
> - aidet: aidet@5fc20000 {
> + aidet: interrupt-controller@5fc20000 {
> compatible = "socionext,uniphier-ld20-aidet";
> reg = <0x5fc20000 0x200>;
> interrupt-controller;
> diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
> index d51b0735917c..994fea7b12c1 100644
> --- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
> +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
> @@ -462,7 +462,7 @@
> };
> };
>
> - aidet: aidet@5fc20000 {
> + aidet: interrupt-controller@5fc20000 {
> compatible = "socionext,uniphier-pxs3-aidet";
> reg = <0x5fc20000 0x200>;
> interrupt-controller;
> --
> 2.17.1
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] ARM: dts: uniphier: change SD/eMMC node names to follow json-schema
2020-02-22 6:44 [PATCH 1/4] ARM: dts: uniphier: change SD/eMMC node names to follow json-schema Masahiro Yamada
` (2 preceding siblings ...)
2020-02-22 6:44 ` [PATCH 4/4] arm64: " Masahiro Yamada
@ 2020-02-29 6:11 ` Masahiro Yamada
3 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2020-02-29 6:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Rob Herring, DTML, Linux Kernel Mailing List, Mark Rutland
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/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
^ permalink raw reply [flat|nested] 8+ messages in thread