On Thu, Oct 25, 2012 at 01:26:39PM +0200, Roland Stigge wrote: > This patch supplements pinctl support on i.MX53. > > Signed-off-by: Roland Stigge <[email protected]>
Acked-by: Sascha Hauer <[email protected]> Shawn, probably better when you take this patch as it's quite likely that you collect other patches to this file. Sascha > --- > arch/arm/boot/dts/imx53.dtsi | 46 > +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > --- linux-2.6.orig/arch/arm/boot/dts/imx53.dtsi > +++ linux-2.6/arch/arm/boot/dts/imx53.dtsi > @@ -316,6 +316,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 = < > @@ -334,6 +352,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 = < > @@ -369,6 +396,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 { > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
