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

Commit 1bc7f27d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'berlin-dt-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt 

Pull "Berlin DT changes for v3.19 (round 2)" from Sebastian Hesselbarth:

- AHCI and SATA PHY nodes for BG2
- USB and USB PHZ nodes for BG2/BG2CD/BG2Q

* tag 'berlin-dt-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin

:
  ARM: dts: berlin: enable USB on the Google Chromecast
  ARM: dts: berlin: add BG2CD nodes for USB support
  ARM: dts: Berlin: enable USB on the BG2Q DMP
  ARM: dts: berlin: add BG2Q nodes for USB support
  ARM: berlin: Enable SATA on Sony NSZ-GS7
  ARM: berlin: Add AHCI and SATA PHY nodes to BG2

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2dfb8bf3 ea7aaa26

arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts

+7 −0
Original line number Diff line number Diff line
@@ -26,8 +26,15 @@ 
	};

};



&ahci { status = "okay"; };



&eth1 { status = "okay"; };



/* Unpopulated SATA plug on solder side */

&sata0 { status = "okay"; };



&sata_phy { status = "okay"; };



/* Samsung M8G2FA 8GB eMMC */

&sdhci2 {

	non-removable;

arch/arm/boot/dts/berlin2.dtsi

+39 −0
Original line number Diff line number Diff line
@@ -311,6 +311,45 @@ 
			};

		};



		ahci: sata@e90000 {

			compatible = "marvell,berlin2-ahci", "generic-ahci";

			reg = <0xe90000 0x1000>;

			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&chip CLKID_SATA>;

			#address-cells = <1>;

			#size-cells = <0>;



			sata0: sata-port@0 {

				reg = <0>;

				phys = <&sata_phy 0>;

				status = "disabled";

			};



			sata1: sata-port@1 {

				reg = <1>;

				phys = <&sata_phy 1>;

				status = "disabled";

			};

		};



		sata_phy: phy@e900a0 {

			compatible = "marvell,berlin2-sata-phy";

			reg = <0xe900a0 0x200>;

			clocks = <&chip CLKID_SATA>;

			#address-cells = <1>;

			#size-cells = <0>;

			#phy-cells = <1>;

			status = "disabled";



			sata-phy@0 {

				reg = <0>;

			};



			sata-phy@1 {

				reg = <1>;

			};

		};



		chip: chip-control@ea0000 {

			compatible = "marvell,berlin2-chip-ctrl";

			#clock-cells = <1>;

arch/arm/boot/dts/berlin2cd-google-chromecast.dts

+4 −0
Original line number Diff line number Diff line
@@ -53,3 +53,7 @@ 
};



&uart0 { status = "okay"; };



&usb_phy1 { status = "okay"; };



&usb1 { status = "okay"; };

arch/arm/boot/dts/berlin2cd.dtsi

+36 −0
Original line number Diff line number Diff line
@@ -75,6 +75,22 @@ 
			clocks = <&chip CLKID_TWD>;

		};



		usb_phy0: usb-phy@b74000 {

			compatible = "marvell,berlin2cd-usb-phy";

			reg = <0xb74000 0x128>;

			#phy-cells = <0>;

			resets = <&chip 0x178 23>;

			status = "disabled";

		};



		usb_phy1: usb-phy@b78000 {

			compatible = "marvell,berlin2cd-usb-phy";

			reg = <0xb78000 0x128>;

			#phy-cells = <0>;

			resets = <&chip 0x178 24>;

			status = "disabled";

		};



		eth1: ethernet@b90000 {

			compatible = "marvell,pxa168-eth";

			reg = <0xb90000 0x10000>;
@@ -287,6 +303,26 @@ 
			};

		};



		usb0: usb@ed0000 {

			compatible = "chipidea,usb2";

			reg = <0xed0000 0x200>;

			interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&chip CLKID_USB0>;

			phys = <&usb_phy0>;

			phy-names = "usb-phy";

			status = "disabled";

		};



		usb1: usb@ee0000 {

			compatible = "chipidea,usb2";

			reg = <0xee0000 0x200>;

			interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&chip CLKID_USB1>;

			phys = <&usb_phy1>;

			phy-names = "usb-phy";

			status = "disabled";

		};



		apb@fc0000 {

			compatible = "simple-bus";

			#address-cells = <1>;

arch/arm/boot/dts/berlin2q-marvell-dmp.dts

+53 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 */



/dts-v1/;



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

#include "berlin2q.dtsi"



/ {
@@ -21,6 +23,39 @@ 
	choosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb0_vbus: regulator@0 {

			compatible = "regulator-fixed";

			regulator-name = "usb0_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&portb 8 GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};



		reg_usb1_vbus: regulator@1 {

			compatible = "regulator-fixed";

			regulator-name = "usb1_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&portb 10 GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};



		reg_usb2_vbus: regulator@2 {

			compatible = "regulator-fixed";

			regulator-name = "usb2_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&portb 12 GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};

	};

};



&sdhci1 {
@@ -46,6 +81,24 @@ 
	status = "okay";

};



&usb_phy0 {

	status = "okay";

};



&usb_phy2 {

	status = "okay";

};



&usb0 {

	vbus-supply = <&reg_usb0_vbus>;

	status = "okay";

};



&usb2 {

	vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};



&eth0 {

	status = "okay";

};