Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313227
b: refs/heads/master
c: 8385e7c
h: refs/heads/master
i:
  313225: d875cd4
  313223: 9fb7921
v: v3
  • Loading branch information
Maxime Ripard authored and Shawn Guo committed Jul 3, 2012
1 parent 01f6332 commit ff8bb94
Show file tree
Hide file tree
Showing 2 changed files with 18 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: 5653acc24c13e8b272e16a194b26465330753118
refs/heads/master: 8385e7c1db749f526e04854b48c12f1bd079b65e
17 changes: 17 additions & 0 deletions trunk/arch/arm/boot/dts/imx28.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,14 @@
fsl,pull-up = <0>;
};

duart_pins_b: duart@1 {
reg = <1>;
fsl,pinmux-ids = <0x3022 0x3032>;
fsl,drive-strength = <0>;
fsl,voltage = <1>;
fsl,pull-up = <0>;
};

gpmi_pins_a: gpmi-nand@0 {
reg = <0>;
fsl,pinmux-ids = <0x0000 0x0010 0x0020
Expand Down Expand Up @@ -234,6 +242,15 @@
fsl,pull-up = <1>;
};

mmc0_4bit_pins_a: mmc0-4bit@0 {
reg = <0>;
fsl,pinmux-ids = <0x2000 0x2010 0x2020
0x2030 0x2080 0x2090 0x20a0>;
fsl,drive-strength = <1>;
fsl,voltage = <1>;
fsl,pull-up = <1>;
};

mmc0_cd_cfg: mmc0-cd-cfg {
fsl,pinmux-ids = <0x2090>;
fsl,pull-up = <0>;
Expand Down

0 comments on commit ff8bb94

Please sign in to comment.