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

Commit b1761ebe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-5.4-1' of git://git.infradead.org/linux-mvebu into arm/dt 

mvebu dt64 for 5.4 (part 1)

 - Add mailbox support on Armada 37xx
 - Add cpu clock node needed for CPU freq on Armada 7K/8K
 - Enhance CP110 COMPHY support used by PCIe, USB3 and SATA

* tag 'mvebu-dt64-5.4-1' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: Add cpu clock node on Armada 7K/8K
  arm64: dts: marvell: Convert 7k/8k usb-phy properties to phy-supply
  arm64: dts: marvell: Add 7k/8k PHYs in PCIe nodes
  arm64: dts: marvell: Add 7k/8k PHYs in USB3 nodes
  arm64: dts: marvell: Add 7k/8k per-port PHYs in SATA nodes
  arm64: dts: marvell: Add CP110 COMPHY clocks
  arm64: dts: marvell: armada-37xx: add mailbox node

Link: https://lore.kernel.org/r/875zmhzjml.fsf@FE-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3107b384 c00bc383

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

+7 −0
Original line number Diff line number Diff line
@@ -419,6 +419,13 @@ 
				clocks = <&nb_periph_clk 15>;

			};



			rwtm: mailbox@b0000 {

				compatible = "marvell,armada-3700-rwtm-mailbox";

				reg = <0xb0000 0x100>;

				interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;

				#mbox-cells = <1>;

			};



			sdhci1: sdhci@d0000 {

				compatible = "marvell,armada-3700-sdhci",

					     "marvell,sdhci-xenon";

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

+25 −12
Original line number Diff line number Diff line
@@ -73,16 +73,6 @@ 
		gpio = <&expander0 1 GPIO_ACTIVE_HIGH>;

		vin-supply = <&cp0_exp_usb3_1_current_regulator>;

	};



	cp0_usb3_0_phy: cp0-usb3-0-phy {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&cp0_reg_usb3_0_vbus>;

	};



	cp0_usb3_1_phy: cp0-usb3-1-phy {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&cp0_reg_usb3_1_vbus>;

	};

};



&i2c0 {
@@ -124,6 +114,8 @@ 


&cp0_pcie2 {

	status = "okay";

	phys = <&cp0_comphy5 2>;

	phy-names = "cp0-pcie2-x1-phy";

};



&cp0_i2c0 {
@@ -219,15 +211,36 @@ 


&cp0_sata0 {

	status = "okay";



	sata-port@1 {

		phys = <&cp0_comphy3 1>;

		phy-names = "cp0-sata0-1-phy";

	};

};



&cp0_comphy1 {

	cp0_usbh0_con: connector {

		compatible = "usb-a-connector";

		phy-supply = <&cp0_reg_usb3_0_vbus>;

	};

};



&cp0_usb3_0 {

	usb-phy = <&cp0_usb3_0_phy>;

	phys = <&cp0_comphy1 0>;

	phy-names = "cp0-usb3h0-comphy";

	status = "okay";

};



&cp0_comphy4 {

	cp0_usbh1_con: connector {

		compatible = "usb-a-connector";

		phy-supply = <&cp0_reg_usb3_1_vbus>;

	};

};



&cp0_usb3_1 {

	usb-phy = <&cp0_usb3_1_phy>;

	phys = <&cp0_comphy4 1>;

	phy-names = "cp0-usb3h1-comphy";

	status = "okay";

};

arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

+16 −6
Original line number Diff line number Diff line
@@ -51,11 +51,6 @@ 
		status = "okay";

	};



	usb3h0_phy: usb3_phy0 {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&v_5v0_usb3_hst_vbus>;

	};



	sfp_cp0_eth0: sfp-cp0-eth0 {

		compatible = "sff,sfp";

		i2c-bus = <&cp0_i2c1>;
@@ -243,6 +238,8 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&cp0_pci0_reset_pins &cp0_wlan_disable_pins>;

	reset-gpios = <&cp0_gpio2 0 GPIO_ACTIVE_LOW>;

	phys = <&cp0_comphy0 0>;

	phy-names = "cp0-pcie0-x1-phy";

	status = "okay";

};
@@ -348,6 +345,11 @@ 
&cp1_sata0 {

	pinctrl-0 = <&cp0_pci1_reset_pins>;

	status = "okay";



	sata-port@1 {

		phys = <&cp1_comphy0 1>;

		phy-names = "cp1-sata0-1-phy";

	};

};



&cp1_mdio {
@@ -467,7 +469,15 @@ 
	};

};



&cp1_comphy2 {

	cp1_usbh0_con: connector {

		compatible = "usb-a-connector";

		phy-supply = <&v_5v0_usb3_hst_vbus>;

	};

};



&cp1_usb3_0 {

	usb-phy = <&usb3h0_phy>;

	phys = <&cp1_comphy2 0>;

	phy-names = "cp1-usb3h0-comphy";

	status = "okay";

};

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

