hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Jason Gunthorpe 2013-09-17 12:44:33 -06:00 committed by Jason Cooper
parent 34a300909e
commit 7045ff5a53
16 changed files with 418 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,26 @@
status = "ok"; 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-0 = <&pmx_nand>;
pinctrl-names = "default"; pinctrl-names = "default";
chip-delay = <25>; 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 { &mdio {
status = "okay"; status = "okay";

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

@ -148,8 +148,41 @@
status = "okay"; status = "okay";
nr-ports = <2>; nr-ports = <2>;
}; };
};
nand@3000000 { 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 {
pinctrl-0 = <&pmx_nand>; pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
@ -186,39 +219,6 @@
reg = <0x7b00000 0x500000>; 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 { &mdio {
status = "okay"; status = "okay";

40
arch/arm/boot/dts/kirkwood-dockstar.dts
View File

@ -34,26 +34,6 @@
serial@12000 { serial@12000 {
status = "ok"; 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 { gpio-leds {
compatible = "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 { &mdio {
status = "okay"; status = "okay";

51
arch/arm/boot/dts/kirkwood-goflexnet.dts
View File

@ -67,31 +67,6 @@
status = "ok"; 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 { sata@80000 {
status = "okay"; status = "okay";
nr-ports = <2>; 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 { &mdio {
status = "okay"; status = "okay";

40
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
View File

@ -40,26 +40,6 @@
status = "ok"; 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 { sata@80000 {
status = "okay"; status = "okay";
nr-ports = <1>; 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 { &mdio {
status = "okay"; status = "okay";

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

@ -51,28 +51,6 @@
status = "okay"; status = "okay";
nr-ports = <2>; nr-ports = <2>;
}; };
nand@3000000 {
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
};
partition@100000 {
label = "uImage";
reg = <0x0100000 0x600000>;
};
partition@700000 {
label = "root";
reg = <0x0700000 0xf900000>;
};
};
}; };
gpio_keys { gpio_keys {
@ -123,6 +101,28 @@
}; };
&nand {
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
};
partition@100000 {
label = "uImage";
reg = <0x0100000 0x600000>;
};
partition@700000 {
label = "root";
reg = <0x0700000 0xf900000>;
};
};
&mdio { &mdio {
status = "okay"; status = "okay";

58
arch/arm/boot/dts/kirkwood-iconnect.dts
View File

@ -82,35 +82,6 @@
serial@12000 { serial@12000 {
status = "ok"; status = "ok";
}; };
nand@3000000 {
status = "okay";
partition@0 {
label = "uboot";
reg = <0x0000000 0xc0000>;
};
partition@a0000 {
label = "env";
reg = <0xa0000 0x20000>;
};
partition@100000 {
label = "zImage";
reg = <0x100000 0x300000>;
};
partition@540000 {
label = "initrd";
reg = <0x540000 0x300000>;
};
partition@980000 {
label = "boot";
reg = <0x980000 0x1f400000>;
};
};
}; };
gpio-leds { gpio-leds {
@ -179,6 +150,35 @@
}; };
}; };
&nand {
status = "okay";
partition@0 {
label = "uboot";
reg = <0x0000000 0xc0000>;
};
partition@a0000 {
label = "env";
reg = <0xa0000 0x20000>;
};
partition@100000 {
label = "zImage";
reg = <0x100000 0x300000>;
};
partition@540000 {
label = "initrd";
reg = <0x540000 0x300000>;
};
partition@980000 {
label = "boot";
reg = <0x980000 0x1f400000>;
};
};
&mdio { &mdio {
status = "okay"; status = "okay";

51
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
View File

@ -113,31 +113,6 @@
status = "ok"; status = "ok";
}; };
nand@3000000 {
status = "okay";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
read-only;
};
partition@a0000 {
label = "env";
reg = <0xa0000 0x20000>;
read-only;
};
partition@100000 {
label = "uImage";
reg = <0x100000 0x300000>;
};
partition@400000 {
label = "uInitrd";
reg = <0x540000 0x1000000>;
};
};
sata@80000 { sata@80000 {
status = "okay"; status = "okay";
nr-ports = <2>; nr-ports = <2>;
@ -195,6 +170,32 @@
}; };
}; };
&nand {
status = "okay";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
read-only;
};
partition@a0000 {
label = "env";
reg = <0xa0000 0x20000>;
read-only;
};
partition@100000 {
label = "uImage";
reg = <0x100000 0x300000>;
};
partition@400000 {
label = "uInitrd";
reg = <0x540000 0x1000000>;
};
};
&mdio { &mdio {
status = "okay"; status = "okay";

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

@ -34,13 +34,6 @@
serial@12000 { serial@12000 {
status = "ok"; status = "ok";
}; };
nand@3000000 {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "ok";
chip-delay = <25>;
};
}; };
i2c@0 { i2c@0 {
@ -51,6 +44,13 @@
}; };
}; };
&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "ok";
chip-delay = <25>;
};
&mdio { &mdio {
status = "okay"; status = "okay";

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

@ -95,37 +95,6 @@
pinctrl-names = "default"; pinctrl-names = "default";
}; };
nand@3000000 {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay";
partition@0 {
label = "uboot";
reg = <0x0000000 0x100000>;
};
partition@100000 {
label = "env";
reg = <0x100000 0x80000>;
};
partition@180000 {
label = "fdt";
reg = <0x180000 0x80000>;
};
partition@200000 {
label = "kernel";
reg = <0x200000 0x400000>;
};
partition@600000 {
label = "rootfs";
reg = <0x600000 0x1fa00000>;
};
};
rtc@10300 { rtc@10300 {
status = "disabled"; status = "disabled";
}; };
@ -193,6 +162,37 @@
}; };
}; };
&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay";
partition@0 {
label = "uboot";
reg = <0x0000000 0x100000>;
};
partition@100000 {
label = "env";
reg = <0x100000 0x80000>;
};
partition@180000 {
label = "fdt";
reg = <0x180000 0x80000>;
};
partition@200000 {
label = "kernel";
reg = <0x200000 0x400000>;
};
partition@600000 {
label = "rootfs";
reg = <0x600000 0x1fa00000>;
};
};
&mdio { &mdio {
status = "okay"; status = "okay";

60
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
View File

@ -97,36 +97,6 @@
status = "okay"; status = "okay";
}; };
nand@3000000 {
status = "okay";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x180000>;
read-only;
};
partition@180000 {
label = "u-boot-env";
reg = <0x180000 0x20000>;
};
partition@200000 {
label = "uImage";
reg = <0x0200000 0x600000>;
};
partition@800000 {
label = "minirootfs";
reg = <0x0800000 0x1000000>;
};
partition@1800000 {
label = "jffs2";
reg = <0x1800000 0x6800000>;
};
};
sata@80000 { sata@80000 {
status = "okay"; status = "okay";
nr-ports = <2>; nr-ports = <2>;
@ -207,6 +177,36 @@
}; };
}; };
&nand {
status = "okay";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x180000>;
read-only;
};
partition@180000 {
label = "u-boot-env";
reg = <0x180000 0x20000>;
};
partition@200000 {
label = "uImage";
reg = <0x0200000 0x600000>;
};
partition@800000 {
label = "minirootfs";
reg = <0x0800000 0x1000000>;
};
partition@1800000 {
label = "jffs2";
reg = <0x1800000 0x6800000>;
};
};
&mdio { &mdio {
status = "okay"; status = "okay";

74
arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
View File

@ -27,7 +27,43 @@
nr-ports = <2>; nr-ports = <2>;
}; };
nand@3000000 { pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
gpio_poweroff {
compatible = "gpio-poweroff";
pinctrl-0 = <&pmx_pwr_off>;
pinctrl-names = "default";
gpios = <&gpio1 16 0>;
};
regulators {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_usb_power_off>;
pinctrl-names = "default";
usb0_power_off: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "USB Power Off";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 21 0>;
};
};
};
&nand {
status = "okay"; status = "okay";
chip-delay = <35>; chip-delay = <35>;
@ -69,39 +105,3 @@
reg = <0x5040000 0x2fc0000>; reg = <0x5040000 0x2fc0000>;
}; };
}; };
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
gpio_poweroff {
compatible = "gpio-poweroff";
pinctrl-0 = <&pmx_pwr_off>;
pinctrl-names = "default";
gpios = <&gpio1 16 0>;
};
regulators {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_usb_power_off>;
pinctrl-names = "default";
usb0_power_off: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "USB Power Off";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 21 0>;
};
};
};

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

