]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ARM: dts: cm-t335: Add support for CAN bus
authorUri Mashiach <uri.mashiach@compulab.co.il>
Wed, 30 Dec 2015 11:41:33 +0000 (13:41 +0200)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jan 2016 18:32:17 +0000 (10:32 -0800)
Add CAN bus pinmux.
Enable D_CAN bus controllers 0 and 1

The pinmux of uart1 node contradicts the pinmux of dcan0 and dcan1 nodes.
U-Boot should delete the uart1 or dcan0/1 nodes.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/am335x-cm-t335.dts

index 42e9b665582ab2672f6b112549d4178e5dc63d38..93997a2da8c17ccfde43fc04381237e50faf27ed 100644 (file)
                >;
        };
 
+       dcan0_pins: pinmux_dcan0_pins {
+               pinctrl-single,pins = <
+                       /* uart1_ctsn.dcan0_tx */
+                       AM33XX_IOPAD(0x978, PIN_OUTPUT | MUX_MODE2)
+                       /* uart1_rtsn.dcan0_rx */
+                       AM33XX_IOPAD(0x97C, PIN_INPUT | MUX_MODE2)
+               >;
+       };
+
+       dcan1_pins: pinmux_dcan1_pins {
+               pinctrl-single,pins = <
+                       /* uart1_rxd.dcan1_tx */
+                       AM33XX_IOPAD(0x980, PIN_OUTPUT | MUX_MODE2)
+                       /* uart1_txd.dcan1_rx */
+                       AM33XX_IOPAD(0x984, PIN_INPUT | MUX_MODE2)
+               >;
+       };
+
        ecap0_pins: pinmux_ecap0_pins {
                pinctrl-single,pins = <
                        /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
@@ -394,3 +412,15 @@ status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&mmc1_pins>;
 };
+
+&dcan0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&dcan0_pins>;
+};
+
+&dcan1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&dcan1_pins>;
+};