Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c302698 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "mvebu dt for 4.10 (part 1)" from Gregory CLEMENT:

Add missing pinmux declaration for netgear NASes
Fix i2c compatible string for netgear NASes
Fix on a wrong comment about PLL frequency
Fix spelling mistake of the manufacturer's name of the Topkick
Add dt support for the orion5x ls-chl Linkstation device
First step of fixing DTC warning for Armada 370, 375 and XP

* tag 'mvebu-dt-4.10-1' of git://git.infradead.org/linux-mvebu: (30 commits)
  ARM: dts: armada-375: Fixup ethernet child DT warning
  ARM: dts: armada-375: Fixup memory DT warning
  ARM: dts: armada-375: Remove skeleton.dtsi
  ARM: dts: armada-375: Fixup pinctrl DT warnings
  ARM: dts: armada-375: Fixup pcie DT warnings
  ARM: dts: armada-375: Fixup mdio DT warning
  ARM: dts: armada-375: Use the node labels
  ARM: dts: armada-375: Add node labels
  ARM: dts: armada-370-xp: Fixup regulator DT warning
  ARM: dts: armada-370-xp: Remove button address and fixup names
  ARM: dts: armada-370-xp: Remove address from dsa unit name
  ARM: dts: armada-370-xp: Fixup memory DT warning
  ARM: dts: armada-370-xp: Fixup l2-cache DT warning
  ARM: dts: armada-370-xp: Remove skeleton.dtsi
  ARM: dts: armada-370: Fixup pcie DT warnings
  ARM: dts: armada-xp: Fixup pcie DT warnings
  ARM: dts: armada-370-xp: Fixup mdio DT warning
  ARM: dts: armada-370-xp: Use the node labels
  ARM: dts: armada-370-xp: add node labels
  ARM: dts: armada-370-xp: move the cpurst node in the common file
  ...
parents 112525b1 2f713285

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ 
	orion5x-lacie-ethernet-disk-mini-v2.dtb \

	orion5x-linkstation-lsgl.dtb \

	orion5x-linkstation-lswtgl.dtb \

	orion5x-lschl.dtb \

	orion5x-lswsgl.dtb \

	orion5x-maxtor-shared-storage-2.dtb \

	orion5x-netgear-wnr854t.dtb \

arch/arm/boot/dts/armada-370-db.dts

+32 −31
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
		stdout-path = "serial0:115200n8";

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x40000000>; /* 1 GB */

	};
@@ -86,18 +86,6 @@ 
				status = "okay";

			};



			mdio {

				pinctrl-0 = <&mdio_pins>;

				pinctrl-names = "default";

				phy0: ethernet-phy@0 {

					reg = <0>;

				};



				phy1: ethernet-phy@1 {

					reg = <1>;

				};

			};



			ethernet@70000 {

				pinctrl-0 = <&ge0_rgmii_pins>;

				pinctrl-names = "default";
@@ -182,24 +170,6 @@ 
				};

			};

		};



		pcie-controller {

			status = "okay";

			/*

			 * The two PCIe units are accessible through

			 * both standard PCIe slots and mini-PCIe

			 * slots on the board.

			 */

			pcie@1,0 {

				/* Port 0, Lane 0 */

				status = "okay";

			};



			pcie@2,0 {

				/* Port 1, Lane 0 */

				status = "okay";

			};

		};

	};



	sound {
@@ -261,6 +231,37 @@ 
	};

};



&pciec {

	status = "okay";

	/*

	 * The two PCIe units are accessible through

	 * both standard PCIe slots and mini-PCIe

	 * slots on the board.

	 */

	pcie@1,0 {

		/* Port 0, Lane 0 */

		status = "okay";

	};



	pcie@2,0 {

		/* Port 1, Lane 0 */

		status = "okay";

	};

};



&mdio {

	pinctrl-0 = <&mdio_pins>;

	pinctrl-names = "default";

	phy0: ethernet-phy@0 {

		reg = <0>;

	};



	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};





&spi0 {

	pinctrl-0 = <&spi0_pins2>;

	pinctrl-names = "default";

arch/arm/boot/dts/armada-370-dlink-dns327l.dts

+15 −15
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
		stdout-path = &uart0;

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MiB */

	};
