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

Commit 8e8c7253 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-4.12-1' of git://git.infradead.org/linux-mvebu into next/dt64 

Pull "mvebu dt64 for 4.12 (part 1)" from Gregory CLEMENT:

- Add RTC support on Armada 7k/8k
- Improve i2c support on Armada 37xx
- Add gpio expander and RTC on Armada 3720 board
- Improve USB3 support on Armada 37xx
- Add network support on Armada 7k/8k

* tag 'mvebu-dt64-4.12-1' of git://git.infradead.org/linux-mvebu:
  arm64: marvell: dts: add PPv2.2 description to Armada 7K/8K
  ARM64: dts: marvell: armada-3720 add RTC support
  ARM64: dts: marvell: armada-3720-db: Add phy for USB3
  ARM64: dts: marvell: armada-37xx: Add clock resource for USB3
  ARM64: dts: marvell: armada-37xx: Fix interrupt mapping for USB3
  ARM64: dts: marvell: armada-3720-db: add gpio expander
  ARM64: dts: marvell: armada37xx: add address and size property for i2c cells
  arm64: dts: marvell: add RTC description for Armada 7K/8K
parents 6cd8eaac 60894719

arch/arm64/boot/dts/marvell/armada-3720-db.dts

+41 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


/dts-v1/;



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

#include "armada-372x.dtsi"



/ {
@@ -60,10 +61,49 @@ 
		device_type = "memory";

		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;

	};



	exp_usb3_vbus: usb3-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb3-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

		regulator-always-on;

		gpio = <&gpio_exp 1 GPIO_ACTIVE_HIGH>;

	};



	usb3_phy: usb3-phy {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&exp_usb3_vbus>;

	};

};



&i2c0 {

	status = "okay";



	gpio_exp: pca9555@22 {

		compatible = "nxp,pca9555";

		gpio-controller;

		#gpio-cells = <2>;



		reg = <0x22>;

		/*

		 * IO0_0: PWR_EN_USB2	IO1_0: PWR_EN_VTT

		 * IO0_1: PWR_EN_USB23	IO1_1: MPCIE_WDISABLE

		 * IO0_2: PWR_EN_SATA	IO1_2: RGMII_DEV_RSTN

		 * IO0_3: PWR_EN_PCIE	IO1_3: SGMII_DEV_RSTN

		 * IO0_4: PWR_EN_SD

		 * IO0_5: PWR_EN_EMMC

		 * IO0_6: PWR_EN_RGMII	IO1_6: SATA_USB3.0_SEL

		 * IO0_7: PWR_EN_SGMII	IO1_7: PWR_MCI_PS

		 */

	};



	rtc@68  {

		/* PT7C4337A from pericom fully compatible with the ds1337 */

		compatible = "dallas,ds1337";

		reg = <0x68>;

	};

};



/* CON3 */
@@ -109,6 +149,7 @@ 
/* CON31 */

&usb3 {

	status = "okay";

	usb-phy = <&usb3_phy>;

};



/* CON17 (PCIe) / CON12 (mini-PCIe) */

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ 
			i2c0: i2c@11000 {

				compatible = "marvell,armada-3700-i2c";

				reg = <0x11000 0x24>;

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&nb_periph_clk 10>;

				interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

				mrvl,i2c-fast-mode;
@@ -121,6 +123,8 @@ 
			i2c1: i2c@11080 {

				compatible = "marvell,armada-3700-i2c";

				reg = <0x11080 0x24>;

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&nb_periph_clk 9>;

				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

				mrvl,i2c-fast-mode;
@@ -196,7 +200,8 @@ 
				compatible = "marvell,armada3700-xhci",

				"generic-xhci";

				reg = <0x58000 0x4000>;

				interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&sb_periph_clk 12>;

				status = "disabled";

			};

arch/arm64/boot/dts/marvell/armada-7040-db.dts

+25 −0
Original line number Diff line number Diff line
@@ -146,3 +146,28 @@ 
&cpm_usb3_1 {

	status = "okay";

};



&cpm_mdio {

	phy0: ethernet-phy@0 {

		reg = <0>;

	};

	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};



&cpm_ethernet {

	status = "okay";

};



&cpm_eth1 {

	status = "okay";

	phy = <&phy0>;

	phy-mode = "sgmii";

};



&cpm_eth2 {

	status = "okay";

	phy = <&phy1>;

	phy-mode = "rgmii-id";

};

arch/arm64/boot/dts/marvell/armada-8020.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -54,3 +54,13 @@ 
	compatible = "marvell,armada8020", "marvell,armada-ap806-dual",

		     "marvell,armada-ap806";

};



/* The RTC requires external oscillator. But on Aramda 80x0, the RTC clock

 * in CP master is not connected (by package) to the oscillator. So

 * disable it. However, the RTC clock in CP slave is connected to the

 * oscillator so this one is let enabled.

 */



&cpm_rtc {

	status = "disabled";

};

arch/arm64/boot/dts/marvell/armada-8040-db.dts

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

};



&cpm_mdio {

	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};



&cpm_ethernet {

	status = "okay";

};



&cpm_eth2 {

	status = "okay";

	phy = <&phy1>;

	phy-mode = "rgmii-id";

};



/* CON5 on CP1 expansion */

&cps_pcie2 {

	status = "okay";