Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342239
b: refs/heads/master
c: a1fff23
h: refs/heads/master
i:
  342237: 509ba3e
  342235: b28852e
  342231: 34bb558
  342223: c6a96fa
  342207: bc11618
v: v3
  • Loading branch information
Roland Stigge authored and Shawn Guo committed Nov 16, 2012
1 parent 20949dc commit e8a2a76
Show file tree
Hide file tree
Showing 2 changed files with 47 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: d90df97863c7838847abd0f144c71db60aa00643
refs/heads/master: a1fff236b43dfe6394fd04b0302f5a261e1cc3e5
46 changes: 46 additions & 0 deletions trunk/arch/arm/boot/dts/imx53.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,24 @@
};
};

can1 {
pinctrl_can1_1: can1grp-1 {
fsl,pins = <
847 0x80000000 /* MX53_PAD_PATA_INTRQ__CAN1_TXCAN */
853 0x80000000 /* MX53_PAD_PATA_DIOR__CAN1_RXCAN */
>;
};
};

can2 {
pinctrl_can2_1: can2grp-1 {
fsl,pins = <
67 0x80000000 /* MX53_PAD_KEY_COL4__CAN2_TXCAN */
74 0x80000000 /* MX53_PAD_KEY_ROW4__CAN2_RXCAN */
>;
};
};

i2c1 {
pinctrl_i2c1_1: i2c1grp-1 {
fsl,pins = <
Expand All @@ -338,6 +356,15 @@
};
};

i2c3 {
pinctrl_i2c3_1: i2c3grp-1 {
fsl,pins = <
1102 0xc0000000 /* MX53_PAD_GPIO_6__I2C3_SDA */
1130 0xc0000000 /* MX53_PAD_GPIO_5__I2C3_SCL */
>;
};
};

uart1 {
pinctrl_uart1_1: uart1grp-1 {
fsl,pins = <
Expand Down Expand Up @@ -373,6 +400,25 @@
>;
};
};

uart4 {
pinctrl_uart4_1: uart4grp-1 {
fsl,pins = <
11 0x1c5 /* MX53_PAD_KEY_COL0__UART4_TXD_MUX */
18 0x1c5 /* MX53_PAD_KEY_ROW0__UART4_RXD_MUX */
>;
};
};

uart5 {
pinctrl_uart5_1: uart5grp-1 {
fsl,pins = <
24 0x1c5 /* MX53_PAD_KEY_COL1__UART5_TXD_MUX */
31 0x1c5 /* MX53_PAD_KEY_ROW1__UART5_RXD_MUX */
>;
};
};

};

uart1: serial@53fbc000 {
Expand Down

0 comments on commit e8a2a76

Please sign in to comment.