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/arm64/socionext/uniphier-ld11.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/arm64/socionext/uniphier-ld11.dtsi')
-rw-r--r-- | dts/src/arm64/socionext/uniphier-ld11.dtsi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dts/src/arm64/socionext/uniphier-ld11.dtsi b/dts/src/arm64/socionext/uniphier-ld11.dtsi index 5b18bda9c5..2ca2d3dc8d 100644 --- a/dts/src/arm64/socionext/uniphier-ld11.dtsi +++ b/dts/src/arm64/socionext/uniphier-ld11.dtsi @@ -143,8 +143,8 @@ interrupts = <0 216 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi1>; - clocks = <&peri_clk 11>; - resets = <&peri_rst 11>; + clocks = <&peri_clk 12>; + resets = <&peri_rst 12>; }; serial0: serial@54006800 { @@ -433,7 +433,7 @@ }; }; - emmc: sdhc@5a000000 { + emmc: mmc@5a000000 { compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; reg = <0x5a000000 0x400>; interrupts = <0 78 4>; @@ -566,7 +566,7 @@ }; }; - aidet: aidet@5fc20000 { + aidet: interrupt-controller@5fc20000 { compatible = "socionext,uniphier-ld11-aidet"; reg = <0x5fc20000 0x200>; interrupt-controller; @@ -621,7 +621,7 @@ }; }; - nand: nand@68000000 { + nand: nand-controller@68000000 { compatible = "socionext,uniphier-denali-nand-v5b"; status = "disabled"; reg-names = "nand_data", "denali_reg"; |