lkml.org 
[lkml]   [2020]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/28] ARM: dts: berlin*: Fix up the SDHCI node names
    Date
    The node name preferred by mmc-controller.yaml binding spec is "mmc":

    berlin2-sony-nsz-gs7.dt.yaml: sdhci@ab0000: $nodename:0:
    'sdhci@ab0000' does not match '^mmc(@.*)?$'
    berlin2-sony-nsz-gs7.dt.yaml: sdhci@ab0800: $nodename:0:
    'sdhci@ab0800' does not match '^mmc(@.*)?$'
    berlin2-sony-nsz-gs7.dt.yaml: sdhci@ab1000: $nodename:0:
    'sdhci@ab1000' does not match '^mmc(@.*)?$'
    berlin2cd-google-chromecast.dt.yaml: sdhci@ab0000: $nodename:0:
    'sdhci@ab0000' does not match '^mmc(@.*)?$'
    berlin2cd-valve-steamlink.dt.yaml: sdhci@ab0000: $nodename:0:
    'sdhci@ab0000' does not match '^mmc(@.*)?$'
    berlin2q-marvell-dmp.dt.yaml: sdhci@ab0000: $nodename:0:
    'sdhci@ab0000' does not match '^mmc(@.*)?$'
    berlin2q-marvell-dmp.dt.yaml: sdhci@ab0800: $nodename:0:
    'sdhci@ab0800' does not match '^mmc(@.*)?$'
    berlin2q-marvell-dmp.dt.yaml: sdhci@ab1000: $nodename:0:
    'sdhci@ab1000' does not match '^mmc(@.*)?$'

    Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
    ---
    arch/arm/boot/dts/berlin2.dtsi | 6 +++---
    arch/arm/boot/dts/berlin2cd.dtsi | 2 +-
    arch/arm/boot/dts/berlin2q.dtsi | 6 +++---
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
    index d2f7d984bba5c..3ab3cd250da70 100644
    --- a/arch/arm/boot/dts/berlin2.dtsi
    +++ b/arch/arm/boot/dts/berlin2.dtsi
    @@ -77,7 +77,7 @@ soc@f7000000 {

    ranges = <0 0xf7000000 0x1000000>;

    - sdhci0: sdhci@ab0000 {
    + sdhci0: mmc@ab0000 {
    compatible = "mrvl,pxav3-mmc";
    reg = <0xab0000 0x200>;
    clocks = <&chip_clk CLKID_SDIO0XIN>, <&chip_clk CLKID_SDIO0>;
    @@ -86,7 +86,7 @@ sdhci0: sdhci@ab0000 {
    status = "disabled";
    };

    - sdhci1: sdhci@ab0800 {
    + sdhci1: mmc@ab0800 {
    compatible = "mrvl,pxav3-mmc";
    reg = <0xab0800 0x200>;
    clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO1>;
    @@ -95,7 +95,7 @@ sdhci1: sdhci@ab0800 {
    status = "disabled";
    };

    - sdhci2: sdhci@ab1000 {
    + sdhci2: mmc@ab1000 {
    compatible = "mrvl,pxav3-mmc";
    reg = <0xab1000 0x200>;
    interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
    diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
    index e5c1f4213ff90..7cf3e6302d75c 100644
    --- a/arch/arm/boot/dts/berlin2cd.dtsi
    +++ b/arch/arm/boot/dts/berlin2cd.dtsi
    @@ -62,7 +62,7 @@ soc@f7000000 {

    ranges = <0 0xf7000000 0x1000000>;

    - sdhci0: sdhci@ab0000 {
    + sdhci0: mmc@ab0000 {
    compatible = "mrvl,pxav3-mmc";
    reg = <0xab0000 0x200>;
    clocks = <&chip_clk CLKID_SDIO0XIN>, <&chip_clk CLKID_SDIO0>;
    diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
    index 99d6872a6dfcc..c44a32e873f44 100644
    --- a/arch/arm/boot/dts/berlin2q.dtsi
    +++ b/arch/arm/boot/dts/berlin2q.dtsi
    @@ -122,7 +122,7 @@ soc@f7000000 {
    ranges = <0 0xf7000000 0x1000000>;
    interrupt-parent = <&gic>;

    - sdhci0: sdhci@ab0000 {
    + sdhci0: mmc@ab0000 {
    compatible = "mrvl,pxav3-mmc";
    reg = <0xab0000 0x200>;
    clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
    @@ -131,7 +131,7 @@ sdhci0: sdhci@ab0000 {
    status = "disabled";
    };

    - sdhci1: sdhci@ab0800 {
    + sdhci1: mmc@ab0800 {
    compatible = "mrvl,pxav3-mmc";
    reg = <0xab0800 0x200>;
    clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
    @@ -140,7 +140,7 @@ sdhci1: sdhci@ab0800 {
    status = "disabled";
    };

    - sdhci2: sdhci@ab1000 {
    + sdhci2: mmc@ab1000 {
    compatible = "mrvl,pxav3-mmc";
    reg = <0xab1000 0x200>;
    interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-03-17 10:43    [W:5.655 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site