git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '949bdcc8a97c' into omap-for-v4.19/dt
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
armada-38x.dtsi
diff --git
a/arch/arm/boot/dts/armada-38x.dtsi
b/arch/arm/boot/dts/armada-38x.dtsi
index 6916d7532ad2ca07117937b388b39a6adc39fed9..18edc9bc79273b794ce263ce7d9674f43732c58e 100644
(file)
--- a/
arch/arm/boot/dts/armada-38x.dtsi
+++ b/
arch/arm/boot/dts/armada-38x.dtsi
@@
-551,11
+551,11
@@
status = "okay";
};
status = "okay";
};
- nand
: flash
@d0000 {
- compatible = "marvell,armada370-nand";
+ nand
_controller: nand-controller
@d0000 {
+ compatible = "marvell,armada370-nand
-controller
";
reg = <0xd0000 0x54>;
#address-cells = <1>;
reg = <0xd0000 0x54>;
#address-cells = <1>;
- #size-cells = <
1
>;
+ #size-cells = <
0
>;
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&coredivclk 0>;
status = "disabled";
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&coredivclk 0>;
status = "disabled";