| Message ID | 1339181830-22863-1-git-send-email-marex@denx.de |
|---|---|
| State | New |
| Headers | show |
Please use something like "ARM: mxs: Enable FLEXCAN for DT" for the subject. On Fri, Jun 08, 2012 at 08:57:10PM +0200, Marek Vasut wrote: > + flexcan0_pins_a: flexcan0@0 { > + reg = <0>; > + fsl,pinmux-ids = <0x0161 0x0162>; Are you sure the second cell is correct? From what Documentation/devicetree/bindings/pinctrl/fsl,mxs-pinctrl.txt tells: MX28_PAD_GPMI_RDY2__ENET0_TX_ER 0x0162 > + fsl,drive-strength = <2>; > + fsl,voltage = <1>; > + fsl,pull-up = <0>; > + }; > + > + flexcan1_pins_a: flexcan1@0 { > + reg = <0>; > + fsl,pinmux-ids = <0x0121 0x0122>; Ditto MX28_PAD_GPMI_CE2N__ENET0_RX_ER 0x0122 > + fsl,drive-strength = <2>; > + fsl,voltage = <1>; > + fsl,pull-up = <0>; > + }; > +
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 5053019..a40e30d 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -167,6 +167,22 @@ fsl,pull-up = <0>; }; + flexcan0_pins_a: flexcan0@0 { + reg = <0>; + fsl,pinmux-ids = <0x0161 0x0162>; + fsl,drive-strength = <2>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + + flexcan1_pins_a: flexcan1@0 { + reg = <0>; + fsl,pinmux-ids = <0x0121 0x0122>; + fsl,drive-strength = <2>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + gpmi_pins_a: gpmi-nand@0 { reg = <0>; fsl,pinmux-ids = <0x0000 0x0010 0x0020 @@ -295,12 +311,14 @@ }; can0: can@80032000 { + compatible = "fsl,p1010-flexcan"; reg = <0x80032000 2000>; interrupts = <8>; status = "disabled"; }; can1: can@80034000 { + compatible = "fsl,p1010-flexcan"; reg = <0x80034000 2000>; interrupts = <9>; status = "disabled"; diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index 91cf062..5451c07 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -18,6 +18,7 @@ config SOC_IMX28 select CPU_ARM926T select HAVE_PWM select PINCTRL_IMX28 + select HAVE_CAN_FLEXCAN comment "MXS platforms:"
Signed-off-by: Marek Vasut <marex@denx.de> Cc: Detlev Zundel <dzu@denx.de> CC: Dong Aisheng <b29396@freescale.com> CC: Fabio Estevam <fabio.estevam@freescale.com> Cc: Linux ARM kernel <linux-arm-kernel@lists.infradead.org> CC: Shawn Guo <shawn.guo@linaro.org> Cc: Stefano Babic <sbabic@denx.de> Cc: Wolfgang Denk <wd@denx.de> --- arch/arm/boot/dts/imx28.dtsi | 18 ++++++++++++++++++ arch/arm/mach-mxs/Kconfig | 1 + 2 files changed, 19 insertions(+)