Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next 



Marc Kleine-Budde says:

====================
this is pull request is for net-next. Contains a patch by Andreas
Larsson, which enables the sja1000 of driver to work under sparc.
AnilKumar Ch contributed a patch to improve the c_can support under
omap, Olivier Sobrie's patch brings support for the CAN/USB dongles
from Kvaser. In a bunch of patches by me missing MODULE_ALIAS and/or
MODULE_DEVICE_TABLE entries were added to the CAN drivers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4e591b93 fc8f40b1

drivers/net/can/at91_can.c

+1 −0
Original line number Diff line number Diff line
@@ -1372,6 +1372,7 @@ static const struct platform_device_id at91_can_id_table[] = { 
		/* sentinel */

	}

};

MODULE_DEVICE_TABLE(platform, at91_can_id_table);



static struct platform_driver at91_can_driver = {

	.probe = at91_can_probe,

drivers/net/can/bfin_can.c

+1 −0
Original line number Diff line number Diff line
@@ -691,3 +691,4 @@ module_platform_driver(bfin_can_driver); 
MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Blackfin on-chip CAN netdevice driver");

MODULE_ALIAS("platform:" DRV_NAME);

drivers/net/can/c_can/c_can.c

+12 −0
Original line number Diff line number Diff line
@@ -233,6 +233,12 @@ static inline void c_can_pm_runtime_put_sync(const struct c_can_priv *priv) 
		pm_runtime_put_sync(priv->device);

}



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

{

	if (priv->raminit)

		priv->raminit(priv, enable);

}



static inline int get_tx_next_msg_obj(const struct c_can_priv *priv)

{

	return (priv->tx_next & C_CAN_NEXT_MSG_OBJ_MASK) +
@@ -1090,6 +1096,7 @@ static int c_can_open(struct net_device *dev) 
	struct c_can_priv *priv = netdev_priv(dev);



	c_can_pm_runtime_get_sync(priv);

	c_can_reset_ram(priv, true);



	/* open the can device */

	err = open_candev(dev);
@@ -1118,6 +1125,7 @@ static int c_can_open(struct net_device *dev) 
exit_irq_fail:

	close_candev(dev);

exit_open_fail:

	c_can_reset_ram(priv, false);

	c_can_pm_runtime_put_sync(priv);

	return err;

}
@@ -1131,6 +1139,8 @@ static int c_can_close(struct net_device *dev) 
	c_can_stop(dev);

	free_irq(dev->irq, dev);

	close_candev(dev);



	c_can_reset_ram(priv, false);

	c_can_pm_runtime_put_sync(priv);



	return 0;
@@ -1188,6 +1198,7 @@ int c_can_power_down(struct net_device *dev) 


	c_can_stop(dev);



	c_can_reset_ram(priv, false);

	c_can_pm_runtime_put_sync(priv);



	return 0;
@@ -1206,6 +1217,7 @@ int c_can_power_up(struct net_device *dev) 
	WARN_ON(priv->type != BOSCH_D_CAN);



	c_can_pm_runtime_get_sync(priv);

	c_can_reset_ram(priv, true);



	/* Clear PDR and INIT bits */

	val = priv->read_reg(priv, C_CAN_CTRL_EX_REG);

drivers/net/can/c_can/c_can.h

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,9 @@ struct c_can_priv { 
	void *priv;		/* for board-specific data */

	u16 irqstatus;

	enum c_can_dev_id type;

	u32 __iomem *raminit_ctrlreg;

	unsigned int instance;

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

};



struct net_device *alloc_c_can_dev(void);

drivers/net/can/c_can/c_can_platform.c

+29 −1
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 


#include "c_can.h"



#define CAN_RAMINIT_START_MASK(i)	(1 << (i))



/*

 * 16-bit c_can registers can be arranged differently in the memory

 * architecture of different implementations. For example: 16-bit
@@ -68,6 +70,18 @@ static void c_can_plat_write_reg_aligned_to_32bit(struct c_can_priv *priv, 
	writew(val, priv->base + 2 * priv->regs[index]);

}



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

{

	u32 val;



	val = readl(priv->raminit_ctrlreg);

	if (enable)

		val |= CAN_RAMINIT_START_MASK(priv->instance);

	else

		val &= ~CAN_RAMINIT_START_MASK(priv->instance);

	writel(val, priv->raminit_ctrlreg);

}



static struct platform_device_id c_can_id_table[] = {

	[BOSCH_C_CAN_PLATFORM] = {

		.name = KBUILD_MODNAME,
@@ -83,12 +97,14 @@ static struct platform_device_id c_can_id_table[] = { 
	}, {

	}

};

MODULE_DEVICE_TABLE(platform, c_can_id_table);



static const struct of_device_id c_can_of_table[] = {

	{ .compatible = "bosch,c_can", .data = &c_can_id_table[BOSCH_C_CAN] },

	{ .compatible = "bosch,d_can", .data = &c_can_id_table[BOSCH_D_CAN] },

	{ /* sentinel */ },

};

MODULE_DEVICE_TABLE(of, c_can_of_table);



static int __devinit c_can_plat_probe(struct platform_device *pdev)

{
@@ -99,7 +115,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 
	const struct of_device_id *match;

	const struct platform_device_id *id;

	struct pinctrl *pinctrl;

	struct resource *mem;

	struct resource *mem, *res;

	int irq;

	struct clk *clk;
@@ -178,6 +194,18 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 
		priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;

		priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;

		priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;



		if (pdev->dev.of_node)

			priv->instance = of_alias_get_id(pdev->dev.of_node, "d_can");

		else

			priv->instance = pdev->id;



		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

		priv->raminit_ctrlreg =	devm_request_and_ioremap(&pdev->dev, res);

		if (!priv->raminit_ctrlreg || priv->instance < 0)

			dev_info(&pdev->dev, "control memory is not used for raminit\n");

		else

			priv->raminit = c_can_hw_raminit;

		break;

	default:

		ret = -EINVAL;