Commit 98a20b73 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-3.16-20140425' of git://gitorious.org/linux-can/linux-can-next 



Marc Kleine-Budde says:

====================
this is a pull request of 10 patches for net-next/master.

It consists of three patches by Alexander Shiyan, which improve the
mcp251x driver. Stefano Babic's patch move the SPI driver into a sub
folder. The three patches by Olivier Sobrie add support for the Kvaser
Leaf v2 and usb mini PCIe hardware to the existing driver. Alexander
Stein contributes eg20t support to the c_can pci driver. Together with
the patches on the net-tree, we'll be able to remove the pch_can driver
soon. Kurt Van Dijck's two patches clean up the sysfs attributes of the
softing driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 16b46306 0f8dced5

drivers/net/can/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -77,12 +77,6 @@ config CAN_TI_HECC 
	  Driver for TI HECC (High End CAN Controller) module found on many

	  TI devices. The device specifications are available from www.ti.com



config CAN_MCP251X

	tristate "Microchip MCP251x SPI CAN controllers"

	depends on SPI && HAS_DMA

	---help---

	  Driver for the Microchip MCP251x SPI CAN controllers.



config CAN_BFIN

	depends on BF534 || BF536 || BF537 || BF538 || BF539 || BF54x

	tristate "Analog Devices Blackfin on-chip CAN"
@@ -133,6 +127,8 @@ source "drivers/net/can/c_can/Kconfig" 


source "drivers/net/can/cc770/Kconfig"



source "drivers/net/can/spi/Kconfig"



source "drivers/net/can/usb/Kconfig"



source "drivers/net/can/softing/Kconfig"

drivers/net/can/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ can-dev-y := dev.o 


can-dev-$(CONFIG_CAN_LEDS)	+= led.o



obj-y				+= spi/

obj-y				+= usb/

obj-y				+= softing/
@@ -19,7 +20,6 @@ obj-$(CONFIG_CAN_C_CAN) += c_can/ 
obj-$(CONFIG_CAN_CC770)		+= cc770/

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_JANZ_ICAN3)	+= janz-ican3.o

obj-$(CONFIG_CAN_FLEXCAN)	+= flexcan.o

drivers/net/can/c_can/c_can_pci.c

+50 −1
Original line number Diff line number Diff line
@@ -19,9 +19,13 @@ 


#include "c_can.h"



#define PCI_DEVICE_ID_PCH_CAN	0x8818

#define PCH_PCI_SOFT_RESET	0x01fc



enum c_can_pci_reg_align {

	C_CAN_REG_ALIGN_16,

	C_CAN_REG_ALIGN_32,

	C_CAN_REG_32,

};



struct c_can_pci_data {
@@ -31,6 +35,10 @@ struct c_can_pci_data { 
	enum c_can_pci_reg_align reg_align;

	/* Set the frequency */

	unsigned int freq;

	/* PCI bar number */

	int bar;

	/* Callback for reset */

	void (*init)(const struct c_can_priv *priv, bool enable);

};



/*
@@ -63,6 +71,29 @@ static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv, 
	writew(val, priv->base + 2 * priv->regs[index]);

}



static u16 c_can_pci_read_reg_32bit(struct c_can_priv *priv,

				    enum reg index)

{

	return (u16)ioread32(priv->base + 2 * priv->regs[index]);

}



static void c_can_pci_write_reg_32bit(struct c_can_priv *priv,

				      enum reg index, u16 val)

{

	iowrite32((u32)val, priv->base + 2 * priv->regs[index]);

}



static void c_can_pci_reset_pch(const struct c_can_priv *priv, bool enable)

{

	if (enable) {

		u32 __iomem *addr = priv->base + PCH_PCI_SOFT_RESET;



		/* write to sw reset register */

		iowrite32(1, addr);

		iowrite32(0, addr);

	}

}



static int c_can_pci_probe(struct pci_dev *pdev,

			   const struct pci_device_id *ent)

