i2c-pnx.c: Use resources in platforms (77701a8b) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/mach-lpc32xx/common.c

+42 −25

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,6 @@

	#include <asm/mach/map.h>		#include <asm/mach/map.h>

	#include <mach/i2c.h>
	#include <mach/hardware.h>		#include <mach/hardware.h>
	#include <mach/platform.h>		#include <mach/platform.h>
	#include "common.h"		#include "common.h"
	@@ -53,46 +52,64 @@ struct platform_device lpc32xx_watchdog_device = {
	/*		/*
	* I2C busses		* I2C busses
	*/		*/
	static struct i2c_pnx_data i2c0_data = {		static struct resource i2c0_resources[] = {
	.name = I2C_CHIP_NAME "1",		[0] = {
	.base = LPC32XX_I2C1_BASE,		.start = LPC32XX_I2C1_BASE,
	.irq = IRQ_LPC32XX_I2C_1,		.end = LPC32XX_I2C1_BASE + 0x100 - 1,
			.flags = IORESOURCE_MEM,
			},
			[1] = {
			.start = IRQ_LPC32XX_I2C_1,
			.end = IRQ_LPC32XX_I2C_1,
			.flags = IORESOURCE_IRQ,
			},
	};		};

	static struct i2c_pnx_data i2c1_data = {		static struct resource i2c1_resources[] = {
	.name = I2C_CHIP_NAME "2",		[0] = {
	.base = LPC32XX_I2C2_BASE,		.start = LPC32XX_I2C2_BASE,
	.irq = IRQ_LPC32XX_I2C_2,		.end = LPC32XX_I2C2_BASE + 0x100 - 1,
			.flags = IORESOURCE_MEM,
			},
			[1] = {
			.start = IRQ_LPC32XX_I2C_2,
			.end = IRQ_LPC32XX_I2C_2,
			.flags = IORESOURCE_IRQ,
			},
	};		};

	static struct i2c_pnx_data i2c2_data = {		static struct resource i2c2_resources[] = {
	.name = "USB-I2C",		[0] = {
	.base = LPC32XX_OTG_I2C_BASE,		.start = LPC32XX_OTG_I2C_BASE,
	.irq = IRQ_LPC32XX_USB_I2C,		.end = LPC32XX_OTG_I2C_BASE + 0x100 - 1,
			.flags = IORESOURCE_MEM,
			},
			[1] = {
			.start = IRQ_LPC32XX_USB_I2C,
			.end = IRQ_LPC32XX_USB_I2C,
			.flags = IORESOURCE_IRQ,
			},
	};		};

	struct platform_device lpc32xx_i2c0_device = {		struct platform_device lpc32xx_i2c0_device = {
	.name = "pnx-i2c",		.name = "pnx-i2c.0",
	.id = 0,		.id = 0,
	.dev = {		.num_resources = ARRAY_SIZE(i2c0_resources),
	.platform_data = &i2c0_data,		.resource = i2c0_resources,
	},
	};		};

	struct platform_device lpc32xx_i2c1_device = {		struct platform_device lpc32xx_i2c1_device = {
	.name = "pnx-i2c",		.name = "pnx-i2c.1",
	.id = 1,		.id = 1,
	.dev = {		.num_resources = ARRAY_SIZE(i2c1_resources),
	.platform_data = &i2c1_data,		.resource = i2c1_resources,
	},
	};		};

	struct platform_device lpc32xx_i2c2_device = {		struct platform_device lpc32xx_i2c2_device = {
	.name = "pnx-i2c",		.name = "pnx-i2c.2",
	.id = 2,		.id = 2,
	.dev = {		.num_resources = ARRAY_SIZE(i2c2_resources),
	.platform_data = &i2c2_data,		.resource = i2c2_resources,
	},
	};		};

	/* TSC (Touch Screen Controller) */		/* TSC (Touch Screen Controller) */

arch/arm/mach-pnx4008/i2c.c

+39 −25

Original line number	Original line	Diff line number	Diff line
	@@ -16,48 +16,62 @@
	#include <linux/err.h>		#include <linux/err.h>
	#include <mach/platform.h>		#include <mach/platform.h>
	#include <mach/irqs.h>		#include <mach/irqs.h>
	#include <mach/i2c.h>

	static struct i2c_pnx_data i2c0_data = {		static struct resource i2c0_resources[] = {
	.name = I2C_CHIP_NAME "0",		{
	.base = PNX4008_I2C1_BASE,		.start = PNX4008_I2C1_BASE,
	.irq = I2C_1_INT,		.end = PNX4008_I2C1_BASE + SZ_4K - 1,
			.flags = IORESOURCE_MEM,
			}, {
			.start = I2C_1_INT,
			.end = I2C_1_INT,
			.flags = IORESOURCE_IRQ,
			},
	};		};

	static struct i2c_pnx_data i2c1_data = {		static struct resource i2c1_resources[] = {
	.name = I2C_CHIP_NAME "1",		{
	.base = PNX4008_I2C2_BASE,		.start = PNX4008_I2C2_BASE,
	.irq = I2C_2_INT,		.end = PNX4008_I2C2_BASE + SZ_4K - 1,
			.flags = IORESOURCE_MEM,
			}, {
			.start = I2C_2_INT,
			.end = I2C_2_INT,
			.flags = IORESOURCE_IRQ,
			},
	};		};

	static struct i2c_pnx_data i2c2_data = {		static struct resource i2c2_resources[] = {
	.name = "USB-I2C",		{
	.base = (PNX4008_USB_CONFIG_BASE + 0x300),		.start = PNX4008_USB_CONFIG_BASE + 0x300,
	.irq = USB_I2C_INT,		.end = PNX4008_USB_CONFIG_BASE + 0x300 + SZ_4K - 1,
			.flags = IORESOURCE_MEM,
			}, {
			.start = USB_I2C_INT,
			.end = USB_I2C_INT,
			.flags = IORESOURCE_IRQ,
			},
	};		};

	static struct platform_device i2c0_device = {		static struct platform_device i2c0_device = {
	.name = "pnx-i2c",		.name = "pnx-i2c.0",
	.id = 0,		.id = 0,
	.dev = {		.resource = i2c0_resources,
	.platform_data = &i2c0_data,		.num_resources = ARRAY_SIZE(i2c0_resources),
	},
	};		};

	static struct platform_device i2c1_device = {		static struct platform_device i2c1_device = {
	.name = "pnx-i2c",		.name = "pnx-i2c.1",
	.id = 1,		.id = 1,
	.dev = {		.resource = i2c1_resources,
	.platform_data = &i2c1_data,		.num_resources = ARRAY_SIZE(i2c1_resources),
	},
	};		};

	static struct platform_device i2c2_device = {		static struct platform_device i2c2_device = {
	.name = "pnx-i2c",		.name = "pnx-i2c.2",
	.id = 2,		.id = 2,
	.dev = {		.resource = i2c2_resources,
	.platform_data = &i2c2_data,		.num_resources = ARRAY_SIZE(i2c2_resources),
	},
	};		};

	static struct platform_device *devices[] __initdata = {		static struct platform_device *devices[] __initdata = {

drivers/i2c/busses/i2c-pnx.c

+25 −22

Original line number	Original line	Diff line number	Diff line
	@@ -568,14 +568,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
	int ret = 0;		int ret = 0;
	struct i2c_pnx_algo_data *alg_data;		struct i2c_pnx_algo_data *alg_data;
	unsigned long freq;		unsigned long freq;
	struct i2c_pnx_data *i2c_pnx = pdev->dev.platform_data;		struct resource *res;

	if (!i2c_pnx \|\| !i2c_pnx->name) {
	dev_err(&pdev->dev, "%s: no platform data supplied\n",
	__func__);
	ret = -EINVAL;
	goto out;
	}

	alg_data = kzalloc(sizeof(*alg_data), GFP_KERNEL);		alg_data = kzalloc(sizeof(*alg_data), GFP_KERNEL);
	if (!alg_data) {		if (!alg_data) {
	@@ -585,13 +578,10 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)

	platform_set_drvdata(pdev, alg_data);		platform_set_drvdata(pdev, alg_data);

	strlcpy(alg_data->adapter.name, i2c_pnx->name,
	sizeof(alg_data->adapter.name));
	alg_data->adapter.dev.parent = &pdev->dev;		alg_data->adapter.dev.parent = &pdev->dev;
	alg_data->adapter.algo = &pnx_algorithm;		alg_data->adapter.algo = &pnx_algorithm;
	alg_data->adapter.algo_data = alg_data;		alg_data->adapter.algo_data = alg_data;
	alg_data->adapter.nr = pdev->id;		alg_data->adapter.nr = pdev->id;
	alg_data->i2c_pnx = i2c_pnx;

	alg_data->clk = clk_get(&pdev->dev, NULL);		alg_data->clk = clk_get(&pdev->dev, NULL);
	if (IS_ERR(alg_data->clk)) {		if (IS_ERR(alg_data->clk)) {
	@@ -603,17 +593,27 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
	alg_data->mif.timer.function = i2c_pnx_timeout;		alg_data->mif.timer.function = i2c_pnx_timeout;
	alg_data->mif.timer.data = (unsigned long)alg_data;		alg_data->mif.timer.data = (unsigned long)alg_data;

			snprintf(alg_data->adapter.name, sizeof(alg_data->adapter.name),
			"%s", pdev->name);

	/* Register I/O resource */		/* Register I/O resource */
	if (!request_mem_region(i2c_pnx->base, I2C_PNX_REGION_SIZE,		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
			if (!res) {
			dev_err(&pdev->dev, "Unable to get mem resource.\n");
			ret = -EBUSY;
			goto out_clkget;
			}
			if (!request_mem_region(res->start, I2C_PNX_REGION_SIZE,
	pdev->name)) {		pdev->name)) {
	dev_err(&pdev->dev,		dev_err(&pdev->dev,
	"I/O region 0x%08x for I2C already in use.\n",		"I/O region 0x%08x for I2C already in use.\n",
	i2c_pnx->base);		res->start);
	ret = -ENODEV;		ret = -ENODEV;
	goto out_clkget;		goto out_clkget;
	}		}

	alg_data->ioaddr = ioremap(i2c_pnx->base, I2C_PNX_REGION_SIZE);		alg_data->base = res->start;
			alg_data->ioaddr = ioremap(res->start, I2C_PNX_REGION_SIZE);
	if (!alg_data->ioaddr) {		if (!alg_data->ioaddr) {
	dev_err(&pdev->dev, "Couldn't ioremap I2C I/O region\n");		dev_err(&pdev->dev, "Couldn't ioremap I2C I/O region\n");
	ret = -ENOMEM;		ret = -ENOMEM;
	@@ -650,7 +650,12 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
	}		}
	init_completion(&alg_data->mif.complete);		init_completion(&alg_data->mif.complete);

	ret = request_irq(i2c_pnx->irq, i2c_pnx_interrupt,		alg_data->irq = platform_get_irq(pdev, 0);
			if (alg_data->irq < 0) {
			dev_err(&pdev->dev, "Failed to get IRQ from platform resource\n");
			goto out_irq;
			}
			ret = request_irq(alg_data->irq, i2c_pnx_interrupt,
	0, pdev->name, alg_data);		0, pdev->name, alg_data);
	if (ret)		if (ret)
	goto out_clock;		goto out_clock;
	@@ -663,38 +668,36 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
	}		}

	dev_dbg(&pdev->dev, "%s: Master at %#8x, irq %d.\n",		dev_dbg(&pdev->dev, "%s: Master at %#8x, irq %d.\n",
	alg_data->adapter.name, i2c_pnx->base, i2c_pnx->irq);		alg_data->adapter.name, res->start, alg_data->irq);

	return 0;		return 0;

	out_irq:		out_irq:
	free_irq(i2c_pnx->irq, alg_data);		free_irq(alg_data->irq, alg_data);
	out_clock:		out_clock:
	clk_disable(alg_data->clk);		clk_disable(alg_data->clk);
	out_unmap:		out_unmap:
	iounmap(alg_data->ioaddr);		iounmap(alg_data->ioaddr);
	out_release:		out_release:
	release_mem_region(i2c_pnx->base, I2C_PNX_REGION_SIZE);		release_mem_region(res->start, I2C_PNX_REGION_SIZE);
	out_clkget:		out_clkget:
	clk_put(alg_data->clk);		clk_put(alg_data->clk);
	out_drvdata:		out_drvdata:
	kfree(alg_data);		kfree(alg_data);
	err_kzalloc:		err_kzalloc:
	platform_set_drvdata(pdev, NULL);		platform_set_drvdata(pdev, NULL);
	out:
	return ret;		return ret;
	}		}

	static int __devexit i2c_pnx_remove(struct platform_device *pdev)		static int __devexit i2c_pnx_remove(struct platform_device *pdev)
	{		{
	struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);		struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);
	struct i2c_pnx_data *i2c_pnx = alg_data->i2c_pnx;

	free_irq(i2c_pnx->irq, alg_data);		free_irq(alg_data->irq, alg_data);
	i2c_del_adapter(&alg_data->adapter);		i2c_del_adapter(&alg_data->adapter);
	clk_disable(alg_data->clk);		clk_disable(alg_data->clk);
	iounmap(alg_data->ioaddr);		iounmap(alg_data->ioaddr);
	release_mem_region(i2c_pnx->base, I2C_PNX_REGION_SIZE);		release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);
	clk_put(alg_data->clk);		clk_put(alg_data->clk);
	kfree(alg_data);		kfree(alg_data);
	platform_set_drvdata(pdev, NULL);		platform_set_drvdata(pdev, NULL);

include/linux/i2c-pnx.h

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -29,13 +29,8 @@ struct i2c_pnx_algo_data {
	struct i2c_pnx_mif mif;		struct i2c_pnx_mif mif;
	int last;		int last;
	struct clk *clk;		struct clk *clk;
	struct i2c_pnx_data *i2c_pnx;
	struct i2c_adapter adapter;		struct i2c_adapter adapter;
	};		phys_addr_t base;

	struct i2c_pnx_data {
	const char *name;
	u32 base;
	int irq;		int irq;
	};		};