Skip to content

Commit

Permalink
ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0
Browse files Browse the repository at this point in the history
Define both uarts in kirkwood.dtsi as they are common to all kirkwood
SoCs.  Each board may enable all or none of them, so they are disabled
by default.  uart0 is enabled for the dreamplug.

tclk can vary for each board, so we leave it undefined in the kirkwood
dtsi.  Each board can then set it as appropriate when enabling the uart.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  • Loading branch information
Jason Cooper committed Mar 16, 2012
1 parent 6fa6b87 commit 163f2ce
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 7 deletions.
11 changes: 5 additions & 6 deletions arch/arm/boot/dts/kirkwood-dreamplug.dts
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
bootargs = "console=ttyS0,115200n8 earlyprintk";
};

serial@f1012000 {
compatible = "ns16550a";
reg = <0xf1012000 0x100>;
reg-shift = <2>;
interrupts = <33>;
clock-frequency = <200000000>;
ocp@f1000000 {
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
};
};
26 changes: 25 additions & 1 deletion arch/arm/boot/dts/kirkwood.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,29 @@

/ {
compatible = "mrvl,kirkwood";
};

ocp@f1000000 {
compatible = "simple-bus";
ranges = <0 0xf1000000 0x1000000>;
#address-cells = <1>;
#size-cells = <1>;

serial@12000 {
compatible = "ns16550a";
reg = <0x12000 0x100>;
reg-shift = <2>;
interrupts = <33>;
/* set clock-frequency in board dts */
status = "disabled";
};

serial@12100 {
compatible = "ns16550a";
reg = <0x12100 0x100>;
reg-shift = <2>;
interrupts = <34>;
/* set clock-frequency in board dts */
status = "disabled";
};
};
};

0 comments on commit 163f2ce

Please sign in to comment.