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

Commit 2995f0a1 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

mvebu dt for 4.4 (part 2)

- Add support for severals Armada-370-based Seagate NAS
- Fix Ready NAS device tree
- Modify SDHCI binding for A388-GP allowing using it on old and new
  version of the board

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

:
  ARM: mvebu: set SW polling as SDHCI card detection on A388-GP
  arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file
  arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120
  ARM: mvebu: add DT support for Seagate Personal Cloud
  ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 64aa1fe1 6b61f249

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -723,6 +723,10 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ 
	armada-370-netgear-rn102.dtb \

	armada-370-netgear-rn104.dtb \

	armada-370-rd.dtb \

	armada-370-seagate-nas-2bay.dtb \

	armada-370-seagate-nas-4bay.dtb \

	armada-370-seagate-personal-cloud.dtb \

	armada-370-seagate-personal-cloud-2bay.dtb \

	armada-370-synology-ds213j.dtb

dtb-$(CONFIG_MACH_ARMADA_375) += \

	armada-375-db.dtb

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

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,12 @@ 
		};



		internal-regs {



			/* RTC is provided by Intersil ISL12057 I2C RTC chip */

			rtc@10300 {

				status = "disabled";

			};



			serial@12000 {

				status = "okay";

			};

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

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,12 @@ 
		};



		internal-regs {



			/* RTC is provided by Intersil ISL12057 I2C RTC chip */

			rtc@10300 {

				status = "disabled";

			};



			serial@12000 {

				status = "okay";

			};

arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Device Tree file for Seagate NAS 2-Bay (Armada 370 SoC).

 *

 * Copyright (C) 2015 Seagate

 *

 * Author: Vincent Donnefort <vdonnefort@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



/*

 * Here are some information allowing to identify the device:

 *

 * Product name                 : Seagate NAS 2-Bay

 * Code name (board/PCB)        : Dart 2-Bay

 * Model name (case sticker)    : SRPD20

 * Material desc (product spec) : STCTxxxxxxx

 */



/dts-v1/;

#include "armada-370-seagate-nas-xbay.dtsi"



/ {

	model = "Seagate NAS 2-Bay (Dart, SRPD20)";

	compatible = "seagate,dart-2", "marvell,armada370", "marvell,armada-370-xp";



	gpio-fan {

		gpio-fan,speed-map =

			<   0 3

			  950 2

			 1400 1

			 1800 0>;

	};

};

arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts

0 → 100644
+133 −0
Original line number Diff line number Diff line 
/*

 * Device Tree file for Seagate NAS 4-Bay (Armada 370 SoC).

 *

 * Copyright (C) 2015 Seagate

 *

 * Author: Vincent Donnefort <vdonnefort@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



/*

 * Here are some information allowing to identify the device:

 *

 * Product name                 : Seagate NAS 4-Bay

 * Code name (board/PCB)        : Dart 4-Bay

 * Model name (case sticker)    : SRPD40

 * Material desc (product spec) : STCUxxxxxxx

 */



/dts-v1/;

#include "armada-370-seagate-nas-xbay.dtsi"

#include <dt-bindings/leds/leds-ns2.h>



/ {

	model = "Seagate NAS 4-Bay (Dart, SRPD40)";

	compatible = "seagate,dart-4", "marvell,armada370", "marvell,armada-370-xp";



	soc {

		pcie-controller {

			/* SATA AHCI controller 88SE9170 */

			pcie@1,0 {

				status = "okay";

			};

		};



		internal-regs {

			mdio {

				phy1: ethernet-phy@1 {

					reg = <1>;

				};

			};



			ethernet@74000 {

				status = "okay";

				pinctrl-0 = <&ge1_rgmii_pins>;

				pinctrl-names = "default";

				phy = <&phy1>;

				phy-mode = "rgmii-id";

			};



			i2c@11000 {

				/* I2C GPIO expander (PCA9554A) */

				pca9554: pca9554@21 {

					compatible = "nxp,pca9554";

					reg = <0x21>;

					#gpio-cells = <2>;

					gpio-controller;

				};

			};

		};

	};



	regulators {

		regulator@3 {

			compatible = "regulator-fixed";

			reg = <3>;

			regulator-name = "SATA2 power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;

		};

		regulator@4 {

			compatible = "regulator-fixed";

			reg = <4>;

			regulator-name = "SATA3 power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;

		};

	};



	gpio-leds {

		red-sata2 {

			label = "dart:red:sata2";

			gpios = <&pca9554 0 GPIO_ACTIVE_LOW>;

		};

		red-sata3 {

			label = "dart:red:sata3";

			gpios = <&pca9554 3 GPIO_ACTIVE_LOW>;

		};

	};



	leds-ns2 {

		compatible = "lacie,ns2-leds";



		white-sata2 {

			label = "dart:white:sata2";

			cmd-gpio = <&pca9554 1 GPIO_ACTIVE_HIGH>;

			slow-gpio = <&pca9554 2 GPIO_ACTIVE_HIGH>;

			num-modes = <4>;

			modes-map = <NS_V2_LED_SATA 0 0

				     NS_V2_LED_OFF  0 1

				     NS_V2_LED_ON   1 0

				     NS_V2_LED_ON   1 1>;

		};

		white-sata3 {

			label = "dart:white:sata3";

			cmd-gpio = <&pca9554 4 GPIO_ACTIVE_HIGH>;

			slow-gpio = <&pca9554 5 GPIO_ACTIVE_HIGH>;

			num-modes = <4>;

			modes-map = <NS_V2_LED_SATA 0 0

				     NS_V2_LED_OFF  0 1

				     NS_V2_LED_ON   1 0

				     NS_V2_LED_ON   1 1>;

		};

	};



	gpio-fan {

		gpio-fan,speed-map =

			<   0 3

			  800 2

			  1050 1

			  1300 0>;

	};

};