lkml.org 
[lkml]   [2021]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.13 067/108] ARM: dts: bcm283x: Fix up MMC node names
    Date
    From: Stefan Wahren <stefan.wahren@i2se.com>

    [ Upstream commit f230c32349eb0a43a012a81c08a7f13859b86cbb ]

    Fix the node names for the MMC/SD card controller to conform
    to the standard node name mmc@..

    Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
    Link: https://lore.kernel.org/r/1622981777-5023-2-git-send-email-stefan.wahren@i2se.com
    Signed-off-by: Nicolas Saenz Julienne <nsaenz@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/bcm2711.dtsi | 2 +-
    arch/arm/boot/dts/bcm283x.dtsi | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
    index 720beec54d61..d872064db761 100644
    --- a/arch/arm/boot/dts/bcm2711.dtsi
    +++ b/arch/arm/boot/dts/bcm2711.dtsi
    @@ -413,7 +413,7 @@ emmc2bus: emmc2bus {
    ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>;
    dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>;

    - emmc2: emmc2@7e340000 {
    + emmc2: mmc@7e340000 {
    compatible = "brcm,bcm2711-emmc2";
    reg = <0x0 0x7e340000 0x100>;
    interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
    diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
    index b83a864e2e8b..0f3be55201a5 100644
    --- a/arch/arm/boot/dts/bcm283x.dtsi
    +++ b/arch/arm/boot/dts/bcm283x.dtsi
    @@ -420,7 +420,7 @@ pwm: pwm@7e20c000 {
    status = "disabled";
    };

    - sdhci: sdhci@7e300000 {
    + sdhci: mmc@7e300000 {
    compatible = "brcm,bcm2835-sdhci";
    reg = <0x7e300000 0x100>;
    interrupts = <2 30>;
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-14 21:41    [W:5.061 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site