Commit a90c9eae authored by Ralph Sennhauser's avatar Ralph Sennhauser Committed by Gregory CLEMENT
Browse files

ARM: dts: armada-385-linksys: flatten dtsi 



Since the addition of the spi reference two styles are used. Use
references instead of recreating the same structure over and over again.

This helps to distinguish which are changes to the underlying nodes and
which are new additions and helps maintainability in general.

Verified the resulting dtb to be binary identical.

Signed-off-by: default avatarRalph Sennhauser <ralph.sennhauser@gmail.com>
Signed-off-by: default avatarImre Kaloz <kaloz@openwrt.org>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 3bef2ac4

arch/arm/boot/dts/armada-385-linksys.dtsi

+206 −208
Original line number Diff line number Diff line
@@ -61,67 +61,75 @@ 
			  MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000

			  MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000

			  MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;

	};



		internal-regs {

			i2c@11000 {

				pinctrl-names = "default";

				pinctrl-0 = <&i2c0_pins>;

				status = "okay";

	usb3_phy: usb3_phy {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&reg_xhci0_vbus>;

	};



				tmp421@4c {

					compatible = "ti,tmp421";

					reg = <0x4c>;

	reg_xhci0_vbus: xhci0-vbus {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&xhci0_vbus_pins>;

		regulator-name = "xhci0-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

		gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;

	};



				pca9635@68 {

	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

					compatible = "nxp,pca9635";

					reg = <0x68>;

				};

			};

		pinctrl-0 = <&keys_pin>;

		pinctrl-names = "default";



			/* J10: VCC, NC, RX, NC, TX, GND  */

			serial@12000 {

				status = "okay";

		button@1 {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;

		};



			ethernet@70000 {

				status = "okay";

				phy-mode = "rgmii-id";

				buffer-manager = <&bm>;

				bm,pool-long = <2>;

				bm,pool-short = <3>;

				fixed-link {

					speed = <1000>;

					full-duplex;

		button@2 {

			label = "Factory Reset Button";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;

		};

	};



			ethernet@34000 {

				status = "okay";

				phy-mode = "sgmii";

				buffer-manager = <&bm>;

				bm,pool-long = <0>;

				bm,pool-short = <1>;

				fixed-link {

					speed = <1000>;

					full-duplex;

	gpio-leds {

		compatible = "gpio-leds";

		pinctrl-0 = <&power_led_pin &sata_led_pin>;

		pinctrl-names = "default";



		power {

			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};



		sata {

			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;

			default-state = "off";

			linux,default-trigger = "disk-activity";

		};

	};



			mdio@72004 {

				status = "okay";

	dsa@0 {

		status = "disabled";



				switch@0 {

					compatible = "marvell,mv88e6085";

					#address-cells = <1>;

		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;

					reg = <0>;



					ports {

		dsa,ethernet = <&eth2>;

		dsa,mii-bus = <&mdio>;



		switch@0 {

			#address-cells = <1>;

			#size-cells = <0>;

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



			port@0 {

				reg = <0>;
@@ -151,36 +159,66 @@ 
			port@5 {

				reg = <5>;

				label = "cpu";

							ethernet = <&eth2>;



							fixed-link {

								speed = <1000>;

								full-duplex;

			};

		};

	};

};



&ahci0 {

	status = "okay";

};



			sata@a8000 {

&bm {

	status = "okay";

};



			bm@c8000 {

&bm_bppi {

	status = "okay";

};



			/* USB part of the eSATA/USB 2.0 port */

			usb@58000 {

&eth0 {

	status = "okay";

	phy-mode = "rgmii-id";

	buffer-manager = <&bm>;

	bm,pool-long = <2>;

	bm,pool-short = <3>;

	fixed-link {

		speed = <1000>;

		full-duplex;

	};

};



			usb3@f8000 {

&eth2 {

	status = "okay";

				usb-phy = <&usb3_phy>;

	phy-mode = "sgmii";

	buffer-manager = <&bm>;

	bm,pool-long = <0>;

	bm,pool-short = <1>;

	fixed-link {

		speed = <1000>;

		full-duplex;

	};

};



			flash@d0000 {

&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	tmp421@4c {

		compatible = "ti,tmp421";

		reg = <0x4c>;

	};



	pca9635@68 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "nxp,pca9635";

		reg = <0x68>;

	};

};



&nand {

	status = "okay";

	num-cs = <1>;

	marvell,nand-keep-config;
@@ -250,94 +288,19 @@ 
		reg = <0x280000 0x680000>;   /* 6.5MB */

	};

};

		};



		bm-bppi {

			status = "okay";

		};



		pcie-controller {

			status = "okay";



			pcie@1,0 {

				/* Marvell 88W8864, 5GHz-only */

				status = "okay";

			};



			pcie@2,0 {

				/* Marvell 88W8864, 2GHz-only */

&mdio {

	status = "okay";

			};

		};

	};



	usb3_phy: usb3_phy {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&reg_xhci0_vbus>;

	};



	reg_xhci0_vbus: xhci0-vbus {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&xhci0_vbus_pins>;

		regulator-name = "xhci0-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

		gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;

	};



	gpio_keys {

		compatible = "gpio-keys";

	switch@0 {

		compatible = "marvell,mv88e6085";

		#address-cells = <1>;

		#size-cells = <0>;

		pinctrl-0 = <&keys_pin>;

		pinctrl-names = "default";



		button@1 {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;

		};



		button@2 {

			label = "Factory Reset Button";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";

		pinctrl-0 = <&power_led_pin &sata_led_pin>;

		pinctrl-names = "default";



		power {

			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};



		sata {

			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;

			default-state = "off";

			linux,default-trigger = "disk-activity";

		};

	};



	dsa@0 {

		status = "disabled";



		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;



		dsa,ethernet = <&eth2>;

		dsa,mii-bus = <&mdio>;

		reg = <0>;



		switch@0 {

		ports {

			#address-cells = <1>;

			#size-cells = <0>;

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



			port@0 {

				reg = <0>;
@@ -367,11 +330,31 @@ 
			port@5 {

				reg = <5>;

				label = "cpu";

				ethernet = <&eth2>;



				fixed-link {

					speed = <1000>;

					full-duplex;

				};

			};

		};

	};

};



&pciec {

	status = "okay";

};



&pcie1 {

	/* Marvell 88W8864, 5GHz-only */

	status = "okay";

};



&pcie2 {

	/* Marvell 88W8864, 2GHz-only */

	status = "okay";

};



&pinctrl {

	keys_pin: keys-pin {

		marvell,pins = "mpp24", "mpp29";
@@ -397,3 +380,18 @@ 
&spi0 {

	status = "disabled";

};



&uart0 {

	/* J10: VCC, NC, RX, NC, TX, GND  */

	status = "okay";

};



&usb0 {

	/* USB part of the eSATA/USB 2.0 port */

	status = "okay";

};



&usb3_1 {

	status = "okay";

	usb-phy = <&usb3_phy>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE