Skip to content

Commit

Permalink
can: flexcan: remove HAVE_CAN_FLEXCAN Kconfig symbol
Browse files Browse the repository at this point in the history
This patch removes the Kconfig symbol HAVE_CAN_FLEXCAN from arch/{arm,powerpc}
and allowing compilation unconditionally on all arm and powerpc platforms.

This brings a bigger compile time coverage and removes the following dependency
warning found by Arnd Bergmann:

    warning: (SOC_IMX28 && SOC_IMX25 && SOC_IMX35 && IMX_HAVE_PLATFORM_FLEXCAN &&
        SOC_IMX53 && SOC_IMX6Q) selects HAVE_CAN_FLEXCAN
    which has unmet direct dependencies (NET && CAN && CAN_DEV)

Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Marc Kleine-Budde committed Jun 3, 2013
1 parent 588e7a8 commit 4c4726f
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 11 deletions.
4 changes: 0 additions & 4 deletions arch/arm/mach-imx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-imx/devices/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-mxs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,6 @@ config SBUS

config FSL_SOC
bool
select HAVE_CAN_FLEXCAN if NET && CAN

config FSL_PCI
bool
Expand Down
5 changes: 1 addition & 4 deletions drivers/net/can/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 4c4726f

Please sign in to comment.