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

Commit eff01adb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge "mvebu dt for 4.6 (part 2)" from Gregory CLEMENT:

- Reorder Ethernet node on Armada 38x SoCs
- Add device tree for buffalo linkstation ls-gl
- Use the more accurate armada-370-sata string for SATA on Armada 375
- Add NAND description to Armada 370 DB and Armada XP DB

* tag 'mvebu-dt-4.6-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: mvebu: add NAND description to Armada 370 DB and Armada XP DB
  ARM: dts: armada-375: use armada-370-sata for SATA
  ARM: dts: orion5x: add device tree for buffalo linkstation ls-gl
  ARM: dts: orion5x: split linkstation lswtgl into common and device parts
  ARM: dts: armada-38x: add reference to ETH connectors for A385-AP
  ARM: dts: armada-38x: change order of ethernet DT nodes on Armada 38x
  ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl
  ARM: dts: kirkwood: use unique machine name for ds112
parents ca2942cc af5ece39

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -522,6 +522,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \ 
dtb-$(CONFIG_ARCH_ORION5X) += \

	orion5x-lacie-d2-network.dtb \

	orion5x-lacie-ethernet-disk-mini-v2.dtb \

	orion5x-linkstation-lsgl.dtb \

	orion5x-linkstation-lswtgl.dtb \

	orion5x-lswsgl.dtb \

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

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

+27 −0
Original line number Diff line number Diff line
@@ -168,6 +168,33 @@ 
					spi-max-frequency = <50000000>;

				};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				partitions {

					compatible = "fixed-partitions";

					#address-cells = <1>;

					#size-cells = <1>;



					partition@0 {

						label = "U-Boot";

						reg = <0 0x800000>;

					};

					partition@800000 {

						label = "Linux";

						reg = <0x800000 0x800000>;

					};

					partition@1000000 {

						label = "Filesystem";

						reg = <0x1000000 0x3f000000>;

					};

				};

			};

		};



		pcie-controller {

arch/arm/boot/dts/armada-375.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ 
			};



			sata@a0000 {

				compatible = "marvell,orion-sata";

				compatible = "marvell,armada-370-sata";

				reg = <0xa0000 0x5000>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 14>, <&gateclk 20>;

arch/arm/boot/dts/armada-385-db-ap.dts

+3 −0
Original line number Diff line number Diff line
@@ -134,18 +134,21 @@ 
				};

			};



			/* CON3 */

			ethernet@30000 {

				status = "okay";

				phy = <&phy2>;

				phy-mode = "sgmii";

			};



			/* CON2 */

			ethernet@34000 {

				status = "okay";

				phy = <&phy1>;

				phy-mode = "sgmii";

			};



			/* CON4 */

			ethernet@70000 {

				pinctrl-names = "default";

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

+21 −9
Original line number Diff line number Diff line
@@ -429,6 +429,27 @@ 
				reg = <0x22000 0x1000>;

			};



			/*

			 * As a special exception to the "order by

			 * register address" rule, the eth0 node is

			 * placed here to ensure that it gets

			 * registered as the first interface, since

			 * the network subsystem doesn't allow naming

			 * interfaces using DT aliases. Without this,

			 * the ordering of interfaces is different

			 * from the one used in U-Boot and the

			 * labeling of interfaces on the boards, which

			 * is very confusing for users.

			 */

			eth0: ethernet@70000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x70000 0x4000>;

				interrupts-extended = <&mpic 8>;

				clocks = <&gateclk 4>;

				tx-csum-limit = <9800>;

				status = "disabled";

			};



			eth1: ethernet@30000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x30000 0x4000>;
@@ -493,15 +514,6 @@ 
				};

			};



			eth0: ethernet@70000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x70000 0x4000>;

				interrupts-extended = <&mpic 8>;

				clocks = <&gateclk 4>;

				tx-csum-limit = <9800>;

				status = "disabled";

			};



			mdio: mdio@72004 {

				#address-cells = <1>;

				#size-cells = <0>;