Message ID | 1342604563-18915-3-git-send-email-mkl@pengutronix.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 07/18/2012 04:53 PM, Shawn Guo wrote: > On Wed, Jul 18, 2012 at 11:42:43AM +0200, Marc Kleine-Budde wrote: >> From: Steffen Trumtrar <s.trumtrar@pengutronix.de> >> >> Cc: Sascha Hauer <s.hauer@pengutronix.de> >> Cc: Shawn Guo <shawn.guo@linaro.org> >> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> >> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > > I have sent all my 3.6 material to arm-soc, so queued it for 3.7. Fine with me. Thanks, Marc
On Wed, Jul 18, 2012 at 11:42:43AM +0200, Marc Kleine-Budde wrote: > From: Steffen Trumtrar <s.trumtrar@pengutronix.de> > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Shawn Guo <shawn.guo@linaro.org> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> I have sent all my 3.6 material to arm-soc, so queued it for 3.7. Shawn
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index e3e8694..5ae0dbd 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi @@ -196,6 +196,20 @@ status = "disabled"; }; + can1: can@53fc8000 { + compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan"; + reg = <0x53fc8000 0x4000>; + interrupts = <82>; + status = "disabled"; + }; + + can2: can@53fcc000 { + compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan"; + reg = <0x53fcc000 0x4000>; + interrupts = <83>; + status = "disabled"; + }; + gpio5: gpio@53fdc000 { compatible = "fsl,imx53-gpio", "fsl,imx31-gpio"; reg = <0x53fdc000 0x4000>;