Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 326743
b: refs/heads/master
c: de7e934
h: refs/heads/master
i:
  326741: 5d01f47
  326739: 94c3b1e
  326735: 3db0b45
v: v3
  • Loading branch information
Maxime Ripard authored and Shawn Guo committed Sep 3, 2012
1 parent d93c4a7 commit 8f937ed
Show file tree
Hide file tree
Showing 2 changed files with 12 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: 8495a24386d3b1f0cfd17fd42e4c3ad80d88edbb
refs/heads/master: de7e934f2bd27e2636946600e4335c929fae3c87
11 changes: 11 additions & 0 deletions trunk/arch/arm/boot/dts/imx28.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,17 @@
fsl,pull-up = <1>;
};

i2c1_pins_a: i2c1@0 {
reg = <0>;
fsl,pinmux-ids = <
0x3101 /* MX28_PAD_PWM0__I2C1_SCL */
0x3111 /* MX28_PAD_PWM1__I2C1_SDA */
>;
fsl,drive-strength = <1>;
fsl,voltage = <1>;
fsl,pull-up = <1>;
};

saif0_pins_a: saif0@0 {
reg = <0>;
fsl,pinmux-ids = <
Expand Down

0 comments on commit 8f937ed

Please sign in to comment.