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

Commit e2eaa339 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: Kirkwood: convert rd88f6281-setup.c to DT. 



Perform a mechanical translation of rd88f6281-setup.c into DT.  Since
the hardware differs between the A0 and A1 stepping, two dts files are
used, and a .dtsi file for the common parts. The A0 part does not have
a "wan" port on the switch and uses PHY address 10 to address the
switch. The A1 part does have the "wan" port and uses address 0.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent dd943170

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \ 
	kirkwood-openblocks_a6.dtb \

	kirkwood-openblocks_a7.dtb \

	kirkwood-rd88f6192.dtb \

	kirkwood-rd88f6281-a0.dtb \

	kirkwood-rd88f6281-a1.dtb \

	kirkwood-sheevaplug.dtb \

	kirkwood-sheevaplug-esata.dtb \

	kirkwood-topkick.dtb \

arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Marvell RD88F6181 A0 Board descrition

 *

 * Andrew Lunn <andrew@lunn.ch>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 *

 * This file contains the definitions for the board with the A0 variant of

 * the SoC. The ethernet switch does not have a "wan" port.

 */



/dts-v1/;

#include "kirkwood-rd88f6281.dtsi"



/ {

	model = "Marvell RD88f6281 Reference design, with A0 SoC";

	compatible = "marvell,rd88f6281-a0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";



	dsa@0 {

		switch@0 {

			reg = <10 0>;    /* MDIO address 10, switch 0 in tree */

		};

	};

};
 
 No newline at end of file

arch/arm/boot/dts/kirkwood-rd88f6281-a1.dts

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Marvell RD88F6181 A1 Board descrition

 *

 * Andrew Lunn <andrew@lunn.ch>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 *

 * This file contains the definitions for the board with the A1 variant of

 * the SoC. The ethernet switch has a "wan" port.

 */



/dts-v1/;



#include "kirkwood-rd88f6281.dtsi"



/ {

	model = "Marvell RD88f6281 Reference design, with A1 SoC";

	compatible = "marvell,rd88f6281-a1", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";



	dsa@0 {

		switch@0 {

			reg = <0 0>;    /* MDIO address 0, switch 0 in tree */

			port@4 {

				reg = <4>;

				label = "wan";

			};

		};

	};

};
 
 No newline at end of file

arch/arm/boot/dts/kirkwood-rd88f6281.dtsi

0 → 100644
+152 −0
Original line number Diff line number Diff line 
/*

 * Marvell RD88F6181 Common Board descrition

 *

 * Andrew Lunn <andrew@lunn.ch>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 *

 * This file contains the definitions that are common between the two

 * variants of the Marvell Kirkwood Development Board.

 */



#include "kirkwood.dtsi"

#include "kirkwood-6281.dtsi"



/ {

	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8";

	};



	mbus {

		pcie-controller {

			status = "okay";



			pcie@1,0 {

				status = "okay";

			};

		};

	};



	ocp@f1000000 {

		pinctrl: pinctrl@10000 {

			pinctrl-0 = <&pmx_sdio_cd>;

			pinctrl-names = "default";



			pmx_sdio_cd: pmx-sdio-cd {

				marvell,pins = "mpp28";

				marvell,function = "gpio";

			};

		};



		serial@12000 {

			status = "okay";



		};



		sata@80000 {

			status = "okay";

			nr-ports = <2>;

		};

		mvsdio@90000 {

			pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;

			pinctrl-names = "default";

			status = "okay";

			cd-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;

			/* No WP GPIO */

		};

	};



	dsa@0 {

		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;



		dsa,ethernet = <&eth0>;

		dsa,mii-bus = <&ethphy1>;



		switch@0 {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				label = "lan1";

			};



			port@1 {

				reg = <1>;

				label = "lan2";

			};



			port@2 {

				reg = <2>;

				label = "lan3";

			};



			port@3 {

				reg = <3>;

				label = "lan4";

			};



			port@5 {

				reg = <5>;

				label = "cpu";

			};

		};

       };

};



&nand {

	status = "okay";



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x100000>;

		read-only;

	};



	partition@100000 {

		label = "uImage";

		reg = <0x0100000 0x200000>;

	};



	partition@300000 {

		label = "data";

		reg = <0x0300000 0x500000>;

	};

};



&mdio {

	status = "okay";



	ethphy0: ethernet-phy@0 {

		reg = <0>;

	};



	ethphy1: ethernet-phy@ff {

		reg = <0xff>; /* No PHY attached */

		speed = <1000>;

		duple = <1>;

	};

};



&eth0 {

	status = "okay";

	ethernet0-port@0 {

		phy-handle = <&ethphy0>;

	};

};



&eth1 {

	status = "okay";

	ethernet1-port@0 {

		phy-handle = <&ethphy1>;

	};

};