{
@@ -87,7 +118,8 @@ static int c_can_pci_probe(struct pci_dev *pdev, 
	pci_set_master(pdev);

	pci_enable_msi(pdev);



	addr = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));

	addr = pci_iomap(pdev, c_can_pci_data->bar,

			 pci_resource_len(pdev, c_can_pci_data->bar));

	if (!addr) {

		dev_err(&pdev->dev,

			"device has no PCI memory resources, "
@@ -142,11 +174,17 @@ static int c_can_pci_probe(struct pci_dev *pdev, 
		priv->read_reg = c_can_pci_read_reg_aligned_to_16bit;

		priv->write_reg = c_can_pci_write_reg_aligned_to_16bit;

		break;

	case C_CAN_REG_32:

		priv->read_reg = c_can_pci_read_reg_32bit;

		priv->write_reg = c_can_pci_write_reg_32bit;

		break;

	default:

		ret = -EINVAL;

		goto out_free_c_can;

	}



	priv->raminit = c_can_pci_data->init;



	ret = register_c_can_dev(dev);

	if (ret) {

		dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
@@ -193,6 +231,15 @@ static struct c_can_pci_data c_can_sta2x11= { 
	.type = BOSCH_C_CAN,

	.reg_align = C_CAN_REG_ALIGN_32,

	.freq = 52000000, /* 52 Mhz */

	.bar = 0,

};



static struct c_can_pci_data c_can_pch = {

	.type = BOSCH_C_CAN,

	.reg_align = C_CAN_REG_32,

	.freq = 50000000, /* 50 MHz */

	.init = c_can_pci_reset_pch,

	.bar = 1,

};



#define C_CAN_ID(_vend, _dev, _driverdata) {		\
@@ -202,6 +249,8 @@ static struct c_can_pci_data c_can_sta2x11= { 
static DEFINE_PCI_DEVICE_TABLE(c_can_pci_tbl) = {

	C_CAN_ID(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_CAN,

		 c_can_sta2x11),

	C_CAN_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PCH_CAN,

		 c_can_pch),

	{},

};

static struct pci_driver c_can_pci_driver = {

drivers/net/can/softing/softing_main.c

+4 −16
Original line number Diff line number Diff line
@@ -556,15 +556,6 @@ failed: 
/*

 * netdev sysfs

 */

static ssize_t show_channel(struct device *dev, struct device_attribute *attr,

		char *buf)

{

	struct net_device *ndev = to_net_dev(dev);

	struct softing_priv *priv = netdev2softing(ndev);



	return sprintf(buf, "%i\n", priv->index);

}



static ssize_t show_chip(struct device *dev, struct device_attribute *attr,

		char *buf)

{
@@ -609,12 +600,10 @@ static ssize_t store_output(struct device *dev, struct device_attribute *attr, 
	return count;

}



static const DEVICE_ATTR(channel, S_IRUGO, show_channel, NULL);

static const DEVICE_ATTR(chip, S_IRUGO, show_chip, NULL);

static const DEVICE_ATTR(output, S_IRUGO | S_IWUSR, show_output, store_output);



static const struct attribute *const netdev_sysfs_attrs[] = {

	&dev_attr_channel.attr,

	&dev_attr_chip.attr,

	&dev_attr_output.attr,

	NULL,
@@ -679,17 +668,20 @@ static int softing_netdev_register(struct net_device *netdev) 
{

	int ret;



	netdev->sysfs_groups[0] = &netdev_sysfs_group;

	ret = register_candev(netdev);

	if (ret) {

		dev_alert(&netdev->dev, "register failed\n");

		return ret;

	}

	if (sysfs_create_group(&netdev->dev.kobj, &netdev_sysfs_group) < 0)

		netdev_alert(netdev, "sysfs group failed\n");



	return 0;

}



static void softing_netdev_cleanup(struct net_device *netdev)

{

	sysfs_remove_group(&netdev->dev.kobj, &netdev_sysfs_group);

	unregister_candev(netdev);

	free_candev(netdev);

}
@@ -721,8 +713,6 @@ DEV_ATTR_RO(firmware_version, id.fw_version); 
DEV_ATTR_RO_STR(hardware, pdat->name);

DEV_ATTR_RO(hardware_version, id.hw_version);

DEV_ATTR_RO(license, id.license);

DEV_ATTR_RO(frequency, id.freq);

DEV_ATTR_RO(txpending, tx.pending);



static struct attribute *softing_pdev_attrs[] = {

	&dev_attr_serial.attr,
@@ -731,8 +721,6 @@ static struct attribute *softing_pdev_attrs[] = { 
	&dev_attr_hardware.attr,

	&dev_attr_hardware_version.attr,

	&dev_attr_license.attr,

	&dev_attr_frequency.attr,

	&dev_attr_txpending.attr,

	NULL,

};

drivers/net/can/spi/Kconfig

0 → 100644
+10 −0
Original line number Diff line number Diff line 
menu "CAN SPI interfaces"

	depends on SPI



config CAN_MCP251X

	tristate "Microchip MCP251x SPI CAN controllers"

	depends on HAS_DMA

	---help---

	  Driver for the Microchip MCP251x SPI CAN controllers.



endmenu

CRA Git | Maintained and supported by SUSTech CRA and CCSE