Skip to content

Commit

Permalink
ARM: dts: imx: use nodes label in board dts
Browse files Browse the repository at this point in the history
Following omap3-evm.dts way, it changes all imx dts files to use label
in board dts to refer to nodes defined by soc dtsi.  Thus, the board
dts files become easier to read and edit with the least indentation
levels.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
  • Loading branch information
Shawn Guo committed Feb 10, 2013
1 parent 8ba4723 commit be4ccfc
Show file tree
Hide file tree
Showing 15 changed files with 1,008 additions and 1,096 deletions.
30 changes: 11 additions & 19 deletions arch/arm/boot/dts/imx25-karo-tx25.dts
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,18 @@
memory {
reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
};
};

soc {
aips@43f00000 {
uart1: serial@43f90000 {
status = "okay";
};
};
&uart1 {
status = "okay";
};

spba@50000000 {
fec: ethernet@50038000 {
status = "okay";
phy-mode = "rmii";
};
};
&fec {
status = "okay";
phy-mode = "rmii";
};

emi@80000000 {
nand@bb000000 {
nand-on-flash-bbt;
status = "okay";
};
};
};
&nfc {
nand-on-flash-bbt;
status = "okay";
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx25.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@
reg = <0x80000000 0x3b002000>;
ranges;

nand@bb000000 {
nfc: nand@bb000000 {
#address-cells = <1>;
#size-cells = <1>;

Expand Down
82 changes: 39 additions & 43 deletions arch/arm/boot/dts/imx27-apf27.dts
Original file line number Diff line number Diff line change
Expand Up @@ -32,58 +32,54 @@
clock-frequency = <0>;
};
};
};

soc {
aipi@10000000 {
serial@1000a000 {
status = "okay";
};
&uart1 {
status = "okay";
};

ethernet@1002b000 {
status = "okay";
};
};
&fec {
status = "okay";
};

nand@d8000000 {
status = "okay";
nand-bus-width = <16>;
nand-ecc-mode = "hw";
nand-on-flash-bbt;
&nfc {
status = "okay";
nand-bus-width = <16>;
nand-ecc-mode = "hw";
nand-on-flash-bbt;

partition@0 {
label = "u-boot";
reg = <0x0 0x100000>;
};
partition@0 {
label = "u-boot";
reg = <0x0 0x100000>;
};

partition@100000 {
label = "env";
reg = <0x100000 0x80000>;
};
partition@100000 {
label = "env";
reg = <0x100000 0x80000>;
};

partition@180000 {
label = "env2";
reg = <0x180000 0x80000>;
};
partition@180000 {
label = "env2";
reg = <0x180000 0x80000>;
};

partition@200000 {
label = "firmware";
reg = <0x200000 0x80000>;
};
partition@200000 {
label = "firmware";
reg = <0x200000 0x80000>;
};

partition@280000 {
label = "dtb";
reg = <0x280000 0x80000>;
};
partition@280000 {
label = "dtb";
reg = <0x280000 0x80000>;
};

partition@300000 {
label = "kernel";
reg = <0x300000 0x500000>;
};
partition@300000 {
label = "kernel";
reg = <0x300000 0x500000>;
};

partition@800000 {
label = "rootfs";
reg = <0x800000 0xf800000>;
};
};
partition@800000 {
label = "rootfs";
reg = <0x800000 0xf800000>;
};
};
20 changes: 7 additions & 13 deletions arch/arm/boot/dts/imx27-pdk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,13 @@
memory {
reg = <0x0 0x0>;
};
};

soc {
aipi@10000000 { /* aipi1 */
uart1: serial@1000a000 {
fsl,uart-has-rtscts;
status = "okay";
};
};
&uart1 {
fsl,uart-has-rtscts;
status = "okay";
};

aipi@10020000 { /* aipi2 */
ethernet@1002b000 {
status = "okay";
};
};
};
&fec {
status = "okay";
};
12 changes: 4 additions & 8 deletions arch/arm/boot/dts/imx31-bug.dts
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,9 @@
memory {
reg = <0x80000000 0x8000000>; /* 128M */
};
};

soc {
aips@43f00000 { /* AIPS1 */
uart5: serial@43fb4000 {
fsl,uart-has-rtscts;
status = "okay";
};
};
};
&uart5 {
fsl,uart-has-rtscts;
status = "okay";
};
Loading

0 comments on commit be4ccfc

Please sign in to comment.