Hi, this patch makes the CANbus cape work on the ti kernel 3.14.
Regards, Adrian -- For more options, visit http://beagleboard.org/discuss --- You received this message because you are subscribed to the Google Groups "BeagleBoard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
>From 8af5da38108d561da074c058f0f016b45c55d519 Mon Sep 17 00:00:00 2001 From: Adrian Remonda <[email protected]> Date: Sun, 5 Oct 2014 12:50:46 +0200 Subject: [PATCH 1/1] Added devide tree support for the CAN cape new file: arch/arm/boot/dts/am335x-bone-can1.dtsi modified: arch/arm/boot/dts/am335x-bone-common-pinmux.dtsi modified: arch/arm/boot/dts/am335x-boneblack.dts --- arch/arm/boot/dts/am335x-bone-can1.dtsi | 23 +++++++++++++++++++++++ arch/arm/boot/dts/am335x-bone-common-pinmux.dtsi | 2 +- arch/arm/boot/dts/am335x-boneblack.dts | 11 ++++++----- 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 arch/arm/boot/dts/am335x-bone-can1.dtsi diff --git a/arch/arm/boot/dts/am335x-bone-can1.dtsi b/arch/arm/boot/dts/am335x-bone-can1.dtsi new file mode 100644 index 0000000..08810ce --- /dev/null +++ b/arch/arm/boot/dts/am335x-bone-can1.dtsi @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +&dcan1 { + pinctrl-names = "default"; + pinctrl-0 = <>; + + status = "okay"; +}; + +&ocp { + P9_24_pinmux { + mode = "can"; + }; + P9_26_pinmux { + mode = "can"; + }; +}; diff --git a/arch/arm/boot/dts/am335x-bone-common-pinmux.dtsi b/arch/arm/boot/dts/am335x-bone-common-pinmux.dtsi index 538e3fc..58cce13 100644 --- a/arch/arm/boot/dts/am335x-bone-common-pinmux.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common-pinmux.dtsi @@ -1173,7 +1173,7 @@ P9_26_uart_pin: pinmux_P9_26_uart_pin { pinctrl-single,pins = <0x180 0x30>; }; /* Mode 0, Pull-Up, RxActive */ P9_26_can_pin: pinmux_P9_26_can_pin { - pinctrl-single,pins = <0x180 0x32>; }; /* Mode 2, Pull-Up, RxActive */ + pinctrl-single,pins = <0x180 0x12>; }; /* Mode 2, Pull-Up, RxActive */ P9_26_i2c_pin: pinmux_P9_26_i2c_pin { pinctrl-single,pins = <0x180 0x33>; }; /* Mode 3, Pull-Up, RxActive */ P9_26_pruin_pin: pinmux_P9_26_pruin_pin { diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 582900c..e319f0d 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -53,7 +53,7 @@ #include "am335x-boneblack-emmc.dtsi" /* HDMI: with audio */ -#include "am335x-boneblack-nxp-hdmi-audio.dtsi" +//#include "am335x-boneblack-nxp-hdmi-audio.dtsi" /* HDMI: without audio */ /* #include "am335x-boneblack-nxp-hdmi-no-audio.dtsi" */ @@ -79,16 +79,16 @@ /* #include "am335x-bone-spi1a-spidev.dtsi" */ /* uart1: P9.24, P9.26 */ -#include "am335x-ttyO1.dtsi" +//#include "am335x-ttyO1.dtsi" /* #include "am335x-bone-ttyO1.dtsi" */ /* uart2: P9.21, P9.22 */ -#include "am335x-ttyO2.dtsi" +//#include "am335x-ttyO2.dtsi" /* #include "am335x-bone-ttyO2.dtsi" */ /* uart4: P9.11, P9.13 */ -#include "am335x-ttyO4.dtsi" +//#include "am335x-ttyO4.dtsi" /* #include "am335x-bone-ttyO4.dtsi" */ /* uart5: P8.37, P8.38 boneblack: hdmi has to be disabled for ttyO5 */ -#include "am335x-ttyO5.dtsi" +//#include "am335x-ttyO5.dtsi" /* #include "am335x-bone-ttyO5.dtsi" */ /* Capes */ @@ -137,3 +137,4 @@ /* http://elinux.org/CircuitCo:Basic_Proto_Cape */ /* #include "am335x-bone-basic-proto-cape.dtsi" */ + #include "am335x-bone-can1.dtsi" -- 2.0.4
