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

Commit 1aba834d authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C: Add i2c1 device definition 



Add device definition and support functions for the
second i2c device (i2c1). If this is selected, the first
i2c bus will become index 0 instead of index -1.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 8f995cc3

arch/arm/mach-s3c6400/include/mach/map.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#define S3C64XX_PA_SYSCON	(0x7E00F000)

#define S3C64XX_PA_TIMER	(0x7F006000)

#define S3C64XX_PA_IIC0		(0x7F004000)

#define S3C64XX_PA_IIC1		(0x7F00F000)



#define S3C64XX_PA_GPIO		(0x7F008000)

#define S3C64XX_VA_GPIO		S3C_ADDR(0x00500000)
@@ -60,5 +61,6 @@ 
#define S3C_PA_HSMMC1		S3C64XX_PA_HSMMC1

#define S3C_PA_HSMMC2		S3C64XX_PA_HSMMC2

#define S3C_PA_IIC		S3C64XX_PA_IIC0

#define S3C_PA_IIC1		S3C64XX_PA_IIC1



#endif /* __ASM_ARCH_6400_MAP_H */

arch/arm/plat-s3c/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -160,3 +160,9 @@ config S3C_DEV_HSMMC1 
	depends on PLAT_S3C

	help

	  Compile in platform device definitions for HSMMC channel 1



config S3C_DEV_I2C1

	bool

	depends on PLAT_S3C

	help

	  Compile in platform device definitions for I2C channel 1

arch/arm/plat-s3c/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -23,3 +23,4 @@ obj-y += gpio-config.o 
obj-$(CONFIG_S3C_DEV_HSMMC)	+= dev-hsmmc.o

obj-$(CONFIG_S3C_DEV_HSMMC1)	+= dev-hsmmc1.o

obj-y				+= dev-i2c0.o

obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o

arch/arm/plat-s3c/dev-i2c0.c

+6 −2
Original line number Diff line number Diff line
@@ -37,12 +37,16 @@ static struct resource s3c_i2c_resource[] = { 


struct platform_device s3c_device_i2c0 = {

	.name		  = "s3c2410-i2c",

#ifdef CONFIG_S3C_DEV_I2C1

	.id		  = 0,

#else

	.id		  = -1,

#endif

	.num_resources	  = ARRAY_SIZE(s3c_i2c_resource),

	.resource	  = s3c_i2c_resource,

};



struct s3c2410_platform_i2c default_i2c_data __initdata = {

static struct s3c2410_platform_i2c default_i2c_data0 __initdata = {

	.flags		= 0,

	.slave_addr	= 0x10,

	.bus_freq	= 100*1000,
@@ -55,7 +59,7 @@ void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd) 
	struct s3c2410_platform_i2c *npd;



	if (!pd)

		pd = &default_i2c_data;

		pd = &default_i2c_data0;



	npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);

	if (!npd)

arch/arm/plat-s3c/dev-i2c1.c

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c/dev-i2c1.c

 *

 * Copyright 2008 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *	http://armlinux.simtec.co.uk/

 *

 * S3C series device definition for i2c device 1

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/platform_device.h>



#include <mach/map.h>



#include <plat/regs-iic.h>

#include <plat/iic.h>

#include <plat/devs.h>

#include <plat/cpu.h>



static struct resource s3c_i2c_resource[] = {

	[0] = {

		.start = S3C_PA_IIC1,

		.end   = S3C_PA_IIC1 + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_IIC1,

		.end   = IRQ_IIC1,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device s3c_device_i2c1 = {

	.name		  = "s3c2410-i2c",

	.id		  = 1,

	.num_resources	  = ARRAY_SIZE(s3c_i2c_resource),

	.resource	  = s3c_i2c_resource,

};



static struct s3c2410_platform_i2c default_i2c_data1 __initdata = {

	.flags		= 0,

	.bus_num	= 1,

	.slave_addr	= 0x10,

	.bus_freq	= 100*1000,

	.max_freq	= 400*1000,

	.sda_delay	= S3C2410_IICLC_SDA_DELAY5 | S3C2410_IICLC_FILTER_ON,

};



void __init s3c_i2c1_set_platdata(struct s3c2410_platform_i2c *pd)

{

	struct s3c2410_platform_i2c *npd;



	if (!pd)

		pd = &default_i2c_data1;



	npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);

	if (!npd)

		printk(KERN_ERR "%s: no memory for platform data\n", __func__);

	else if (!npd->cfg_gpio)

		npd->cfg_gpio = s3c_i2c1_cfg_gpio;



	s3c_device_i2c1.dev.platform_data = npd;

}