| Message ID | 1341219781-26107-2-git-send-email-mkl@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 > >
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
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
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(+)