Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f45eba1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next 



Marc Kleine-Budde says:

====================
this is a pull-request for net-next/master. It consists of two patches
by Fabio Estevam, cleaning up the flexcan driver (remove default
pinctrl and switch to SIMPLE_DEV_PM_OPS). A patch by me to simplify the
Kconfig [1] handling for flexcan. And a patch by Jingoo Han that
converts the can drivers to use platform_{get,set}_drvdata().

[1] My patch touches arch/{arm,powerpc}, so I collected Acked-bys from
Arnd Bergmann, Shawn Guo and Benjamin Herrenschmidt.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 600fed5e 00e4bbc8

arch/arm/mach-imx/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ config SOC_IMX25 
	select ARCH_MXC_IOMUX_V3

	select COMMON_CLK

	select CPU_ARM926T

	select HAVE_CAN_FLEXCAN if CAN

	select MXC_AVIC



config SOC_IMX27
@@ -137,7 +136,6 @@ config SOC_IMX35 
	select ARCH_MXC_IOMUX_V3

	select COMMON_CLK

	select CPU_V6K

	select HAVE_CAN_FLEXCAN if CAN

	select HAVE_EPIT

	select MXC_AVIC

	select SMP_ON_UP if SMP
@@ -776,7 +774,6 @@ comment "Device tree only" 


config	SOC_IMX53

	bool "i.MX53 support"

	select HAVE_CAN_FLEXCAN if CAN

	select HAVE_IMX_SRC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select PINCTRL
@@ -799,7 +796,6 @@ config SOC_IMX6Q 
	select CPU_V7

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if LOCAL_TIMERS

	select HAVE_CAN_FLEXCAN if CAN

	select HAVE_IMX_ANATOP

	select HAVE_IMX_GPC

	select HAVE_IMX_MMDC

arch/arm/mach-imx/devices/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ config IMX_HAVE_PLATFORM_FEC 


config IMX_HAVE_PLATFORM_FLEXCAN

	bool

	select HAVE_CAN_FLEXCAN if CAN



config IMX_HAVE_PLATFORM_FSL_USB2_UDC

	bool

arch/arm/mach-mxs/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ config SOC_IMX28 
	select ARM_AMBA

	select ARM_CPU_SUSPEND if PM

	select CPU_ARM926T

	select HAVE_CAN_FLEXCAN if CAN

	select HAVE_PWM

	select PINCTRL_IMX28

arch/powerpc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -674,7 +674,6 @@ config SBUS 


config FSL_SOC

	bool

	select HAVE_CAN_FLEXCAN if NET && CAN



config FSL_PCI

 	bool

drivers/net/can/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -102,12 +102,9 @@ config CAN_JANZ_ICAN3 
	  This driver can also be built as a module. If so, the module will be

	  called janz-ican3.ko.



config HAVE_CAN_FLEXCAN

	bool



config CAN_FLEXCAN

	tristate "Support for Freescale FLEXCAN based chips"

	depends on HAVE_CAN_FLEXCAN

	depends on ARM || PPC

	---help---

	  Say Y here if you want to support for Freescale FlexCAN.