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

Commit 7045ff5a authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Jason Cooper
Browse files

ARM: kirkwood: Move the nand node under the mbus node 



There should be no nodes that are not children of the mbus. Move
the nand node under the mbus, and rework the board .dts files
to use an & reference to the nand node.

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 34a30090

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

+22 −22
Original line number Diff line number Diff line
@@ -39,7 +39,26 @@ 
			status = "ok";

		};



		nand@3000000 {

		sata@80000 {

			nr-ports = <2>;

			status = "okay";

		};



		ehci@50000 {

			status = "okay";

		};



		mvsdio@90000 {

			pinctrl-0 = <&pmx_sdio_gpios>;

			pinctrl-names = "default";

			wp-gpios = <&gpio1 5 0>;

			cd-gpios = <&gpio1 6 0>;

			status = "okay";

		};

	};

};



&nand {

	pinctrl-0 = <&pmx_nand>;

	pinctrl-names = "default";

	chip-delay = <25>;
@@ -61,25 +80,6 @@ 
	};

};



		sata@80000 {

			nr-ports = <2>;

			status = "okay";

		};



		ehci@50000 {

			status = "okay";

		};



		mvsdio@90000 {

			pinctrl-0 = <&pmx_sdio_gpios>;

			pinctrl-names = "default";

			wp-gpios = <&gpio1 5 0>;

			cd-gpios = <&gpio1 6 0>;

			status = "okay";

		};

	};

};



&mdio {

	status = "okay";

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

+38 −38
Original line number Diff line number Diff line
@@ -148,8 +148,41 @@ 
			status = "okay";

			nr-ports = <2>;

		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;

		pinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>;

		pinctrl-names = "default";



		sata0_power: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "SATA0 Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio1 7 0>;

		};

		sata1_power: regulator@2 {

			compatible = "regulator-fixed";

			reg = <2>;

			regulator-name = "SATA1 Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio1 8 0>;

		};

	};

};



		nand@3000000 {

&nand {

	pinctrl-0 = <&pmx_nand>;

	pinctrl-names = "default";

	status = "okay";
@@ -186,39 +219,6 @@ 
		reg = <0x7b00000 0x500000>;

	};

};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;

		pinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>;

		pinctrl-names = "default";



		sata0_power: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "SATA0 Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio1 7 0>;

		};

		sata1_power: regulator@2 {

			compatible = "regulator-fixed";

			reg = <2>;

			regulator-name = "SATA1 Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio1 8 0>;

		};

	};

};



&mdio {

	status = "okay";

arch/arm/boot/dts/kirkwood-dockstar.dts

+20 −20
Original line number Diff line number Diff line
@@ -34,26 +34,6 @@ 
		serial@12000 {

			status = "ok";

		};



		nand@3000000 {

			status = "okay";



			partition@0 {

				label = "u-boot";

				reg = <0x0000000 0x100000>;

				read-only;

			};



			partition@100000 {

				label = "uImage";

				reg = <0x0100000 0x400000>;

			};



			partition@500000 {

				label = "data";

				reg = <0x0500000 0xfb00000>;

			};

		};

	};

	gpio-leds {

		compatible = "gpio-leds";
@@ -91,6 +71,26 @@ 
	};

};



&nand {

	status = "okay";



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x100000>;

		read-only;

	};



	partition@100000 {

		label = "uImage";

		reg = <0x0100000 0x400000>;

	};



	partition@500000 {

		label = "data";

		reg = <0x0500000 0xfb00000>;

	};

};



&mdio {

	status = "okay";

arch/arm/boot/dts/kirkwood-goflexnet.dts

+26 −25
Original line number Diff line number Diff line
@@ -67,31 +67,6 @@ 
			status = "ok";

		};



		nand@3000000 {

			chip-delay = <40>;

			status = "okay";



			partition@0 {

				label = "u-boot";

				reg = <0x0000000 0x100000>;

				read-only;

			};



			partition@100000 {

				label = "uImage";

				reg = <0x0100000 0x400000>;

			};



			partition@500000 {

				label = "pogoplug";

				reg = <0x0500000 0x2000000>;

			};



			partition@2500000 {

				label = "root";

				reg = <0x02500000 0xd800000>;

			};

		};

		sata@80000 {

			status = "okay";

			nr-ports = <2>;
@@ -171,6 +146,32 @@ 
	};

};



&nand {

	chip-delay = <40>;

	status = "okay";



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x100000>;

		read-only;

	};



	partition@100000 {

		label = "uImage";

		reg = <0x0100000 0x400000>;

	};



	partition@500000 {

		label = "pogoplug";

		reg = <0x0500000 0x2000000>;

	};



	partition@2500000 {

		label = "root";

		reg = <0x02500000 0xd800000>;

	};

};



&mdio {

	status = "okay";

arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts

+20 −20
Original line number Diff line number Diff line
@@ -40,26 +40,6 @@ 
			status = "ok";

		};



		nand@3000000 {

			status = "okay";



			partition@0 {

				label = "u-boot";

				reg = <0x00000000 0x00100000>;

				read-only;

			};



			partition@100000 {

				label = "uImage";

				reg = <0x00100000 0x00400000>;

			};



			partition@500000 {

				label = "data";

				reg = <0x00500000 0x1fb00000>;

			};

		};



		sata@80000 {

			status = "okay";

			nr-ports = <1>;
@@ -97,6 +77,26 @@ 
	};

};



&nand {

	status = "okay";



	partition@0 {

		label = "u-boot";

		reg = <0x00000000 0x00100000>;

		read-only;

	};



	partition@100000 {

		label = "uImage";

		reg = <0x00100000 0x00400000>;

	};



	partition@500000 {

		label = "data";

		reg = <0x00500000 0x1fb00000>;

	};

};



&mdio {

	status = "okay";