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

Commit 3e32adc8 authored Sep 24, 2014 by Olof Johansson

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

Merge "ARM: mvebu: DT changes for v3.18" from Jason Cooper:

mvebu DT changes for v3.18

 - Armada 375
    - Add RTC support

 - Armada 370
    - Add proper pinmuxing
    - Add SSCG
    - Add gpio-fan
    - Add LED support

 - change Intersil vendor prefix to isil
 - use improved Armada SPI compatible string

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

:
  ARM: mvebu: add user LED support of Armada 370 RD
  ARM: mvebu: add gpio fan support to Armada 370 RD
  ARM: mvebu: Change vendor prefix for Intersil Corporation to isil
  ARM: mvebu: use improved armada spi device tree compatible name
  ARM: mvebu: add SSCG to Armada 370 Device Tree
  ARM: mvebu: Add proper pin muxing on Armada 370 RD board
  ARM: mvebu: Add proper pin muxing on Netgear ReadyNAS 104
  ARM: mvebu: Add proper pin muxing on Netgear ReadyNAS 102
  ARM: mvebu: Add proper pin muxing on the Armada 370 DB board
  ARM: mvebu: Add proper pin muxing on Globalscale Mirabox board
  ARM: mvebu: Add network pin mux configuration for the Armada 370 SoC
  ARM: mvebu: Add RTC support for Armada 375

Signed-off-by: Olof Johansson <olof@lixom.net>

parents fa0510fb 5b1e9e80

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@
		};

		mdio {
		pinctrl-0 = <&mdio_pins>;
		pinctrl-names = "default";
		phy0: ethernet-phy@0 {
		reg = <0>;
		};
		@@ -53,11 +55,15 @@
		};

		ethernet@70000 {
		pinctrl-0 = <&ge0_rgmii_pins>;
		pinctrl-names = "default";
		status = "okay";
		phy = <&phy0>;
		phy-mode = "rgmii-id";
		};
		ethernet@74000 {
		pinctrl-0 = <&ge1_rgmii_pins>;
		pinctrl-names = "default";
		status = "okay";
		phy = <&phy1>;
		phy-mode = "rgmii-id";

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,8 @@
		};

		mdio {
		pinctrl-0 = <&mdio_pins>;
		pinctrl-names = "default";
		phy0: ethernet-phy@0 {
		reg = <0>;
		};
		@@ -100,11 +102,15 @@
		};
		};
		ethernet@70000 {
		pinctrl-0 = <&ge0_rgmii_pins>;
		pinctrl-names = "default";
		status = "okay";
		phy = <&phy0>;
		phy-mode = "rgmii-id";
		};
		ethernet@74000 {
		pinctrl-0 = <&ge1_rgmii_pins>;
		pinctrl-names = "default";
		status = "okay";
		phy = <&phy1>;
		phy-mode = "rgmii-id";

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -101,12 +101,16 @@
		};

		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";
		status = "okay";
		phy = <&phy0>;
		phy-mode = "rgmii-id";
		@@ -122,7 +126,7 @@
		status = "okay";

		isl12057: isl12057@68 {
		compatible = "isl,isl12057";
		compatible = "isil,isl12057";
		reg = <0x68>;
		};

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -86,6 +86,8 @@
		};

		mdio {
		pinctrl-0 = <&mdio_pins>;
		pinctrl-names = "default";
		phy0: ethernet-phy@0 { /* Marvell 88E1318 */
		reg = <0>;
		};
		@@ -96,12 +98,16 @@
		};

		ethernet@70000 {
		pinctrl-0 = <&ge0_rgmii_pins>;
		pinctrl-names = "default";
		status = "okay";
		phy = <&phy0>;
		phy-mode = "rgmii-id";
		};

		ethernet@74000 {
		pinctrl-0 = <&ge1_rgmii_pins>;
		pinctrl-names = "default";
		status = "okay";
		phy = <&phy1>;
		phy-mode = "rgmii-id";
		@@ -117,7 +123,7 @@
		status = "okay";

		isl12057: isl12057@68 {
		compatible = "isl,isl12057";
		compatible = "isil,isl12057";
		reg = <0x68>;
		};

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

+36 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,18 @@
		};

		internal-regs {
		pinctrl {
		fan_pins: fan-pins {
		marvell,pins = "mpp8";
		marvell,function = "gpio";
		};

		led_pins: led-pins {
		marvell,pins = "mpp32";
		marvell,function = "gpio";
		};
		};

		serial@12000 {
		status = "okay";
		};
		@@ -59,6 +71,8 @@
		};

		mdio {
		pinctrl-0 = <&mdio_pins>;
		pinctrl-names = "default";
		phy0: ethernet-phy@0 {
		reg = <0>;
		};
		@@ -74,6 +88,8 @@
		phy-mode = "sgmii";
		};
		ethernet@74000 {
		pinctrl-0 = <&ge1_rgmii_pins>;
		pinctrl-names = "default";
		status = "okay";
		phy = <&phy1>;
		phy-mode = "rgmii-id";
		@@ -106,6 +122,26 @@
		};
		};

		gpio-fan {
		compatible = "gpio-fan";
		gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
		gpio-fan,speed-map = <0 0 3000 1>;
		pinctrl-0 = <&fan_pins>;
		pinctrl-names = "default";
		};

		gpio_leds {
		compatible = "gpio-leds";
		pinctrl-names = "default";
		pinctrl-0 = <&led_pins>;

		sw_led {
		label = "370rd:green:sw";
		gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
		default-state = "keep";
		};
		};

		nand@d0000 {
		status = "okay";
		num-cs = <1>;