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

Commit 25e9cd46 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Jason Cooper:
mvebu DT changes for v3.14

 - mvebu:
    - remove unneeded OS-specific properties from led nodes
    - add NAND controller to Armada boards
    - add sata leds to readynas 104
    - add gpio-poweroff to readynas duo v2

 - kirkwood:
    - comment cleanup in sheevaplug files
    - default pinctrl for sdio
    - sdio in guruplug is non-removable

 - orion5x:
    - typo fix

 - dove:
    - typo fix
    - add PMU interrupt controller and RTC interrupt via same

* tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu

:
  ARM: Dove: Add RTC interrupt via PMU interrupt controller.
  ARM: Dove: Add DT node for PMU interrupt controller.
  ARM: mvebu: Add DT entry for ReadyNAS Duo v2 to use gpio-poweroff driver
  ARM: mvebu: Add RN104 SATA LEDs driven via NXP PCA9554 I2C to GPIO muxer
  ARM: kirkwood: mark guruplug sdio as non-removable
  ARM: kirkwood: provide pinctrl default to sdio nodes
  ARM: dove: Fix typo in device_type property of phy node
  ARM: orion5x: Fix typo in device_type property of phy node
  ARM: mvebu: Enable NAND controller in Armada 370 Mirabox
  ARM: mvebu: Enable NAND controller in Armada XP GP board
  ARM: mvebu: Add support for NAND controller in Armada 370/XP
  ARM: kirkwood: Cleanup comments in Sheevaplug dts files
  ARM: mvebu: dts: remove unneeded linux,default-state from led nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dab71939 bd22bb23

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

+23 −2
Original line number Diff line number Diff line
@@ -74,13 +74,13 @@ 
				green_pwr_led {

					label = "mirabox:green:pwr";

					gpios = <&gpio1 31 1>;

					linux,default-trigger = "heartbeat";

					default-state = "keep";

				};



				blue_stat_led {

					label = "mirabox:blue:stat";

					gpios = <&gpio2 0 1>;

					linux,default-trigger = "cpu0";

					default-state = "off";

				};



				green_stat_led {
@@ -139,6 +139,27 @@ 
					reg = <0x25>;

				};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				partition@0 {

					label = "U-Boot";

					reg = <0 0x400000>;

				};

				partition@400000 {

					label = "Linux";

					reg = <0x400000 0x400000>;

				};

				partition@800000 {

					label = "Filesystem";

					reg = <0x800000 0x3f800000>;

				};

			};

		};

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 
		blue_power_led {

			label = "rn102:blue:pwr";

			gpios = <&gpio1 25 1>;  /* GPIO 57 Active Low */

			linux,default-trigger = "heartbeat";

			default-state = "keep";

		};



		green_sata1_led {

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

+32 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
/dts-v1/;



#include "armada-370.dtsi"

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "NETGEAR ReadyNAS 104";
@@ -123,6 +124,13 @@ 
					fan_startv = <1>;

					pwm_polarity = <0>;

				};



				pca9554: pca9554@23 {

					compatible = "nxp,pca9554";

					gpio-controller;

					#gpio-cells = <2>;

					reg = <0x23>;

				};

			};

		};

	};
@@ -154,6 +162,30 @@ 
			gpios = <&gpio2 0 1>;    /* GPIO 64 Active Low */

			linux,default-trigger = "keep";

		};



		sata1_led {

			label = "rn104:blue:sata1";

			gpios = <&pca9554 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		sata2_led {

			label = "rn104:blue:sata2";

			gpios = <&pca9554 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		sata3_led {

			label = "rn104:blue:sata3";

			gpios = <&pca9554 2 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		sata4_led {

			label = "rn104:blue:sata4";

			gpios = <&pca9554 3 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

	};



	gpio_keys {

arch/arm/boot/dts/armada-370-xp.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -257,6 +257,15 @@ 
				status = "disabled";

			};



			nand@d0000 {

				compatible = "marvell,armada370-nand";

				reg = <0xd0000 0x54>;

				#address-cells = <1>;

				#size-cells = <1>;

				interrupts = <113>;

				clocks = <&coredivclk 0>;

				status = "disabled";

			};

		};

	};

arch/arm/boot/dts/armada-xp-gp.dts

+8 −0
Original line number Diff line number Diff line
@@ -175,6 +175,14 @@ 
					spi-max-frequency = <108000000>;

				};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;

			};

		};

	};

};