| Message ID | 55c53e8d-6b30-51bf-edf6-b5b67887bd0a@gmail.com |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | soc: amlogic: switch bindings to yaml and adjust some dtbs's | expand |
Le 23/01/2023 à 22:24, Heiner Kallweit a écrit : > mmc-controller.yaml defines "^mmc(@.*)?$" as node name pattern. > In preparation of adding schema-based validation fix the node name > in two affected files. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > index 1648e67af..ed895fb32 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > @@ -1883,7 +1883,7 @@ apb: bus@ffe00000 { > #size-cells = <2>; > ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x200000>; > > - sd_emmc_b: sd@5000 { > + sd_emmc_b: mmc@5000 { > compatible = "amlogic,meson-axg-mmc"; > reg = <0x0 0x5000 0x0 0x800>; > interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>; > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > index 1a931d5c2..80d82f739 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > @@ -2321,7 +2321,7 @@ uart_A: serial@24000 { > }; > }; > > - sd_emmc_a: sd@ffe03000 { > + sd_emmc_a: mmc@ffe03000 { > compatible = "amlogic,meson-axg-mmc"; > reg = <0x0 0xffe03000 0x0 0x800>; > interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>; > @@ -2333,7 +2333,7 @@ sd_emmc_a: sd@ffe03000 { > resets = <&reset RESET_SD_EMMC_A>; > }; > > - sd_emmc_b: sd@ffe05000 { > + sd_emmc_b: mmc@ffe05000 { > compatible = "amlogic,meson-axg-mmc"; > reg = <0x0 0xffe05000 0x0 0x800>; > interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>; Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 1648e67af..ed895fb32 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -1883,7 +1883,7 @@ apb: bus@ffe00000 { #size-cells = <2>; ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x200000>; - sd_emmc_b: sd@5000 { + sd_emmc_b: mmc@5000 { compatible = "amlogic,meson-axg-mmc"; reg = <0x0 0x5000 0x0 0x800>; interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 1a931d5c2..80d82f739 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2321,7 +2321,7 @@ uart_A: serial@24000 { }; }; - sd_emmc_a: sd@ffe03000 { + sd_emmc_a: mmc@ffe03000 { compatible = "amlogic,meson-axg-mmc"; reg = <0x0 0xffe03000 0x0 0x800>; interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>; @@ -2333,7 +2333,7 @@ sd_emmc_a: sd@ffe03000 { resets = <&reset RESET_SD_EMMC_A>; }; - sd_emmc_b: sd@ffe05000 { + sd_emmc_b: mmc@ffe05000 { compatible = "amlogic,meson-axg-mmc"; reg = <0x0 0xffe05000 0x0 0x800>; interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;
mmc-controller.yaml defines "^mmc(@.*)?$" as node name pattern. In preparation of adding schema-based validation fix the node name in two affected files. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)