@@ -72,20 +72,6 @@ 
			MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000

			MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;



		pcie-controller {

			status = "okay";



			pcie@1,0 {

				/* Port 0, Lane 0 */

				status = "okay";

			};



			pcie@2,0 {

				/* Port 1, Lane 0 */

				status = "okay";

			};

		};



		internal-regs {

			sata@a0000 {

				nr-ports = <2>;
@@ -262,6 +248,20 @@ 
	};

};



&pciec {

	status = "okay";



	pcie@1,0 {

		/* Port 0, Lane 0 */

		status = "okay";

	};



	pcie@2,0 {

		/* Port 1, Lane 0 */

		status = "okay";

	};

};



&pinctrl {

	sata_l_white_pin: sata-l-white-pin {

		marvell,pins = "mpp57";

arch/arm/boot/dts/armada-370-mirabox.dts

+29 −28
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
		stdout-path = "serial0:115200n8";

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MB */

	};
@@ -64,22 +64,6 @@ 
			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000

			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;



		pcie-controller {

			status = "okay";



			/* Internal mini-PCIe connector */

			pcie@1,0 {

				/* Port 0, Lane 0 */

				status = "okay";

			};



			/* Connected on the PCB to a USB 3.0 XHCI controller */

			pcie@2,0 {

				/* Port 1, Lane 0 */

				status = "okay";

			};

		};



		internal-regs {

			serial@12000 {

				status = "okay";
@@ -113,17 +97,6 @@ 
				};

			};



			mdio {

				pinctrl-0 = <&mdio_pins>;

				pinctrl-names = "default";

				phy0: ethernet-phy@0 {

					reg = <0>;

				};



				phy1: ethernet-phy@1 {

					reg = <1>;

				};

			};

			ethernet@70000 {

				pinctrl-0 = <&ge0_rgmii_pins>;

				pinctrl-names = "default";
@@ -197,6 +170,34 @@ 
	};

};



&pciec {

	status = "okay";



	/* Internal mini-PCIe connector */

	pcie@1,0 {

		/* Port 0, Lane 0 */

		status = "okay";

	};



	/* Connected on the PCB to a USB 3.0 XHCI controller */

	pcie@2,0 {

		/* Port 1, Lane 0 */

		status = "okay";

	};

};



&mdio {

	pinctrl-0 = <&mdio_pins>;

	pinctrl-names = "default";

	phy0: ethernet-phy@0 {

		reg = <0>;

	};



	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};



&pinctrl {

	pwr_led_pin: pwr-led-pin {

		marvell,pins = "mpp63";

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+29 −26
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
		stdout-path = "serial0:115200n8";

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MB */

	};
@@ -66,22 +66,6 @@ 
			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000

			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;



		pcie-controller {

			status = "okay";



			/* Connected to Marvell 88SE9170 SATA controller */

			pcie@1,0 {

				/* Port 0, Lane 0 */

				status = "okay";

			};



			/* Connected to FL1009 USB 3.0 controller */

			pcie@2,0 {

				/* Port 1, Lane 0 */

				status = "okay";

			};

		};



		internal-regs {



			/* RTC is provided by Intersil ISL12057 I2C RTC chip */
@@ -99,14 +83,6 @@ 
				status = "okay";

			};



			mdio {

				pinctrl-0 = <&mdio_pins>;

				pinctrl-names = "default";

				phy0: ethernet-phy@0 { /* Marvell 88E1318 */

					reg = <0>;

				};

			};



			ethernet@74000 {

				pinctrl-0 = <&ge1_rgmii_pins>;

				pinctrl-names = "default";
@@ -120,8 +96,11 @@ 
			};



			i2c@11000 {

				compatible = "marvell,mv64xxx-i2c";

				clock-frequency = <100000>;



				pinctrl-0 = <&i2c0_pins>;

				pinctrl-names = "default";



				status = "okay";



				isl12057: isl12057@68 {
@@ -257,6 +236,30 @@ 
	};

};



&pciec {

	status = "okay";



	/* Connected to Marvell 88SE9170 SATA controller */

	pcie@1,0 {

		/* Port 0, Lane 0 */

		status = "okay";

	};



	/* Connected to FL1009 USB 3.0 controller */

	pcie@2,0 {

		/* Port 1, Lane 0 */

		status = "okay";

	};

};



&mdio {

	pinctrl-0 = <&mdio_pins>;

	pinctrl-names = "default";

	phy0: ethernet-phy@0 { /* Marvell 88E1318 */

		reg = <0>;

	};

};



&pinctrl {

	power_led_pin: power-led-pin {

		marvell,pins = "mpp57";