diff options
| author | Olof Johansson <olof@lixom.net> | 2018-01-04 22:52:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-01-04 22:52:45 -0800 |
| commit | fb21a1a4e1c8478b90855813c95789f321f96198 (patch) | |
| tree | 843f449ae7799b499cfbc7c108bacfd8d32c0215 | |
| parent | 150daec9dc3e8e16a42109a347857e3914e6ea52 (diff) | |
| parent | cea96bf1836f22d2586f650a0299bd37abf2d42e (diff) | |
Merge tag 'mvebu-dt-4.16-1' of git://git.infradead.org/linux-mvebu into next/dt
mvebu dt for 4.16 (part 1)
Fix potential dtc warnings on kirkwoods files
Declare a new pin (RB) usbale for NAND controller on Armada 38x
* tag 'mvebu-dt-4.16-1' of git://git.infradead.org/linux-mvebu:
arm: kirkwood: dts: Use lower case for bindings notation
ARM: dts: armada-38x: Add NAND RB pinctrl information
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-linksys-viper.dts | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 00ff549d4e39..a6cc568f74f7 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -279,6 +279,11 @@ marvell,function = "dev"; }; + nand_rb: nand-rb { + marvell,pins = "mpp41"; + marvell,function = "nand"; + }; + uart0_pins: uart-pins-0 { marvell,pins = "mpp0", "mpp1"; marvell,function = "ua0"; diff --git a/arch/arm/boot/dts/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/kirkwood-linksys-viper.dts index df7851820507..f21a50dd9869 100644 --- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts +++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts @@ -157,7 +157,7 @@ reg = <0x80000 0x20000>; }; - partition@A0000 { + partition@a0000 { label = "s_env"; reg = <0xA0000 0x20000>; }; @@ -167,17 +167,17 @@ reg = <0x200000 0x2A0000>; }; - partition@4A0000 { + partition@4a0000 { label = "rootfs"; reg = <0x4A0000 0x1760000>; }; - partition@1C00000 { + partition@1c00000 { label = "alt_kernel"; reg = <0x1C00000 0x2A0000>; }; - partition@1EA0000 { + partition@1ea0000 { label = "alt_rootfs"; reg = <0x1EA0000 0x1760000>; }; @@ -187,7 +187,7 @@ reg = <0x3600000 0x4A00000>; }; - partition@C0000 { + partition@c0000 { label = "unused"; reg = <0xC0000 0x140000>; }; |