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

login
register
mail settings
Submitter Marc Kleine-Budde
Date July 2, 2012, 9:03 a.m.
Message ID <1341219781-26107-2-git-send-email-mkl@pengutronix.de>
Download mbox | patch
Permalink /patch/168519/
State New
Headers show

Comments

Marc Kleine-Budde - July 2, 2012, 9:03 a.m.
Aas the flexcan driver has DT binding for some time now. This patch makes
the flexcan driver available in the can drivers menu if a SOC with flexcan
is enabled.

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, 9:33 a.m.
Shawn,

In case you want to apply this one:

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Sascha

On Mon, Jul 02, 2012 at 11:03:00AM +0200, Marc Kleine-Budde wrote:
> Aas the flexcan driver has DT binding for some time now. This patch makes
> the flexcan driver available in the can drivers menu if a SOC with flexcan
> is enabled.
> 
> 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
>  	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
> -- 
> 1.7.10
> 
>
Shawn Guo - July 3, 2012, 2:36 a.m.
On Mon, Jul 02, 2012 at 11:03:00AM +0200, Marc Kleine-Budde wrote:
> Aas the flexcan driver has DT binding for some time now. This patch makes
> the flexcan driver available in the can drivers menu if a SOC with flexcan
> is enabled.
> 
> Cc: Sascha Hauer <sha@pengutronix.de>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Applied with subject prefix changed to "ARM: imx: ..."

Regards,
Shawn

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