@ -29,43 +29,6 @@
pinctrl-names = "default"; pinctrl-names = "default";
}; };
nand@3000000 {
chip-delay = <25>;
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "uboot";
reg = <0x0 0x90000>;
};
partition@90000 {
label = "env";
reg = <0x90000 0x44000>;
};
partition@d4000 {
label = "test";
reg = <0xd4000 0x24000>;
};
partition@f4000 {
label = "conf";
reg = <0xf4000 0x400000>;
};
partition@4f4000 {
label = "linux";
reg = <0x4f4000 0x1d20000>;
};
partition@2214000 {
label = "user";
reg = <0x2214000 0x1dec000>;
};
};
sata@80000 { sata@80000 {
nr-ports = <1>; nr-ports = <1>;
status = "okay"; status = "okay";
@ -167,6 +130,43 @@
}; };
}; };
&nand {
chip-delay = <25>;
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "uboot";
reg = <0x0 0x90000>;
};
partition@90000 {
label = "env";
reg = <0x90000 0x44000>;
};
partition@d4000 {
label = "test";
reg = <0xd4000 0x24000>;
};
partition@f4000 {
label = "conf";
reg = <0xf4000 0x400000>;
};
partition@4f4000 {
label = "linux";
reg = <0x4f4000 0x1d20000>;
};
partition@2214000 {
label = "user";
reg = <0x2214000 0x1dec000>;
};
};
&mdio { &mdio {
status = "okay"; status = "okay";

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

@ -48,27 +48,6 @@
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
nand@3000000 {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
};
partition@100000 {
label = "uImage";
reg = <0x0100000 0x400000>;
};
partition@500000 {
label = "root";
reg = <0x0500000 0x1fb00000>;
};
};
}; };
regulators { regulators {
@ -92,6 +71,27 @@
}; };
}; };
&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
};
partition@100000 {
label = "uImage";
reg = <0x0100000 0x400000>;
};
partition@500000 {
label = "root";
reg = <0x0500000 0x1fb00000>;
};
};
&mdio { &mdio {
status = "okay"; status = "okay";

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

@ -90,37 +90,6 @@
pinctrl-names = "default"; pinctrl-names = "default";
}; };
nand@3000000 {
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x180000>;
};
partition@180000 {
label = "u-boot env";
reg = <0x0180000 0x20000>;
};
partition@200000 {
label = "uImage";
reg = <0x0200000 0x600000>;
};
partition@800000 {
label = "uInitrd";
reg = <0x0800000 0x1000000>;
};
partition@1800000 {
label = "rootfs";
reg = <0x1800000 0xe800000>;
};
};
sata@80000 { sata@80000 {
status = "okay"; status = "okay";
nr-ports = <1>; nr-ports = <1>;
@ -204,6 +173,37 @@
}; };
}; };
&nand {
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 {
label = "u-boot";
reg = <0x0000000 0x180000>;
};
partition@180000 {
label = "u-boot env";
reg = <0x0180000 0x20000>;
};
partition@200000 {
label = "uImage";
reg = <0x0200000 0x600000>;
};
partition@800000 {
label = "uInitrd";
reg = <0x0800000 0x1000000>;
};
partition@1800000 {
label = "rootfs";
reg = <0x1800000 0xe800000>;
};
};
&mdio { &mdio {
status = "okay"; status = "okay";

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

@ -45,12 +45,25 @@
clocks = <&gate_clk 17>; clocks = <&gate_clk 17>;
status = "okay"; status = "okay";
}; };
nand: nand@012f {
#address-cells = <1>;
#size-cells = <1>;
cle = <0>;
ale = <1>;
bank-width = <1>;
compatible = "marvell,orion-nand";
reg = <MBUS_ID(0x01, 0x2f) 0 0x400>;
chip-delay = <25>;
/* set partition map and/or chip-delay in board dts */
clocks = <&gate_clk 7>;
status = "disabled";
};
}; };
ocp@f1000000 { ocp@f1000000 {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0x00000000 0xf1000000 0x0100000 ranges = <0x00000000 0xf1000000 0x0100000>;
0xf4000000 0xf4000000 0x0000400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -206,20 +219,6 @@
status = "okay"; status = "okay";
}; };
nand@3000000 {
#address-cells = <1>;
#size-cells = <1>;
cle = <0>;
ale = <1>;
bank-width = <1>;
compatible = "marvell,orion-nand";
reg = <0xf4000000 0x400>;
chip-delay = <25>;
/* set partition map and/or chip-delay in board dts */
clocks = <&gate_clk 7>;
status = "disabled";
};
i2c@11000 { i2c@11000 {
compatible = "marvell,mv64xxx-i2c"; compatible = "marvell,mv64xxx-i2c";
reg = <0x11000 0x20>; reg = <0x11000 0x20>;