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

Commit d04abe99 authored Jul 31, 2019 by Miquel Raynal Committed by Gregory CLEMENT Aug 27, 2019

arm64: dts: marvell: Add 7k/8k per-port PHYs in SATA nodes



Fill-in the missing SATA phys/phy-names DT properties of Armada 7k/8k
based boards.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

parent 93ab25e6

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,11 @@

		&cp0_sata0 {
		status = "okay";

		sata-port@1 {
		phys = <&cp0_comphy3 1>;
		phy-names = "cp0-sata0-1-phy";
		};
		};

		&cp0_usb3_0 {

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -348,6 +348,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 {

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,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 */
		@@ -273,6 +282,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

+17 −2

Original line number	Diff line number	Diff line
		@@ -239,8 +239,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 +329,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 {

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -309,7 +309,17 @@
		interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&CP110_LABEL(clk) 1 15>,
		<&CP110_LABEL(clk) 1 16>;
		#address-cells = <1>;
		#size-cells = <0>;
		status = "disabled";

		sata-port@0 {
		reg = <0>;
		};

		sata-port@1 {
		reg = <1>;
		};
		};

		CP110_LABEL(xor0): xor@6a0000 {