Commit cbfaea96 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper
Browse files

ARM: dts: kirkwood: set default pinctrl for NAND 



There is only one valid pinctrl setting for NAND on Kirkwood. Now that we
have the setting in the common SoC pinctrl, move it to the NAND controller
node directly and remove it from the individual boards.

While at it, also fix up status = "okay" to "ok" on one board's NAND node.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-12-git-send-email-sebastian.hesselbarth@gmail.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 92901201

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,6 @@ 
};

};





&nand {

&nand {

	pinctrl-0 = <&pmx_nand>;

	pinctrl-names = "default";

	chip-delay = <25>;

	chip-delay = <25>;

	status = "okay";

	status = "okay";

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -183,8 +183,6 @@ 
};

};





&nand {

&nand {

	pinctrl-0 = <&pmx_nand>;

	pinctrl-names = "default";

	status = "okay";

	status = "okay";

	chip-delay = <35>;

	chip-delay = <35>;

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -105,8 +105,6 @@ 




&nand {

&nand {

	status = "okay";

	status = "okay";

	pinctrl-0 = <&pmx_nand>;

	pinctrl-names = "default";





	partition@0 {

	partition@0 {

		label = "u-boot";

		label = "u-boot";

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -46,9 +46,7 @@ 
};

};





&nand {

&nand {

	pinctrl-0 = <&pmx_nand>;

	status = "okay";

	pinctrl-names = "default";

	status = "ok";

	chip-delay = <25>;

	chip-delay = <25>;

};

};

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -138,7 +138,6 @@ 
&nand {

&nand {

	/* Total size : 512MB */

	/* Total size : 512MB */

	status = "okay";

	status = "okay";

	pinctrl-0 = <&pmx_nand>;





	partition@0 {

	partition@0 {

		label = "u-boot";

		label = "u-boot";

CRA Git | Maintained and supported by SUSTech CRA and CCSE