Re: [PATCH 1/2] can/peak_pci: add support of some new PEAK-System PCI cards

[Marc Kleine-Budde <mkl@pengutronix.de>]

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

On 02/27/2012 04:52 PM, Stephane Grosjean wrote:
> This patch adds the support of some new PEAK-System PCI cards in the CAN
> network sub-system. These are:
> 
> PCAN-PCIeC (PCI-ExpressCard)
> PCAN-mminiPCI (mini-PCI)
> PCAN-PCI (PCI next-gen)
> 
> This patch also adds the control of the blinking leds of the PCAN-PCIeC.
> 
> Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
> Acked-by: Wolfgang Grandegger <wg@grandegger.com>
> Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
> ---
>  Note: that patch contains modifications tested and approved in
>        peak_pci v6.1 but also includes Kconfig and Makefile modifications
>        from peak_pcmcia v4.1
> 
>  drivers/net/can/sja1000/Kconfig    |   27 ++-
>  drivers/net/can/sja1000/Makefile   |    1 +
>  drivers/net/can/sja1000/peak_pci.c |  505 +++++++++++++++++++++++++++++++++++-
>  3 files changed, 516 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
> index b21523d..b60d6c5 100644
> --- a/drivers/net/can/sja1000/Kconfig
> +++ b/drivers/net/can/sja1000/Kconfig
> @@ -43,12 +43,33 @@ config CAN_EMS_PCI
>  	  CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
>  	  (http://www.ems-wuensche.de).
>  
> +config CAN_PEAK_PCMCIA
> +	tristate "PEAK PCAN-PC Card"
> +	depends on PCMCIA
> +	---help---
> +	  This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels)
> +	  from PEAK-System (http://www.peak-system.com). To compile this
> +	  driver as a module, choose M here: the module will be called
> +	  peak_pcmcia.
> +
>  config CAN_PEAK_PCI
> -	tristate "PEAK PCAN PCI/PCIe Cards"
> +	tristate "PEAK PCAN-PCI/PCIe/miniPCI Cards"
>  	depends on PCI
>  	---help---
> -	  This driver is for the PCAN PCI/PCIe cards (1, 2, 3 or 4 channels)
> -	  from PEAK Systems (http://www.peak-system.com).
> +	  This driver is for the PCAN-PCI/PCIe/miniPCI cards
> +	  (1, 2, 3 or 4 channels) from PEAK-System Technik
> +	  (http://www.peak-system.com).
> +
> +config CAN_PEAK_PCIEC
> +	bool "PEAK PCAN-ExpressCard Cards"
> +	depends on CAN_PEAK_PCI
> +	select I2C
> +	select I2C_ALGOBIT
> +	default y
> +	---help---
> +	  Say Y here if you want to use a PCAN-ExpressCard from PEAK-System
> +	  Technik. This will also automatically select I2C and I2C_ALGO
> +	  configuration options.
>  
>  config CAN_KVASER_PCI
>  	tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
> diff --git a/drivers/net/can/sja1000/Makefile b/drivers/net/can/sja1000/Makefile
> index 0604f24..b3d05cb 100644
> --- a/drivers/net/can/sja1000/Makefile
> +++ b/drivers/net/can/sja1000/Makefile
> @@ -9,6 +9,7 @@ obj-$(CONFIG_CAN_SJA1000_OF_PLATFORM) += sja1000_of_platform.o
>  obj-$(CONFIG_CAN_EMS_PCMCIA) += ems_pcmcia.o
>  obj-$(CONFIG_CAN_EMS_PCI) += ems_pci.o
>  obj-$(CONFIG_CAN_KVASER_PCI) += kvaser_pci.o
> +obj-$(CONFIG_CAN_PEAK_PCMCIA) += peak_pcmcia.o
>  obj-$(CONFIG_CAN_PEAK_PCI) += peak_pci.o
>  obj-$(CONFIG_CAN_PLX_PCI) += plx_pci.o
>  obj-$(CONFIG_CAN_TSCAN1) += tscan1.o

Sorry, that series is not bisectable. At least if you switch on the
CONFIG_CAN_PEAK_PCMCIA option.

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: 262 bytes --]