On 06/17/2010 09:19 PM, Marc Kleine-Budde wrote:
> Hello Andrey and Sascha,
> 
> Wolfgang Grandegger wrote:
>> On 06/17/2010 04:21 PM, Marc Kleine-Budde wrote:
>>> From: Sascha Hauer <[email protected]>
>>>
>>> This core is found on some Freescale SoCs and also some Coldfire
>>> SoCs. Support for Coldfire is missing though at the moment as
>>> they have an older revision of the core which does not have RX FIFO
>>> support.
>>>
>>> Signed-off-by: Sascha Hauer <[email protected]>
>>> Signed-off-by: Marc Kleine-Budde <[email protected]>
>>> ---
>>>  drivers/net/can/Kconfig              |    6 +
>>>  drivers/net/can/Makefile             |    1 +
>>>  drivers/net/can/flexcan.c            | 1010 
>>> ++++++++++++++++++++++++++++++++++
>>>  include/linux/can/platform/flexcan.h |   20 +
>>>  4 files changed, 1037 insertions(+), 0 deletions(-)
>>>  create mode 100644 drivers/net/can/flexcan.c
>>>  create mode 100644 include/linux/can/platform/flexcan.h
>>>
>>> diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
>>> index 05b7517..3d932a4 100644
>>> --- a/drivers/net/can/Kconfig
>>> +++ b/drivers/net/can/Kconfig
>>> @@ -63,6 +63,12 @@ config CAN_BFIN
>>>       To compile this driver as a module, choose M here: the
>>>       module will be called bfin_can.
>>>  
>>> +config CAN_FLEXCAN
>>> +   tristate "Support for Freescale FLEXCAN based chips"
>>> +   depends on CAN_DEV
>>> +   ---help---
>>> +     Say Y here if you want to support for Freescale FlexCAN.
>>> +
>>>  source "drivers/net/can/mscan/Kconfig"
>>>  
>>>  source "drivers/net/can/sja1000/Kconfig"
>>> diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
>>> index 7a702f2..5bf3621 100644
>>> --- a/drivers/net/can/Makefile
>>> +++ b/drivers/net/can/Makefile
>>> @@ -15,5 +15,6 @@ obj-$(CONFIG_CAN_AT91)            += at91_can.o
>>>  obj-$(CONFIG_CAN_TI_HECC)  += ti_hecc.o
>>>  obj-$(CONFIG_CAN_MCP251X)  += mcp251x.o
>>>  obj-$(CONFIG_CAN_BFIN)             += bfin_can.o
>>> +obj-$(CONFIG_CAN_FLEXCAN)  += flexcan.o
>>>  
>>>  ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
>>> diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
>>> new file mode 100644
>>> index 0000000..f341989
>>> --- /dev/null
>>> +++ b/drivers/net/can/flexcan.c
>>> @@ -0,0 +1,1010 @@
>>> +/*
>>> + * flexcan.c - FLEXCAN CAN controller driver
>>> + *
>>> + * Copyright (c) 2005-2006 Varma Electronics Oy
>>> + * Copyright (c) 2009 Sascha Hauer, Pengutronix
>>> + * Copyright (c) 2010 Marc Kleine-Budde, Pengutronix
>>> + *
>>> + * Based on code originally by Andrey Volkov <[email protected]>
>>> + *
>>> + * LICENCE:
>>> + *  This program is free software; you can redistribute it and/or modify
>>> + *  it under the terms of the GNU General Public License as published by
>>> + *  the Free Software Foundation; either version 2 of the License, or
>>> + *  (at your option) any later version.
>>> + *
>>> + *  This program is distributed in the hope that it will be useful,
>>> + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>> + *  GNU General Public License for more details.
>>> + *
>>> + *  You should have received a copy of the GNU General Public License
>>> + *  along with this program; if not, write to the Free Software
>>> + *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
>>> USA
>>> + *
>>> + */
>> ...
>>> +MODULE_AUTHOR("Sascha Hauer <[email protected]>, "
>>> +         "Marc Kleine-Budde <[email protected]>");
>>> +MODULE_LICENSE("GPL v2");
>>
>> This does not match to the license text above.
> 
> any objections, if we make this driver GPLv2 only?

I personally prefer GPL v2+ but you have the option, I think.

Wolfgang.
_______________________________________________
Socketcan-core mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/socketcan-core

Reply via email to