Commit fb21a1a4 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 150daec9 cea96bf1

arch/arm/boot/dts/armada-38x.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/kirkwood-linksys-viper.dts

+5 −5
Original line number Diff line number Diff line
@@ -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>;

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE