Re: [PATCH v5 3/5] m68k: m5441x: add flexcan support

[Greg Ungerer <gerg@xxxxxxxxxxxxxx>]

Hi Angelo,

On 21/7/21 4:53 am, Angelo Dureghello wrote:
> Hi Greg,
>
> sorry was away for some vacation time.
>
> Is there still any job required here ?

No :-)
I modified the change as per my suggestions below - so I could push to m68knommu git tree.
(Otherwise It does not compile). See:

https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git/commit/?h=for-next&id=64151620227a2fcb13dae0b99b6a1003edb38c67

Regards
Greg



> On 12/07/21 6:33 AM, Greg Ungerer wrote:
> > Hi Angelo,
> >
> > There is a couple of changes I would like to see here to make this
> > not depend on patch 1/5.
> >
> >
> > On 2/7/21 7:48 pm, Angelo Dureghello wrote:
> > > Add flexcan support.
> > >
> > > Signed-off-by: Angelo Dureghello <angelo@xxxxxxxxxxxxxxxx>
> > > ---
> > > Changes for v2:
> > > - add irq resources for ERR and BOFF interrutps
> > > Changes for v3:
> > > - differentiate device name, for future variants addition
> > > Changes for v4:
> > > - change platform data structure name to flexcan_platform_data
> > > Changes for v5:
> > > none
> > > ---
> > >   arch/m68k/coldfire/device.c       | 42 +++++++++++++++++++++++++++++++
> > >   arch/m68k/coldfire/m5441x.c       |  8 +++---
> > >   arch/m68k/include/asm/m5441xsim.h | 19 ++++++++++++++
> > >   3 files changed, 65 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c
> > > index 59f7dfe50a4d..5f7effbf7c60 100644
> > > --- a/arch/m68k/coldfire/device.c
> > > +++ b/arch/m68k/coldfire/device.c
> > > @@ -23,6 +23,7 @@
> > >   #include <linux/platform_data/edma.h>
> > >   #include <linux/platform_data/dma-mcf-edma.h>
> > >   #include <linux/platform_data/mmc-esdhc-mcf.h>
> > > +#include <linux/can/platform/flexcan.h>
> >
> > Move this to inside the CONFIG_CAN block.
> >
> > >   /*
> > >    *    All current ColdFire parts contain from 2, 3, 4 or 10 UARTS.
> > > @@ -581,6 +582,44 @@ static struct platform_device mcf_esdhc = {
> > >   };
> > >   #endif /* MCFSDHC_BASE */
> > > +#if IS_ENABLED(CONFIG_CAN)
> >
> > Change this to IS_ENABLED(CONFIG_CAN_FLEXCAN).
> >
> > All the other device resource blocks in this file depend on the
> > actual driver being enabled that they apply to. Not the general subsystem
> > (in this case CAN).
> >
> > That way the timing of patches 1, 4 and 5 being applied doesn't matter.
> > There is no way to enable CONFIG_CAN_FLEXCAN until patch 4 is applied.
> > (And you probably should have swapped the order of patches 4 and 5, so that
> > the Kconfig change is the last in the series.)
> >
> > Regards
> > Greg
> >
> >
> >
> > > +static struct flexcan_platform_data mcf5441x_flexcan_info = {
> > > +    .clk_src = 1,
> > > +    .clock_frequency = 120000000,
> > > +};
> > > +
> > > +static struct resource mcf5441x_flexcan0_resource[] = {
> > > +    {
> > > +        .start = MCFFLEXCAN_BASE0,
> > > +        .end = MCFFLEXCAN_BASE0 + MCFFLEXCAN_SIZE,
> > > +        .flags = IORESOURCE_MEM,
> > > +    },
> > > +    {
> > > +        .start = MCF_IRQ_IFL0,
> > > +        .end = MCF_IRQ_IFL0,
> > > +        .flags = IORESOURCE_IRQ,
> > > +    },
> > > +    {
> > > +        .start = MCF_IRQ_BOFF0,
> > > +        .end = MCF_IRQ_BOFF0,
> > > +        .flags = IORESOURCE_IRQ,
> > > +    },
> > > +    {
> > > +        .start = MCF_IRQ_ERR0,
> > > +        .end = MCF_IRQ_ERR0,
> > > +        .flags = IORESOURCE_IRQ,
> > > +    },
> > > +};
> > > +
> > > +static struct platform_device mcf_flexcan0 = {
> > > +    .name = "flexcan-mcf5441x",
> > > +    .id = 0,
> > > +    .num_resources = ARRAY_SIZE(mcf5441x_flexcan0_resource),
> > > +    .resource = mcf5441x_flexcan0_resource,
> > > +    .dev.platform_data = &mcf5441x_flexcan_info,
> > > +};
> > > +#endif /* IS_ENABLED(CONFIG_CAN) */
> > > +
> > >   static struct platform_device *mcf_devices[] __initdata = {
> > >       &mcf_uart,
> > >   #if IS_ENABLED(CONFIG_FEC)
> > > @@ -616,6 +655,9 @@ static struct platform_device *mcf_devices[] __initdata = {
> > >   #ifdef MCFSDHC_BASE
> > >       &mcf_esdhc,
> > >   #endif
> > > +#if IS_ENABLED(CONFIG_CAN)
> > > +    &mcf_flexcan0,
> > > +#endif
> > >   };
> > >   /*
> > > diff --git a/arch/m68k/coldfire/m5441x.c b/arch/m68k/coldfire/m5441x.c
> > > index 1e5259a652d1..18b152edb69c 100644
> > > --- a/arch/m68k/coldfire/m5441x.c
> > > +++ b/arch/m68k/coldfire/m5441x.c
> > > @@ -18,8 +18,8 @@
> > >   #include <asm/mcfclk.h>
> > >   DEFINE_CLK(0, "flexbus", 2, MCF_CLK);
> > > -DEFINE_CLK(0, "mcfcan.0", 8, MCF_CLK);
> > > -DEFINE_CLK(0, "mcfcan.1", 9, MCF_CLK);
> > > +DEFINE_CLK(0, "flexcan.0", 8, MCF_CLK);
> > > +DEFINE_CLK(0, "flexcan.1", 9, MCF_CLK);
> > >   DEFINE_CLK(0, "imx1-i2c.1", 14, MCF_CLK);
> > >   DEFINE_CLK(0, "mcfdspi.1", 15, MCF_CLK);
> > >   DEFINE_CLK(0, "edma", 17, MCF_CLK);
> > > @@ -146,6 +146,8 @@ struct clk *mcf_clks[] = {
> > >   static struct clk * const enable_clks[] __initconst = {
> > >       /* make sure these clocks are enabled */
> > > +    &__clk_0_8, /* flexcan.0 */
> > > +    &__clk_0_9, /* flexcan.1 */
> > >       &__clk_0_15, /* dspi.1 */
> > >       &__clk_0_17, /* eDMA */
> > >       &__clk_0_18, /* intc0 */
> > > @@ -166,8 +168,6 @@ static struct clk * const enable_clks[] __initconst = {
> > >       &__clk_1_37, /* gpio */
> > >   };
> > >   static struct clk * const disable_clks[] __initconst = {
> > > -    &__clk_0_8, /* can.0 */
> > > -    &__clk_0_9, /* can.1 */
> > >       &__clk_0_14, /* i2c.1 */
> > >       &__clk_0_22, /* i2c.0 */
> > >       &__clk_0_23, /* dspi.0 */
> > > diff --git a/arch/m68k/include/asm/m5441xsim.h b/arch/m68k/include/asm/m5441xsim.h
> > > index e091e36d3464..f48cf63bd782 100644
> > > --- a/arch/m68k/include/asm/m5441xsim.h
> > > +++ b/arch/m68k/include/asm/m5441xsim.h
> > > @@ -73,6 +73,12 @@
> > >   #define MCFINT0_FECENTC1    55
> > >   /* on interrupt controller 1 */
> > > +#define MCFINT1_FLEXCAN0_IFL    0
> > > +#define MCFINT1_FLEXCAN0_BOFF    1
> > > +#define MCFINT1_FLEXCAN0_ERR    3
> > > +#define MCFINT1_FLEXCAN1_IFL    4
> > > +#define MCFINT1_FLEXCAN1_BOFF    5
> > > +#define MCFINT1_FLEXCAN1_ERR    7
> > >   #define MCFINT1_UART4        48
> > >   #define MCFINT1_UART5        49
> > >   #define MCFINT1_UART6        50
> > > @@ -314,4 +320,17 @@
> > >   #define MCF_IRQ_SDHC        (MCFINT2_VECBASE + MCFINT2_SDHC)
> > >   #define MCFSDHC_CLK        (MCFSDHC_BASE + 0x2c)
> > > +/*
> > > + * Flexcan module
> > > + */
> > > +#define MCFFLEXCAN_BASE0    0xfc020000
> > > +#define MCFFLEXCAN_BASE1    0xfc024000
> > > +#define MCFFLEXCAN_SIZE        0x4000
> > > +#define MCF_IRQ_IFL0        (MCFINT1_VECBASE + MCFINT1_FLEXCAN0_IFL)
> > > +#define MCF_IRQ_BOFF0        (MCFINT1_VECBASE + MCFINT1_FLEXCAN0_BOFF)
> > > +#define MCF_IRQ_ERR0        (MCFINT1_VECBASE + MCFINT1_FLEXCAN0_ERR)
> > > +#define MCF_IRQ_IFL1        (MCFINT1_VECBASE + MCFINT1_FLEXCAN1_IFL)
> > > +#define MCF_IRQ_BOFF1        (MCFINT1_VECBASE + MCFINT1_FLEXCAN1_BOFF)
> > > +#define MCF_IRQ_ERR1        (MCFINT1_VECBASE + MCFINT1_FLEXCAN1_ERR)
> > > +
> > >   #endif /* m5441xsim_h */
>
> Regards,