[PATCH] can/sja1000: Add miniPCIe/cPCI PC/104Plus PCI/104e PEAK-System boards

[PATCH] can/sja1000: Add miniPCIe/cPCI PC/104Plus PCI/104e PEAK-System boards

[Stephane Grosjean]

This patch adds the support for 4 new PCI boards based on the SJA1000 CAN
controller, from PEAK-System Technik:

. PCAN-miniPCIe (PCI-Express Mini slots, available as single or dual-channel)
. PCAN-cPCI (CompactPCI format, available as single or dual-channel)
. PCAN-PC/104-Plus (PC/104-Plus system, av. as 1, 2 or 4 channels)
. PCAN-PCI/104-Express (PCI/104-Express system, av. as 1 or 2 channels)

This patch also fixes a typo in existing "PEAK_MPCI_DEVICE_ID" identifier
(missing "E" for Express). Finally, it also adds another author as well as it
updates the module supported devices list.

Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
---
 drivers/net/can/sja1000/peak_pci.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index f0a1296..15a302e 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -31,8 +31,10 @@
 #include "sja1000.h"
 
 MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>");
+MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
 MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI family cards");
 MODULE_SUPPORTED_DEVICE("PEAK PCAN PCI/PCIe/PCIeC miniPCI CAN cards");
+MODULE_SUPPORTED_DEVICE("PEAK PCAN miniPCIe/cPCI PC/104+ PCI/104e CAN Cards");
 MODULE_LICENSE("GPL v2");
 
 #define DRV_NAME  "peak_pci"
@@ -64,7 +66,11 @@ struct peak_pci_chan {
 #define PEAK_PCI_DEVICE_ID	0x0001	/* for PCI/PCIe slot cards */
 #define PEAK_PCIEC_DEVICE_ID	0x0002	/* for ExpressCard slot cards */
 #define PEAK_PCIE_DEVICE_ID	0x0003	/* for nextgen PCIe slot cards */
-#define PEAK_MPCI_DEVICE_ID	0x0008	/* The miniPCI slot cards */
+#define PEAK_CPCI_DEVICE_ID	0x0004	/* for nextgen cPCI slot cards */
+#define PEAK_MPCI_DEVICE_ID	0x0005	/* for nextgen miniPCI slot cards */
+#define PEAK_PC_104P_DEVICE_ID	0x0006	/* PCAN-PC/104+ cards */
+#define PEAK_PCI_104E_DEVICE_ID	0x0007	/* PCAN-PCI/104 Express cards */
+#define PEAK_MPCIE_DEVICE_ID	0x0008	/* The miniPCIe slot cards */
 
 #define PEAK_PCI_CHAN_MAX	4
 
@@ -76,6 +82,10 @@ static DEFINE_PCI_DEVICE_TABLE(peak_pci_tbl) = {
 	{PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
 	{PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
 	{PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_MPCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
 #ifdef CONFIG_CAN_PEAK_PCIEC
 	{PEAK_PCI_VENDOR_ID, PEAK_PCIEC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
 #endif
-- 
1.7.5.4

Re: [PATCH] can/sja1000: Add miniPCIe/cPCI PC/104Plus PCI/104e PEAK-System boards

[Oliver Hartkopp]

Hi Stephane,

nice to see things are going on :-)

Btw. Marc and Wolfgang mainly should be addressed for this driver.

Maybe Marc should 'tune' the commit message to

can/peak_pci: Add/fix PCI IDs for miniPCIe/cPCI PC/104Plus PCI/104e cards

which hits the point and will generate no remarks - even if it goes into the
netdev tree in the 3.7-rc phase.

Anyway you can get a

Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>

:-)

Tnx,
Oliver

On 23.10.2012 12:37, Stephane Grosjean wrote:

> This patch adds the support for 4 new PCI boards based on the SJA1000 CAN
> controller, from PEAK-System Technik:
> 
> . PCAN-miniPCIe (PCI-Express Mini slots, available as single or dual-channel)
> . PCAN-cPCI (CompactPCI format, available as single or dual-channel)
> . PCAN-PC/104-Plus (PC/104-Plus system, av. as 1, 2 or 4 channels)
> . PCAN-PCI/104-Express (PCI/104-Express system, av. as 1 or 2 channels)
> 
> This patch also fixes a typo in existing "PEAK_MPCI_DEVICE_ID" identifier
> (missing "E" for Express). Finally, it also adds another author as well as it
> updates the module supported devices list.
> 
> Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
> ---

Re: [PATCH] can/sja1000: Add miniPCIe/cPCI PC/104Plus PCI/104e PEAK-System boards

[Wolfgang Grandegger]

Hi Stephane,

On 10/23/2012 12:37 PM, Stephane Grosjean wrote:
> This patch adds the support for 4 new PCI boards based on the SJA1000 CAN
> controller, from PEAK-System Technik:
> 
> . PCAN-miniPCIe (PCI-Express Mini slots, available as single or dual-channel)
> . PCAN-cPCI (CompactPCI format, available as single or dual-channel)
> . PCAN-PC/104-Plus (PC/104-Plus system, av. as 1, 2 or 4 channels)
> . PCAN-PCI/104-Express (PCI/104-Express system, av. as 1 or 2 channels)
> 
> This patch also fixes a typo in existing "PEAK_MPCI_DEVICE_ID" identifier
> (missing "E" for Express). Finally, it also adds another author as well as it
> updates the module supported devices list.
> 
> Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
> ---
>  drivers/net/can/sja1000/peak_pci.c |   12 +++++++++++-
>  1 files changed, 11 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
> index f0a1296..15a302e 100644
> --- a/drivers/net/can/sja1000/peak_pci.c
> +++ b/drivers/net/can/sja1000/peak_pci.c
> @@ -31,8 +31,10 @@
>  #include "sja1000.h"
>  
>  MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>");
> +MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");

Hm, does adding a second MODULE_AUTHOR work? Anyway, feel free to remove
my line.

>  MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI family cards");
>  MODULE_SUPPORTED_DEVICE("PEAK PCAN PCI/PCIe/PCIeC miniPCI CAN cards");
> +MODULE_SUPPORTED_DEVICE("PEAK PCAN miniPCIe/cPCI PC/104+ PCI/104e CAN Cards");
>  MODULE_LICENSE("GPL v2");
>  
>  #define DRV_NAME  "peak_pci"
> @@ -64,7 +66,11 @@ struct peak_pci_chan {
>  #define PEAK_PCI_DEVICE_ID	0x0001	/* for PCI/PCIe slot cards */
>  #define PEAK_PCIEC_DEVICE_ID	0x0002	/* for ExpressCard slot cards */
>  #define PEAK_PCIE_DEVICE_ID	0x0003	/* for nextgen PCIe slot cards */
> -#define PEAK_MPCI_DEVICE_ID	0x0008	/* The miniPCI slot cards */
> +#define PEAK_CPCI_DEVICE_ID	0x0004	/* for nextgen cPCI slot cards */
> +#define PEAK_MPCI_DEVICE_ID	0x0005	/* for nextgen miniPCI slot cards */
> +#define PEAK_PC_104P_DEVICE_ID	0x0006	/* PCAN-PC/104+ cards */
> +#define PEAK_PCI_104E_DEVICE_ID	0x0007	/* PCAN-PCI/104 Express cards */
> +#define PEAK_MPCIE_DEVICE_ID	0x0008	/* The miniPCIe slot cards */
>  
>  #define PEAK_PCI_CHAN_MAX	4
>  
> @@ -76,6 +82,10 @@ static DEFINE_PCI_DEVICE_TABLE(peak_pci_tbl) = {
>  	{PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
>  	{PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
>  	{PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
> +	{PEAK_PCI_VENDOR_ID, PEAK_MPCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
> +	{PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
> +	{PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
> +	{PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
>  #ifdef CONFIG_CAN_PEAK_PCIEC
>  	{PEAK_PCI_VENDOR_ID, PEAK_PCIEC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
>  #endif

Acked-by: Wolfgang Grandegger <wg@grandegger.com>

Thanks,

Wolfgang.

Re: [PATCH] can/sja1000: Add miniPCIe/cPCI PC/104Plus PCI/104e PEAK-System boards

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 2478 bytes --]

On 10/26/2012 10:01 AM, Stephane Grosjean wrote:
> Hi Wolfgang,
> Hi everybody,

> Well the "push PATCH" method is bit too formal, it should exist a field
> where to say "Hello guys, how are you since last time ? Sorry to disturb
> you again, but I'd like to push..." ;-)

:D

If you want to add some prose text to the patch, that should not go into
the commit message you simply add it between the "---" and the diffstat:

> Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
> ---

...here...

>  drivers/net/can/sja1000/peak_pci.c |   12 +++++++++++-
>  1 files changed, 11 insertions(+), 1 deletions(-)


> Le 24/10/2012 08:29, Wolfgang Grandegger a écrit :
>> Hi Stephane,
>>
>> On 10/23/2012 12:37 PM, Stephane Grosjean wrote:
>>     MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>");
>> +MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
>> Hm, does adding a second MODULE_AUTHOR work? Anyway, feel free to remove
>> my line.
> 
> Yes it does:
> 
> $ modinfo peak_pci.ko
> filename:       peak_pci.ko
> license:        GPL v2
> description:    Socket-CAN driver for PEAK PCAN PCI family cards
> author:         Stephane Grosjean <s.grosjean@peak-system.com>
> author:         Wolfgang Grandegger <wg@grandegger.com>
> srcversion:     72C217A41A3CA4ABBFEAFDB
> alias:          pci:v0000001Cd00000002sv*sd*bc*sc*i*
> alias:          pci:v0000001Cd00000004sv*sd*bc*sc*i*
> alias:          pci:v0000001Cd00000007sv*sd*bc*sc*i*
> alias:          pci:v0000001Cd00000006sv*sd*bc*sc*i*
> alias:          pci:v0000001Cd00000008sv*sd*bc*sc*i*
> alias:          pci:v0000001Cd00000005sv*sd*bc*sc*i*
> alias:          pci:v0000001Cd00000003sv*sd*bc*sc*i*
> alias:          pci:v0000001Cd00000001sv*sd*bc*sc*i*
> depends:        sja1000,i2c-algo-bit
> vermagic:       3.0.0-14-generic-pae SMP mod_unload modversions 686
> 
> (well, don't ask me why my name comes before yours ;-) Maybe the
> alphabetic order is used instead of the declaration order...)
> 
> So, for me there is no need (and I don't want) to remove yours.

I've replaced you as the author and the patch is already in David
Millers net tree.

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   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: [PATCH] can/sja1000: Add miniPCIe/cPCI PC/104Plus PCI/104e PEAK-System boards

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1131 bytes --]

On 10/23/2012 12:37 PM, Stephane Grosjean wrote:
> This patch adds the support for 4 new PCI boards based on the SJA1000 CAN
> controller, from PEAK-System Technik:
> 
> . PCAN-miniPCIe (PCI-Express Mini slots, available as single or dual-channel)
> . PCAN-cPCI (CompactPCI format, available as single or dual-channel)
> . PCAN-PC/104-Plus (PC/104-Plus system, av. as 1, 2 or 4 channels)
> . PCAN-PCI/104-Express (PCI/104-Express system, av. as 1 or 2 channels)
> 
> This patch also fixes a typo in existing "PEAK_MPCI_DEVICE_ID" identifier
> (missing "E" for Express). Finally, it also adds another author as well as it
> updates the module supported devices list.

Thanks. I've taken the patch, tuned the commit message as Oliver pointed
out, changed the Author as Wolfgang suggested and updated the commit
message accordingly.

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   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]