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

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

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

Merge "mvebu dt for 4.7 (part 1)" from Gregory CLEMENT:

- add hardware monitor support in the NSA320 device tree
- update makefile with kirkwood-ds112.dtb and kirkwood-nsa320.dtb
- fix GPIO config on the Linksys boards
- various Kirkwood DT warning fixup from the newer DT compiler

* tag 'mvebu-dt-4.7-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood: Add DTS for Linksys EA4200v2/EA4500
  ARM: dts: orion5x: add device tree for kurobox-pro
  ARM: dts: kirkwood: Add address go regulator unit name
  ARM: dts: kirkwood: Add address to mbus unit name
  ARM: dts: kirkwood: Remove address from gpio-i2c unit name
  ARM: dts: kirkwood: Fixup pcie DT warnings
  ARM: dts: kirkwood: Add address to ethernet-phy unit name
  ARM: dts: kirkwood: Remove address from dsa unit name
  ARM: dts: kirkwood: Remove node address from leds
  ARM: dts: kirkwood: Remove button address and fixup names
  ARM: dts: kirkwood: add kirkwood-nsa320.dtb to Makefile
  ARM: dts: kirkwood: add kirkwood-ds112.dtb to Makefile
  ARM: mvebu: fix GPIO config on the Linksys boards
  ARM: dts: kirkwood: Add the hardware monitor to the NSA320 device tree
parents 9744426e c134043e

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ 
	kirkwood-ds109.dtb \

	kirkwood-ds110jv10.dtb \

	kirkwood-ds111.dtb \

	kirkwood-ds112.dtb \

	kirkwood-ds209.dtb \

	kirkwood-ds210.dtb \

	kirkwood-ds212.dtb \
@@ -200,6 +201,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ 
	kirkwood-linkstation-lswsxl.dtb \

	kirkwood-linkstation-lswvl.dtb \

	kirkwood-linkstation-lswxl.dtb \

	kirkwood-linksys-viper.dtb \

	kirkwood-lschlv2.dtb \

	kirkwood-lsxhl.dtb \

	kirkwood-mplcec4.dtb \
@@ -215,6 +217,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ 
	kirkwood-ns2mini.dtb \

	kirkwood-nsa310.dtb \

	kirkwood-nsa310a.dtb \

	kirkwood-nsa320.dtb \

	kirkwood-nsa325.dtb \

	kirkwood-openblocks_a6.dtb \

	kirkwood-openblocks_a7.dtb \
@@ -530,6 +533,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \ 
	dra7-evm.dtb \

	dra72-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += \

	orion5x-kuroboxpro.dtb \

	orion5x-lacie-d2-network.dtb \

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

	orion5x-linkstation-lsgl.dtb \

arch/arm/boot/dts/armada-385-linksys.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ 
		button@2 {

			label = "Factory Reset Button";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;

			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;

		};

	};
@@ -260,7 +260,7 @@ 
		};



		sata {

			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

	};
@@ -313,7 +313,7 @@ 


&pinctrl {

	keys_pin: keys-pin {

		marvell,pins = "mpp24", "mpp47";

		marvell,pins = "mpp24", "mpp29";

		marvell,function = "gpio";

	};

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

+2 −2
Original line number Diff line number Diff line
@@ -304,13 +304,13 @@ 
		button@1 {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;

		};



		button@2 {

			label = "Factory Reset Button";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

		};

	};

arch/arm/boot/dts/kirkwood-6192.dtsi

+2 −2
Original line number Diff line number Diff line 
/ {

	mbus {

		pciec: pcie-controller {

	mbus@f1000000 {

		pciec: pcie-controller@82000000 {

			compatible = "marvell,kirkwood-pcie";

			status = "disabled";

			device_type = "pci";

arch/arm/boot/dts/kirkwood-6281.dtsi

+2 −2
Original line number Diff line number Diff line 
/ {

	mbus {

		pciec: pcie-controller {

	mbus@f1000000 {

		pciec: pcie-controller@82000000 {

			compatible = "marvell,kirkwood-pcie";

			status = "disabled";

			device_type = "pci";