diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:10:49 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:10:49 +0200 |
commit | e4ea8e8bfa7a37fea2d97c3d268206417e196bdf (patch) | |
tree | 44e2513021a45b23fdd897ab91e3588101e7e844 /dts/src/arm/uniphier-pro4.dtsi | |
parent | 9859cb41d7d737852d3334d33c6d2c2c9bbc75c6 (diff) | |
parent | 65aeb63c89e7b4e701ff1b1880818197b162d9e6 (diff) | |
download | barebox-e4ea8e8bfa7a37fea2d97c3d268206417e196bdf.tar.gz barebox-e4ea8e8bfa7a37fea2d97c3d268206417e196bdf.tar.xz |
Merge branch 'for-next/dts'
Diffstat (limited to 'dts/src/arm/uniphier-pro4.dtsi')
-rw-r--r-- | dts/src/arm/uniphier-pro4.dtsi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dts/src/arm/uniphier-pro4.dtsi b/dts/src/arm/uniphier-pro4.dtsi index 2ec04d7972..1c866f0306 100644 --- a/dts/src/arm/uniphier-pro4.dtsi +++ b/dts/src/arm/uniphier-pro4.dtsi @@ -59,7 +59,7 @@ ranges; interrupt-parent = <&intc>; - l2: l2-cache@500c0000 { + l2: cache-controller@500c0000 { compatible = "socionext,uniphier-system-cache"; reg = <0x500c0000 0x2000>, <0x503c0100 0x4>, <0x506c0000 0x400>; @@ -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>; @@ -426,7 +426,7 @@ }; }; - aidet: aidet@5fc20000 { + aidet: interrupt-controller@5fc20000 { compatible = "socionext,uniphier-pro4-aidet"; reg = <0x5fc20000 0x200>; interrupt-controller; @@ -588,7 +588,7 @@ }; }; - nand: nand@68000000 { + nand: nand-controller@68000000 { compatible = "socionext,uniphier-denali-nand-v5a"; status = "disabled"; reg-names = "nand_data", "denali_reg"; |