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

Commit 816dc3c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-2630-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux 

* 'i2c-for-2630-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-cpm: Pass dev ptr to dma_*_coherent rather than NULL
  i2c: Enable i2c-s3c2410 for S3C64XX too
  i2c-mpc: bug fix for MPC52xx clock setting and printout
  i2c-pxa.c: timeouts off by 1
parents 3b4334e2 36521c27

drivers/i2c/busses/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ config I2C_PXA_SLAVE 


config I2C_S3C2410

	tristate "S3C2410 I2C Driver"

	depends on ARCH_S3C2410

	depends on ARCH_S3C2410 || ARCH_S3C64XX

	help

	  Say Y here to include support for I2C controller in the

	  Samsung S3C2410 based System-on-Chip devices.

drivers/i2c/busses/i2c-cpm.c

+8 −8
Original line number Diff line number Diff line
@@ -531,16 +531,16 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) 
	rbdf = cpm->rbase;



	for (i = 0; i < CPM_MAXBD; i++) {

		cpm->rxbuf[i] = dma_alloc_coherent(

			NULL, CPM_MAX_READ + 1, &cpm->rxdma[i], GFP_KERNEL);

		cpm->rxbuf[i] = dma_alloc_coherent(&cpm->ofdev->dev,

						   CPM_MAX_READ + 1,

						   &cpm->rxdma[i], GFP_KERNEL);

		if (!cpm->rxbuf[i]) {

			ret = -ENOMEM;

			goto out_muram;

		}

		out_be32(&rbdf[i].cbd_bufaddr, ((cpm->rxdma[i] + 1) & ~1));



		cpm->txbuf[i] = (unsigned char *)dma_alloc_coherent(

			NULL, CPM_MAX_READ + 1, &cpm->txdma[i], GFP_KERNEL);

		cpm->txbuf[i] = (unsigned char *)dma_alloc_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, &cpm->txdma[i], GFP_KERNEL);

		if (!cpm->txbuf[i]) {

			ret = -ENOMEM;

			goto out_muram;
@@ -585,10 +585,10 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) 
out_muram:

	for (i = 0; i < CPM_MAXBD; i++) {

		if (cpm->rxbuf[i])

			dma_free_coherent(NULL, CPM_MAX_READ + 1,

			dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1,

				cpm->rxbuf[i], cpm->rxdma[i]);

		if (cpm->txbuf[i])

			dma_free_coherent(NULL, CPM_MAX_READ + 1,

			dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1,

				cpm->txbuf[i], cpm->txdma[i]);

	}

	cpm_muram_free(cpm->dp_addr);
@@ -619,9 +619,9 @@ static void cpm_i2c_shutdown(struct cpm_i2c *cpm) 


	/* Free all memory */

	for (i = 0; i < CPM_MAXBD; i++) {

		dma_free_coherent(NULL, CPM_MAX_READ + 1,

		dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1,

			cpm->rxbuf[i], cpm->rxdma[i]);

		dma_free_coherent(NULL, CPM_MAX_READ + 1,

		dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1,

			cpm->txbuf[i], cpm->txdma[i]);

	}

drivers/i2c/busses/i2c-mpc.c

+20 −14
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) 
	return 0;

}



#ifdef CONFIG_PPC_52xx

#ifdef CONFIG_PPC_MPC52xx

static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = {

	{20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23},

	{28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02},
@@ -188,7 +188,7 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = { 


int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler)

{

	const struct mpc52xx_i2c_divider *div = NULL;

	const struct mpc_i2c_divider *div = NULL;

	unsigned int pvr = mfspr(SPRN_PVR);

	u32 divider;

	int i;
@@ -203,7 +203,7 @@ int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler) 
	 * We want to choose an FDR/DFSR that generates an I2C bus speed that

	 * is equal to or lower than the requested speed.

	 */

	for (i = 0; i < ARRAY_SIZE(mpc52xx_i2c_dividers); i++) {

	for (i = 0; i < ARRAY_SIZE(mpc_i2c_dividers_52xx); i++) {

		div = &mpc_i2c_dividers_52xx[i];

		/* Old MPC5200 rev A CPUs do not support the high bits */

		if (div->fdr & 0xc0 && pvr == 0x80822011)
@@ -219,20 +219,23 @@ static void mpc_i2c_setclock_52xx(struct device_node *node, 
				  struct mpc_i2c *i2c,

				  u32 clock, u32 prescaler)

{

	int fdr = mpc52xx_i2c_get_fdr(node, clock, prescaler);

	int ret, fdr;



	ret = mpc_i2c_get_fdr_52xx(node, clock, prescaler);

	fdr = (ret >= 0) ? ret : 0x3f; /* backward compatibility */



	if (fdr < 0)

		fdr = 0x3f; /* backward compatibility */

	writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR);



	if (ret >= 0)

		dev_info(i2c->dev, "clock %d Hz (fdr=%d)\n", clock, fdr);

}

#else /* !CONFIG_PPC_52xx */

#else /* !CONFIG_PPC_MPC52xx */

static void mpc_i2c_setclock_52xx(struct device_node *node,

				  struct mpc_i2c *i2c,

				  u32 clock, u32 prescaler)

{

}

#endif /* CONFIG_PPC_52xx*/

#endif /* CONFIG_PPC_MPC52xx*/



#ifdef CONFIG_FSL_SOC

static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] = {
@@ -321,12 +324,15 @@ static void mpc_i2c_setclock_8xxx(struct device_node *node, 
				  struct mpc_i2c *i2c,

				  u32 clock, u32 prescaler)

{

	int fdr = mpc_i2c_get_fdr_8xxx(node, clock, prescaler);

	int ret, fdr;



	ret = mpc_i2c_get_fdr_8xxx(node, clock, prescaler);

	fdr = (ret >= 0) ? ret : 0x1031; /* backward compatibility */



	if (fdr < 0)

		fdr = 0x1031; /* backward compatibility */

	writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR);

	writeb((fdr >> 8) & 0xff, i2c->base + MPC_I2C_DFSRR);



	if (ret >= 0)

		dev_info(i2c->dev, "clock %d Hz (dfsrr=%d fdr=%d)\n",

			 clock, fdr >> 8, fdr & 0xff);

}

drivers/i2c/busses/i2c-pxa.c

+3 −3
Original line number Diff line number Diff line
@@ -265,10 +265,10 @@ static int i2c_pxa_wait_bus_not_busy(struct pxa_i2c *i2c) 
		show_state(i2c);

	}



	if (timeout <= 0)

	if (timeout < 0)

		show_state(i2c);



	return timeout <= 0 ? I2C_RETRY : 0;

	return timeout < 0 ? I2C_RETRY : 0;

}



static int i2c_pxa_wait_master(struct pxa_i2c *i2c)
@@ -612,7 +612,7 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c) 
		show_state(i2c);

	}



	if (timeout <= 0) {

	if (timeout < 0) {

		show_state(i2c);

		dev_err(&i2c->adap.dev,

			"i2c_pxa: timeout waiting for bus free\n");