Skip to content

Commit fcaa61a

Browse files
robherringffainelli
authored andcommitted
arm64: dts: broadcom: Use preferred node names
Update various node names to use the documented preferred names. Node names/path aren't considered ABI, so changing them should be safe. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Link: https://lore.kernel.org/r/20260106-dt-dtbs-broadcom-fixes-v1-8-ba45874e4553@kernel.org Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
1 parent 8a4cac0 commit fcaa61a

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
&ssp1 {
112112
status = "okay";
113113

114-
at25@0 {
114+
eeprom@0 {
115115
compatible = "atmel,at25";
116116
reg = <0>;
117117
spi-max-frequency = <5000000>;
@@ -151,7 +151,7 @@
151151
};
152152

153153
&nand {
154-
nandcs@0 {
154+
nand@0 {
155155
compatible = "brcm,nandcs";
156156
reg = <0>;
157157
nand-ecc-mode = "hw";

arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
};
7575

7676
&nand {
77-
nandcs@0 {
77+
nand@0 {
7878
compatible = "brcm,nandcs";
7979
reg = <0>;
8080
nand-ecc-mode = "hw";

arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@
657657
reg = <0x66220000 0x28>;
658658
};
659659

660-
sata_phy: sata_phy@663f0100 {
660+
sata_phy: sata-phy@663f0100 {
661661
compatible = "brcm,iproc-ns2-sata-phy";
662662
reg = <0x663f0100 0x1f00>,
663663
<0x663f004c 0x10>;
@@ -701,7 +701,7 @@
701701
};
702702
};
703703

704-
sdio0: sdhci@66420000 {
704+
sdio0: mmc@66420000 {
705705
compatible = "brcm,sdhci-iproc-cygnus";
706706
reg = <0x66420000 0x100>;
707707
interrupts = <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>;
@@ -711,7 +711,7 @@
711711
status = "disabled";
712712
};
713713

714-
sdio1: sdhci@66430000 {
714+
sdio1: mmc@66430000 {
715715
compatible = "brcm,sdhci-iproc-cygnus";
716716
reg = <0x66430000 0x100>;
717717
interrupts = <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
@@ -721,7 +721,7 @@
721721
status = "disabled";
722722
};
723723

724-
nand: nand@66460000 {
724+
nand: nand-controller@66460000 {
725725
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
726726
reg = <0x66460000 0x600>,
727727
<0x67015408 0x600>,

arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888

8989
&nand {
9090
status = "okay";
91-
nandcs@0 {
91+
nand@0 {
9292
compatible = "brcm,nandcs";
9393
reg = <0>;
9494
nand-ecc-mode = "hw";

arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#include <dt-bindings/pinctrl/brcm,pinctrl-stingray.h>
3434

35-
pinconf: pinconf@140000 {
35+
pinconf: pinctrl@140000 {
3636
compatible = "pinconf-single";
3737
reg = <0x00140000 0x250>;
3838
pinctrl-single,register-width = <32>;

arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@
691691
status = "disabled";
692692
};
693693

694-
nand: nand@360000 {
694+
nand: nand-controller@360000 {
695695
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
696696
reg = <0x00360000 0x600>,
697697
<0x0050a408 0x600>,
@@ -704,7 +704,7 @@
704704
status = "disabled";
705705
};
706706

707-
sdio0: sdhci@3f1000 {
707+
sdio0: mmc@3f1000 {
708708
compatible = "brcm,sdhci-iproc";
709709
reg = <0x003f1000 0x100>;
710710
interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>;
@@ -714,7 +714,7 @@
714714
status = "disabled";
715715
};
716716

717-
sdio1: sdhci@3f2000 {
717+
sdio1: mmc@3f2000 {
718718
compatible = "brcm,sdhci-iproc";
719719
reg = <0x003f2000 0x100>;
720720
interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)