From 9d5c860ec2de190bd2d39419cda65eb94b4c6267 Mon Sep 17 00:00:00 2001 From: Russell Robinson Jr Date: Thu, 29 Aug 2013 17:04:43 -0700 Subject: [PATCH 3/3] pcm052: added flexcan support for the phyCORE-Vybrid Signed-off-by: Johnathan Feuerstein Signed-off-by: Russell Robinson Jr --- arch/arm/configs/pcm052_defconfig | 25 ++++++++++++++++++++++++- arch/arm/mach-mvf/board-pcm052.c | 12 ++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/pcm052_defconfig b/arch/arm/configs/pcm052_defconfig index a7f8d1d..92317f3 100644 --- a/arch/arm/configs/pcm052_defconfig +++ b/arch/arm/configs/pcm052_defconfig @@ -524,7 +524,30 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NET_PKTGEN is not set # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set +CONFIG_CAN=y +CONFIG_CAN_RAW=y +CONFIG_CAN_BCM=y + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=y +CONFIG_CAN_SLCAN=y +CONFIG_CAN_DEV=y +CONFIG_CAN_CALC_BITTIMING=y +# CONFIG_CAN_MCP251X is not set +CONFIG_HAVE_CAN_FLEXCAN=y +CONFIG_CAN_FLEXCAN=y +# CONFIG_CAN_SJA1000 is not set +# CONFIG_CAN_C_CAN is not set + +# +# CAN USB interfaces +# +# CONFIG_CAN_EMS_USB is not set +# CONFIG_CAN_ESD_USB2 is not set +# CONFIG_CAN_SOFTING is not set +# CONFIG_CAN_DEBUG_DEVICES is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set diff --git a/arch/arm/mach-mvf/board-pcm052.c b/arch/arm/mach-mvf/board-pcm052.c index 1b16eea..a0f33c5 100644 --- a/arch/arm/mach-mvf/board-pcm052.c +++ b/arch/arm/mach-mvf/board-pcm052.c @@ -274,6 +274,14 @@ static struct fec_platform_data fec_data __initdata = { .phy = PHY_INTERFACE_MODE_RMII, }; +static const struct flexcan_platform_data vybrid_flexcan0_pdata __initconst = { + .transceiver_switch = NULL, +}; + +static const struct flexcan_platform_data vybrid_flexcan1_pdata __initconst = { + .transceiver_switch = NULL, +}; + static struct switch_platform_data switch_data __initdata = { .phy = PHY_INTERFACE_MODE_RMII, }; @@ -512,6 +520,10 @@ static void __init pcm052_board_init(void) mxc_register_device(&pcm052_audio_device, &pcm052_audio_data); mvfa5_add_sai(2, &mvf_sai_pdata); + /* Init onboard can bus */ + mvf_add_flexcan0(&vybrid_flexcan0_pdata); + mvf_add_flexcan1(&vybrid_flexcan1_pdata); + mvf_add_wdt(0); pcm052_init_usb(); -- 1.8.3.4