On 07/02/2012 04:24 AM, Hui Wang wrote:
> Marc Kleine-Budde wrote:
>> From: Hui Wang <jason77.wang@gmail.com>
>>
>> At least in the i.MX series, the flexcan contrller divides into ver_3
>> and ver_10, current driver is for ver_3 controller.
>>
>> i.MX6 has ver_10 controller, it has more reigsters than ver_3 has.
>> The rxfgmask (Rx FIFO Global Mask) register is one of the new added.
>> Its reset value is 0xffffffff, this means ID Filter Table must be
>> checked when receive a packet, but the driver is designed to accept
>> everything during the chip start, we need to clear this register to
>> follow this design.
>>
>> Use the data entry of the struct of_device_id to point chip specific
>> info, we can set hardware version for each platform.
>>
>> Cc: linux-can@vger.kernel.org
>> Cc: Marc Kleine-Budde <mkl@pengutronix.de>
>> Cc: Wolfgang Grandegger <wg@grandegger.com>
>> Cc: Shawn Guo <shawn.guo@linaro.org>
>> Signed-off-by: Hui Wang <jason77.wang@gmail.com>
>> [mkl: add id_table support]
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>> ---
>> Hui Wang,
>>
>> can you please test if this works for you on mx6.
>>   
> Sorry for reply late.
> 
> This patch works well on the mx6. But i found a minor problem, please
> see below.
>> regards, Marc
>>
>>
>>  drivers/net/can/flexcan.c |   61
>> +++++++++++++++++++++++++++++++++++++++------
>>  1 file changed, 53 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
>>
>>   
> <snip>
>>      }
>>  
>> +    of_id = of_match_device(flexcan_of_match, &pdev->dev);
>> +    if (of_id) {
>> +        devtype_data = of_id->data;
>> +    } else if (pdev->id_entry->driver_data) {
>> +        devtype_data = (struct flexcan_devtype_data *)
>> +            pdev->id_entry->driver_data;
>> +    } else {
>> +        err = -ENODEV;
>> +        goto failed_devtype;
>> +    }
>> +
>>      dev->netdev_ops = &flexcan_netdev_ops;
>>      dev->irq = irq;
>>      dev->flags |= IFF_ECHO;
>>  
>>      priv = netdev_priv(dev);
>> +    priv->devtype_data = devtype_data;
>>      priv->can.clock.freq = clock_freq;
>>      priv->can.bittiming_const = &flexcan_bittiming_const;
>>      priv->can.do_set_mode = flexcan_set_mode;
>> @@ -993,6 +1042,7 @@ static int __devinit flexcan_probe(struct
>> platform_device *pdev)
>>      priv->dev = dev;
>>      priv->clk = clk;
>>      priv->pdata = pdev->dev.platform_data;
>> +    priv->devtype_data = devtype_data;
>>   
> Two priv->devtype_data = devtype_data; ?
> 
> It seems one of them is redundant and is not needed.

Thanks,
Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |