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

Commit fd10a2e4 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge "mvebu/dt #2" from Andrew Lunn:

Second set of dt patches for mvebu for v3.20.

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

:
  ARM: mvebu: make DTS comments reflect DEBUG_LL changes
  ARM: mvebu: Armada 385 GP: Add regulators to the SATA port
  ARM: Kirkwood: Added support for pogoplug e02 (pink/gray)
  ARM: mvebu: fix compatible strings of MBus on Armada 375 and Armada 38x
  dt: bindings: update mvebu-mbus DT binding with new compatible properties

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8739f728 6cc082a8

Documentation/devicetree/bindings/bus/mvebu-mbus.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ Required properties: 
- compatible:	 Should be set to one of the following:

		 marvell,armada370-mbus

		 marvell,armadaxp-mbus

		 marvell,armada370-mbus

		 marvell,armadaxp-mbus

		 marvell,armada375-mbus

		 marvell,armada380-mbus

		 marvell,kirkwood-mbus

		 marvell,dove-mbus

		 marvell,orion5x-88f5281-mbus

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ chipidea Chipidea, Inc 
chrp	Common Hardware Reference Platform

chunghwa	Chunghwa Picture Tubes Ltd.

cirrus	Cirrus Logic, Inc.

cloudengines	Cloud Engines, Inc.

cnm	Chips&Media, Inc.

cortina	Cortina Systems, Inc.

crystalfontz	Crystalfontz America, Inc.

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ 
	kirkwood-openrd-base.dtb \

	kirkwood-openrd-client.dtb \

	kirkwood-openrd-ultimate.dtb \

	kirkwood-pogo_e02.dtb \

	kirkwood-rd88f6192.dtb \

	kirkwood-rd88f6281-z0.dtb \

	kirkwood-rd88f6281-a.dtb \

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

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



	soc {

		compatible = "marvell,armada375-mbus", "marvell,armada370-mbus", "simple-bus";

		compatible = "marvell,armada375-mbus", "simple-bus";

		#address-cells = <2>;

		#size-cells = <1>;

		controller = <&mbusc>;

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

+126 −0
Original line number Diff line number Diff line
@@ -173,6 +173,16 @@ 
				status = "okay";

				#address-cells = <1>;

				#size-cells = <0>;



				sata0: sata-port@0 {

					reg = <0>;

					target-supply = <&reg_5v_sata0>;

				};



				sata1: sata-port@1 {

					reg = <1>;

					target-supply = <&reg_5v_sata1>;

				};

			};



			sata@e0000 {
@@ -181,6 +191,16 @@ 
				status = "okay";

				#address-cells = <1>;

				#size-cells = <0>;



				sata2: sata-port@0 {

					reg = <0>;

					target-supply = <&reg_5v_sata2>;

				};



				sata3: sata-port@1 {

					reg = <1>;

					target-supply = <&reg_5v_sata3>;

				};

			};



			sdhci@d8000 {
@@ -278,6 +298,112 @@ 
		regulator-always-on;

		gpio = <&expander0 4 GPIO_ACTIVE_HIGH>;

	};



	reg_sata0: pwr-sata0 {

		compatible = "regulator-fixed";

		regulator-name = "pwr_en_sata0";

		enable-active-high;

		regulator-always-on;



	};



	reg_5v_sata0: v5-sata0 {

		compatible = "regulator-fixed";

		regulator-name = "v5.0-sata0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		vin-supply = <&reg_sata0>;

	};



	reg_12v_sata0: v12-sata0 {

		compatible = "regulator-fixed";

		regulator-name = "v12.0-sata0";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

		vin-supply = <&reg_sata0>;

	};



	reg_sata1: pwr-sata1 {

		regulator-name = "pwr_en_sata1";

		compatible = "regulator-fixed";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		enable-active-high;

		regulator-always-on;

		gpio = <&expander0 3 GPIO_ACTIVE_HIGH>;

	};



	reg_5v_sata1: v5-sata1 {

		compatible = "regulator-fixed";

		regulator-name = "v5.0-sata1";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		vin-supply = <&reg_sata1>;

	};



	reg_12v_sata1: v12-sata1 {

		compatible = "regulator-fixed";

		regulator-name = "v12.0-sata1";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

		vin-supply = <&reg_sata1>;

	};



	reg_sata2: pwr-sata2 {

		compatible = "regulator-fixed";

		regulator-name = "pwr_en_sata2";

		enable-active-high;

		regulator-always-on;

		gpio = <&expander0 11 GPIO_ACTIVE_HIGH>;

	};



	reg_5v_sata2: v5-sata2 {

		compatible = "regulator-fixed";

		regulator-name = "v5.0-sata2";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		vin-supply = <&reg_sata2>;

	};



	reg_12v_sata2: v12-sata2 {

		compatible = "regulator-fixed";

		regulator-name = "v12.0-sata2";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

		vin-supply = <&reg_sata2>;

	};



	reg_sata3: pwr-sata3 {

		compatible = "regulator-fixed";

		regulator-name = "pwr_en_sata3";

		enable-active-high;

		regulator-always-on;

		gpio = <&expander0 12 GPIO_ACTIVE_HIGH>;

	};



	reg_5v_sata3: v5-sata3 {

		compatible = "regulator-fixed";

		regulator-name = "v5.0-sata3";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		vin-supply = <&reg_sata3>;

	};



	reg_12v_sata3: v12-sata3 {

		compatible = "regulator-fixed";

		regulator-name = "v12.0-sata3";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

		vin-supply = <&reg_sata3>;

	};

};



&pinctrl {