Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313238
b: refs/heads/master
c: a450839
h: refs/heads/master
v: v3
  • Loading branch information
Shawn Guo committed Jul 3, 2012
1 parent d3cf106 commit 10ee08d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72beabae635b9485510ccf8093df319f59eb6688
refs/heads/master: a450839432519beda04ffc286428b7e44b9dd488
6 changes: 6 additions & 0 deletions trunk/arch/arm/boot/dts/imx23-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@
};

apbx@80040000 {
auart0: serial@8006c000 {
pinctrl-names = "default";
pinctrl-0 = <&auart0_pins_a>;
status = "okay";
};

duart: serial@80070000 {
pinctrl-names = "default";
pinctrl-0 = <&duart_pins_a>;
Expand Down
19 changes: 19 additions & 0 deletions trunk/arch/arm/boot/dts/imx23.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
gpio0 = &gpio0;
gpio1 = &gpio1;
gpio2 = &gpio2;
serial0 = &auart0;
serial1 = &auart1;
};

cpus {
Expand Down Expand Up @@ -123,6 +125,19 @@
fsl,pull-up = <0>;
};

auart0_pins_a: auart0@0 {
reg = <0>;
fsl,pinmux-ids = <
0x01c0 /* MX23_PAD_AUART1_RX__AUART1_RX */
0x01d0 /* MX23_PAD_AUART1_TX__AUART1_TX */
0x01a0 /* MX23_PAD_AUART1_CTS__AUART1_CTS */
0x01b0 /* MX23_PAD_AUART1_RTS__AUART1_RTS */
>;
fsl,drive-strength = <0>;
fsl,voltage = <1>;
fsl,pull-up = <0>;
};

mmc0_4bit_pins_a: mmc0-4bit@0 {
reg = <0>;
fsl,pinmux-ids = <
Expand Down Expand Up @@ -289,12 +304,16 @@
};

auart0: serial@8006c000 {
compatible = "fsl,imx23-auart";
reg = <0x8006c000 0x2000>;
interrupts = <24 25 23>;
status = "disabled";
};

auart1: serial@8006e000 {
compatible = "fsl,imx23-auart";
reg = <0x8006e000 0x2000>;
interrupts = <59 60 58>;
status = "disabled";
};

Expand Down

0 comments on commit 10ee08d

Please sign in to comment.