+37 −6
Original line number Diff line number Diff line
@@ -54,11 +54,6 @@ 
		vcc-supply = <&cp0_reg_usb3_0_vbus>;

	};



	cp0_usb3_1_phy: cp0-usb3-1-phy {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&cp0_reg_usb3_1_vbus>;

	};



	cp1_reg_usb3_0_vbus: cp1-usb3-0-vbus {

		compatible = "regulator-fixed";

		regulator-name = "cp1-usb3h0-vbus";
@@ -108,11 +103,15 @@ 


/* CON6 on CP0 expansion */

&cp0_pcie0 {

	phys = <&cp0_comphy0 0>;

	phy-names = "cp0-pcie0-x1-phy";

	status = "okay";

};



/* CON5 on CP0 expansion */

&cp0_pcie2 {

	phys = <&cp0_comphy5 2>;

	phy-names = "cp0-pcie2-x1-phy";

	status = "okay";

};
@@ -143,6 +142,15 @@ 
/* CON4 on CP0 expansion */

&cp0_sata0 {

	status = "okay";



	sata-port@0 {

		phys = <&cp0_comphy1 0>;

		phy-names = "cp0-sata0-0-phy";

	};

	sata-port@1 {

		phys = <&cp0_comphy3 1>;

		phy-names = "cp0-sata0-1-phy";

	};

};



/* CON9 on CP0 expansion */
@@ -151,9 +159,17 @@ 
	status = "okay";

};



&cp0_comphy4 {

	cp0_usbh1_con: connector {

		compatible = "usb-a-connector";

		phy-supply = <&cp0_reg_usb3_1_vbus>;

	};

};



/* CON10 on CP0 expansion */

&cp0_usb3_1 {

	usb-phy = <&cp0_usb3_1_phy>;

	phys = <&cp0_comphy4 1>;

	phy-names = "cp0-usb3h1-comphy";

	status = "okay";

};
@@ -187,16 +203,22 @@ 


/* CON6 on CP1 expansion */

&cp1_pcie0 {

	phys = <&cp1_comphy0 0>;

	phy-names = "cp1-pcie0-x1-phy";

	status = "okay";

};



/* CON7 on CP1 expansion */

&cp1_pcie1 {

	phys = <&cp1_comphy4 1>;

	phy-names = "cp1-pcie1-x1-phy";

	status = "okay";

};



/* CON5 on CP1 expansion */

&cp1_pcie2 {

	phys = <&cp1_comphy5 2>;

	phy-names = "cp1-pcie2-x1-phy";

	status = "okay";

};
@@ -273,6 +295,15 @@ 
/* CON4 on CP1 expansion */

&cp1_sata0 {

	status = "okay";



	sata-port@0 {

		phys = <&cp1_comphy1 0>;

		phy-names = "cp1-sata0-0-phy";

	};

	sata-port@1 {

		phys = <&cp1_comphy3 1>;

		phy-names = "cp1-sata0-1-phy";

	};

};



/* CON9 on CP1 expansion */

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi

+30 −8
Original line number Diff line number Diff line
@@ -61,11 +61,6 @@ 
		status = "okay";

	};



	usb3h0_phy: usb3_phy0 {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&v_5v0_usb3_hst_vbus>;

	};



	sfp_eth0: sfp-eth0 {

		/* CON15,16 - CPM lane 4 */

		compatible = "sff,sfp";
@@ -186,6 +181,10 @@ 
	reset-gpios = <&cp0_gpio2 20 GPIO_ACTIVE_LOW>;

	ranges = <0x81000000 0x0 0xf9010000 0x0 0xf9010000 0x0 0x10000

		  0x82000000 0x0 0xc0000000 0x0 0xc0000000 0x0 0x20000000>;

	phys = <&cp0_comphy0 0>, <&cp0_comphy1 0>,

	       <&cp0_comphy2 0>, <&cp0_comphy3 0>;

	phy-names = "cp0-pcie0-x4-lane0-phy", "cp0-pcie0-x4-lane1-phy",

		    "cp0-pcie0-x4-lane2-phy", "cp0-pcie0-x4-lane3-phy";

	status = "okay";

};
@@ -239,8 +238,13 @@ 
};



&cp0_sata0 {

	/* CPM Lane 0 - U29 */

	status = "okay";



	/* CPM Lane 5 - U29 */

	sata-port@1 {

		phys = <&cp0_comphy5 1>;

		phy-names = "cp0-sata0-1-phy";

	};

};



&cp0_sdhci0 {
@@ -324,9 +328,19 @@ 
};



&cp1_sata0 {

	status = "okay";



	/* CPS Lane 1 - U32 */

	sata-port@0 {

		phys = <&cp1_comphy1 0>;

		phy-names = "cp1-sata0-0-phy";

	};



	/* CPS Lane 3 - U31 */

	status = "okay";

	sata-port@1 {

		phys = <&cp1_comphy3 1>;

		phy-names = "cp1-sata0-1-phy";

	};

};



&cp1_spi1 {
@@ -341,8 +355,16 @@ 
	};

};



&cp1_comphy2 {

	cp1_usbh0_con: connector {

		compatible = "usb-a-connector";

		phy-supply = <&v_5v0_usb3_hst_vbus>;

	};

};



&cp1_usb3_0 {

	/* CPS Lane 2 - CON7 */

	usb-phy = <&usb3h0_phy>;

	phys = <&cp1_comphy2 0>;

	phy-names = "cp1-usb3h0-comphy";

	status = "okay";

};