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

Commit d5bd6335 authored by Russell King's avatar Russell King Committed by Gregory CLEMENT
Browse files

ARM: dts: armada388-clearfog: move DSA switch 



Move the DSA switch configuration to the clearfog .dts file as this is
only present on the pro models.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 76138f94

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

+75 −0
Original line number Diff line number Diff line
@@ -53,4 +53,79 @@ 
	model = "SolidRun Clearfog A1";

	compatible = "solidrun,clearfog-a1", "marvell,armada388",

		"marvell,armada385", "marvell,armada380";



	dsa@0 {

		compatible = "marvell,dsa";

		dsa,ethernet = <&eth1>;

		dsa,mii-bus = <&mdio>;

		pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>;

		pinctrl-names = "default";

		#address-cells = <2>;

		#size-cells = <0>;



		switch@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <4 0>;



			port@0 {

				reg = <0>;

				label = "lan5";

			};



			port@1 {

				reg = <1>;

				label = "lan4";

			};



			port@2 {

				reg = <2>;

				label = "lan3";

			};



			port@3 {

				reg = <3>;

				label = "lan2";

			};



			port@4 {

				reg = <4>;

				label = "lan1";

			};



			port@5 {

				reg = <5>;

				label = "cpu";

			};



			port@6 {

				/* 88E1512 external phy */

				reg = <6>;

				label = "lan6";

				fixed-link {

					speed = <1000>;

					full-duplex;

				};

			};

		};

	};

};



&eth1 {

	/* ethernet@30000 */

	fixed-link {

		speed = <1000>;

		full-duplex;

	};

};



&pinctrl {

	clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {

		marvell,pins = "mpp46";

		marvell,function = "ref";

	};

	clearfog_dsa0_pins: clearfog-dsa0-pins {

		marvell,pins = "mpp23", "mpp41";

		marvell,function = "gpio";

	};

};

arch/arm/boot/dts/armada-388-clearfog.dtsi

+0 −69
Original line number Diff line number Diff line
@@ -77,11 +77,6 @@ 
				bm,pool-long = <2>;

				bm,pool-short = <1>;

				status = "okay";



				fixed-link {

					speed = <1000>;

					full-duplex;

				};

			};



			ethernet@34000 {
@@ -235,14 +230,6 @@ 
			};



			pinctrl@18000 {

				clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {

					marvell,pins = "mpp46";

					marvell,function = "ref";

				};

				clearfog_dsa0_pins: clearfog-dsa0-pins {

					marvell,pins = "mpp23", "mpp41";

					marvell,function = "gpio";

				};

				clearfog_i2c1_pins: i2c1-pins {

					/* SFP, PCIe, mSATA, mikrobus */

					marvell,pins = "mpp26", "mpp27";
@@ -339,62 +326,6 @@ 
		};

	};



	dsa@0 {

		compatible = "marvell,dsa";

		dsa,ethernet = <&eth1>;

		dsa,mii-bus = <&mdio>;

		pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>;

		pinctrl-names = "default";

		#address-cells = <2>;

		#size-cells = <0>;



		switch@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <4 0>;



			port@0 {

				reg = <0>;

				label = "lan5";

			};



			port@1 {

				reg = <1>;

				label = "lan4";

			};



			port@2 {

				reg = <2>;

				label = "lan3";

			};



			port@3 {

				reg = <3>;

				label = "lan2";

			};



			port@4 {

				reg = <4>;

				label = "lan1";

			};



			port@5 {

				reg = <5>;

				label = "cpu";

			};



			port@6 {

				/* 88E1512 external phy */

				reg = <6>;

				label = "lan6";

				fixed-link {

					speed = <1000>;

					full-duplex;

				};

			};

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-0 = <&rear_button_pins>;