UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-12-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2014-04-30 14:56:38 +02:00 committed by Jason Cooper
parent 929012010a
commit cbfaea96ac
11 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/kirkwood-db.dtsi
View File

@ -57,8 +57,6 @@
};
&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
chip-delay = <25>;
status = "okay";

2
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View File

@ -183,8 +183,6 @@
};
&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay";
chip-delay = <35>;

2
arch/arm/boot/dts/kirkwood-ib62x0.dts
View File

@ -105,8 +105,6 @@
&nand {
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "u-boot";

4
arch/arm/boot/dts/kirkwood-km_kirkwood.dts
View File

@ -46,9 +46,7 @@
};
&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "ok";
status = "okay";
chip-delay = <25>;
};

1
arch/arm/boot/dts/kirkwood-laplug.dts
View File

@ -138,7 +138,6 @@
&nand {
/* Total size : 512MB */
status = "okay";
pinctrl-0 = <&pmx_nand>;
partition@0 {
label = "u-boot";

2
arch/arm/boot/dts/kirkwood-mplcec4.dts
View File

@ -162,8 +162,6 @@
};
&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay";
partition@0 {

2
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View File

@ -130,8 +130,6 @@
&nand {
chip-delay = <25>;
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "uboot";

2
arch/arm/boot/dts/kirkwood-openblocks_a7.dts
View File

@ -148,8 +148,6 @@
&nand {
chip-delay = <25>;
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "uboot";

2
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
View File

@ -71,8 +71,6 @@
};
&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay";
partition@0 {

2
arch/arm/boot/dts/kirkwood-topkick.dts
View File

@ -174,8 +174,6 @@
&nand {
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "u-boot";

2
arch/arm/boot/dts/kirkwood.dtsi
View File

@ -61,6 +61,8 @@
chip-delay = <25>;
/* set partition map and/or chip-delay in board dts */
clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "disabled";
};
};