mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 11:48:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'mvebu-dt-4.16-1' of git://git.infradead.org/linux-mvebu into next/dt

Browse Source 
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>
This commit is contained in:
Olof Johansson
2018-01-04 22:52:45 -08:00
parent 150daec9dc cea96bf183
commit fb21a1a4e1
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/armada-38x.dtsi
View File

@@ -279,6 +279,11 @@ nand_pins: nand-pins {
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";

10
arch/arm/boot/dts/kirkwood-linksys-viper.dts
View File

@@ -157,7 +157,7 @@ partition@80000 {
reg = <0x80000 0x20000>;
};
partition@A0000 {
partition@a0000 {
label = "s_env";
reg = <0xA0000 0x20000>;
};
@@ -167,17 +167,17 @@ partition@200000 {
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 @@ partition@3600000 {
reg = <0x3600000 0x4A00000>;
};
partition@C0000 {
partition@c0000 {
label = "unused";
reg = <0xC0000 0x140000>;
};