Patchwork [1/2] arm: imx: enable flexcan on imx25, imx35, imx53, imx6q

login
register
mail settings
Submitter Marc Kleine-Budde
Date July 1, 2012, 8:46 p.m.
Message ID <1341175565-13218-2-git-send-email-mkl@pengutronix.de>
Download mbox | patch
Permalink /patch/168460/
State New
Headers show

Comments

Marc Kleine-Budde - July 1, 2012, 8:46 p.m.
Cc: Sascha Hauer <sha@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig |    4 ++++
 1 file changed, 4 insertions(+)
Sascha Hauer - July 2, 2012, 7:50 a.m.
On Sun, Jul 01, 2012 at 10:46:04PM +0200, Marc Kleine-Budde wrote:
> Cc: Sascha Hauer <sha@pengutronix.de>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
>  arch/arm/mach-imx/Kconfig |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index eff4db5..c296851 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -52,6 +52,7 @@ config SOC_IMX25
>  	select ARCH_MX25
>  	select COMMON_CLK
>  	select CPU_ARM926T
> +	select HAVE_CAN_FLEXCAN if CAN

Do we need the 'if CAN' here? It seems yes, since HAVE_CAN_FLEXCAN is
inside the "CAN Device Drivers" menu which depends on CAN. Shouldn't the
HAVE_CAN_FLECAN be outside the menu?

Sascha
Marc Kleine-Budde - July 2, 2012, 7:54 a.m.
On 07/02/2012 09:50 AM, Sascha Hauer wrote:
> On Sun, Jul 01, 2012 at 10:46:04PM +0200, Marc Kleine-Budde wrote:
>> Cc: Sascha Hauer <sha@pengutronix.de>
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>> ---
>>  arch/arm/mach-imx/Kconfig |    4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
>> index eff4db5..c296851 100644
>> --- a/arch/arm/mach-imx/Kconfig
>> +++ b/arch/arm/mach-imx/Kconfig
>> @@ -52,6 +52,7 @@ config SOC_IMX25
>>  	select ARCH_MX25
>>  	select COMMON_CLK
>>  	select CPU_ARM926T
>> +	select HAVE_CAN_FLEXCAN if CAN
> 
> Do we need the 'if CAN' here? It seems yes, since HAVE_CAN_FLEXCAN is
> inside the "CAN Device Drivers" menu which depends on CAN. Shouldn't the
> HAVE_CAN_FLECAN be outside the menu?

Yes, we can move the HAVE_CAN_FLEXCAN outside of that menu, but it still
depends on CONFIG_NET.

Marc
Sascha Hauer - July 2, 2012, 8:06 a.m.
On Mon, Jul 02, 2012 at 09:54:08AM +0200, Marc Kleine-Budde wrote:
> On 07/02/2012 09:50 AM, Sascha Hauer wrote:
> > On Sun, Jul 01, 2012 at 10:46:04PM +0200, Marc Kleine-Budde wrote:
> >> Cc: Sascha Hauer <sha@pengutronix.de>
> >> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> >> ---
> >>  arch/arm/mach-imx/Kconfig |    4 ++++
> >>  1 file changed, 4 insertions(+)
> >>
> >> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> >> index eff4db5..c296851 100644
> >> --- a/arch/arm/mach-imx/Kconfig
> >> +++ b/arch/arm/mach-imx/Kconfig
> >> @@ -52,6 +52,7 @@ config SOC_IMX25
> >>  	select ARCH_MX25
> >>  	select COMMON_CLK
> >>  	select CPU_ARM926T
> >> +	select HAVE_CAN_FLEXCAN if CAN
> > 
> > Do we need the 'if CAN' here? It seems yes, since HAVE_CAN_FLEXCAN is
> > inside the "CAN Device Drivers" menu which depends on CAN. Shouldn't the
> > HAVE_CAN_FLECAN be outside the menu?
> 
> Yes, we can move the HAVE_CAN_FLEXCAN outside of that menu, but it still
> depends on CONFIG_NET.

Ok, then we have no choice. I just asked because it seems unnatural that
the presence of a hardware device depends on config options.

Sascha

Patch

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index eff4db5..c296851 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -52,6 +52,7 @@  config SOC_IMX25
 	select ARCH_MX25
 	select COMMON_CLK
 	select CPU_ARM926T
+	select HAVE_CAN_FLEXCAN if CAN
 	select ARCH_MXC_IOMUX_V3
 	select MXC_AVIC
 
@@ -79,6 +80,7 @@  config SOC_IMX35
 	select HAVE_EPIT
 	select MXC_AVIC
 	select SMP_ON_UP if SMP
+	select HAVE_CAN_FLEXCAN if CAN
 
 config SOC_IMX5
 	select CPU_V7
@@ -105,6 +107,7 @@  config	SOC_IMX53
 	select SOC_IMX5
 	select ARCH_MX5
 	select ARCH_MX53
+	select HAVE_CAN_FLEXCAN if CAN
 
 if ARCH_IMX_V4_V5
 
@@ -826,6 +829,7 @@  config SOC_IMX6Q
 	select COMMON_CLK
 	select CPU_V7
 	select HAVE_ARM_SCU
+	select HAVE_CAN_FLEXCAN if CAN
 	select HAVE_IMX_GPC
 	select HAVE_IMX_MMDC
 	select HAVE_IMX_SRC