From mboxrd@z Thu Jan 1 00:00:00 1970 From: kmpark@infradead.org (Kyungmin Park) Date: Thu, 30 Sep 2010 13:48:59 +0900 Subject: [PATCH 7/7] ARM: S5PC210: I2C{3, 4, 5, 6, 7} device support Message-ID: <20100930044859.GA16923@july> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Kyungmin Park S5PC210 support more I2C devices than previous SoCs. And to prevent the wrong usage use the s5p prefix instead of s3c. Signed-off-by: Kyungmin Park --- arch/arm/mach-s5pv310/Kconfig | 15 +++++++ arch/arm/mach-s5pv310/Makefile | 5 ++ arch/arm/mach-s5pv310/setup-i2c3.c | 25 +++++++++++ arch/arm/mach-s5pv310/setup-i2c4.c | 25 +++++++++++ arch/arm/mach-s5pv310/setup-i2c5.c | 25 +++++++++++ arch/arm/mach-s5pv310/setup-i2c6.c | 25 +++++++++++ arch/arm/mach-s5pv310/setup-i2c7.c | 25 +++++++++++ arch/arm/plat-s5p/Kconfig | 25 +++++++++++ arch/arm/plat-s5p/Makefile | 5 ++ arch/arm/plat-s5p/dev-i2c3.c | 67 ++++++++++++++++++++++++++++++ arch/arm/plat-s5p/dev-i2c4.c | 67 ++++++++++++++++++++++++++++++ arch/arm/plat-s5p/dev-i2c5.c | 67 ++++++++++++++++++++++++++++++ arch/arm/plat-s5p/dev-i2c6.c | 67 ++++++++++++++++++++++++++++++ arch/arm/plat-s5p/dev-i2c7.c | 67 ++++++++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/iic.h | 5 ++ 15 files changed, 515 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-s5pv310/setup-i2c3.c create mode 100644 arch/arm/mach-s5pv310/setup-i2c4.c create mode 100644 arch/arm/mach-s5pv310/setup-i2c5.c create mode 100644 arch/arm/mach-s5pv310/setup-i2c6.c create mode 100644 arch/arm/mach-s5pv310/setup-i2c7.c create mode 100644 arch/arm/plat-s5p/dev-i2c3.c create mode 100644 arch/arm/plat-s5p/dev-i2c4.c create mode 100644 arch/arm/plat-s5p/dev-i2c5.c create mode 100644 arch/arm/plat-s5p/dev-i2c6.c create mode 100644 arch/arm/plat-s5p/dev-i2c7.c diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig index c207426..cd5e8a6 100644 --- a/arch/arm/mach-s5pv310/Kconfig +++ b/arch/arm/mach-s5pv310/Kconfig @@ -24,6 +24,21 @@ config S5PV310_SETUP_I2C2 help Common setup code for i2c bus 2. +config S5PV310_SETUP_I2C3 + bool + +config S5PV310_SETUP_I2C4 + bool + +config S5PV310_SETUP_I2C5 + bool + +config S5PV310_SETUP_I2C6 + bool + +config S5PV310_SETUP_I2C7 + bool + # machine support menu "S5PC210 Machines" diff --git a/arch/arm/mach-s5pv310/Makefile b/arch/arm/mach-s5pv310/Makefile index d17c8c7..d18febf 100644 --- a/arch/arm/mach-s5pv310/Makefile +++ b/arch/arm/mach-s5pv310/Makefile @@ -30,3 +30,8 @@ obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o obj-$(CONFIG_S5PV310_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PV310_SETUP_I2C2) += setup-i2c2.o +obj-$(CONFIG_S5PV310_SETUP_I2C3) += setup-i2c3.o +obj-$(CONFIG_S5PV310_SETUP_I2C4) += setup-i2c4.o +obj-$(CONFIG_S5PV310_SETUP_I2C5) += setup-i2c5.o +obj-$(CONFIG_S5PV310_SETUP_I2C6) += setup-i2c6.o +obj-$(CONFIG_S5PV310_SETUP_I2C7) += setup-i2c7.o diff --git a/arch/arm/mach-s5pv310/setup-i2c3.c b/arch/arm/mach-s5pv310/setup-i2c3.c new file mode 100644 index 0000000..25e75b6 --- /dev/null +++ b/arch/arm/mach-s5pv310/setup-i2c3.c @@ -0,0 +1,25 @@ +/* + * linux/arch/arm/mach-s5pv310/setup-i2c3.c + * + * Copyright (c) 2010 Samsung Electronics Co., Ltd. + * + * I2C3 GPIO configuration. + * + * 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. +*/ + +struct platform_device; /* don't need the contents */ + +#include +#include +#include + +void s5p_i2c3_cfg_gpio(struct platform_device *dev) +{ + s3c_gpio_cfgpin(S5PV310_GPA1(2), S3C_GPIO_SFN(3)); + s3c_gpio_setpull(S5PV310_GPA1(2), S3C_GPIO_PULL_UP); + s3c_gpio_cfgpin(S5PV310_GPA1(3), S3C_GPIO_SFN(3)); + s3c_gpio_setpull(S5PV310_GPA1(3), S3C_GPIO_PULL_UP); +} diff --git a/arch/arm/mach-s5pv310/setup-i2c4.c b/arch/arm/mach-s5pv310/setup-i2c4.c new file mode 100644 index 0000000..72b3f68 --- /dev/null +++ b/arch/arm/mach-s5pv310/setup-i2c4.c @@ -0,0 +1,25 @@ +/* + * linux/arch/arm/mach-s5pv310/setup-i2c4.c + * + * Copyright (c) 2010 Samsung Electronics Co., Ltd. + * + * I2C4 GPIO configuration. + * + * 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. +*/ + +struct platform_device; /* don't need the contents */ + +#include +#include +#include + +void s5p_i2c4_cfg_gpio(struct platform_device *dev) +{ + s3c_gpio_cfgpin(S5PV310_GPB(0), S3C_GPIO_SFN(3)); + s3c_gpio_setpull(S5PV310_GPB(0), S3C_GPIO_PULL_UP); + s3c_gpio_cfgpin(S5PV310_GPB(1), S3C_GPIO_SFN(3)); + s3c_gpio_setpull(S5PV310_GPB(1), S3C_GPIO_PULL_UP); +} diff --git a/arch/arm/mach-s5pv310/setup-i2c5.c b/arch/arm/mach-s5pv310/setup-i2c5.c new file mode 100644 index 0000000..8fb4710 --- /dev/null +++ b/arch/arm/mach-s5pv310/setup-i2c5.c @@ -0,0 +1,25 @@ +/* + * linux/arch/arm/mach-s5pv310/setup-i2c5.c + * + * Copyright (c) 2010 Samsung Electronics Co., Ltd. + * + * I2C5 GPIO configuration. + * + * 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. +*/ + +struct platform_device; /* don't need the contents */ + +#include +#include +#include + +void s5p_i2c5_cfg_gpio(struct platform_device *dev) +{ + s3c_gpio_cfgpin(S5PV310_GPB(6), S3C_GPIO_SFN(3)); + s3c_gpio_setpull(S5PV310_GPB(6), S3C_GPIO_PULL_UP); + s3c_gpio_cfgpin(S5PV310_GPB(7), S3C_GPIO_SFN(3)); + s3c_gpio_setpull(S5PV310_GPB(7), S3C_GPIO_PULL_UP); +} diff --git a/arch/arm/mach-s5pv310/setup-i2c6.c b/arch/arm/mach-s5pv310/setup-i2c6.c new file mode 100644 index 0000000..a358071 --- /dev/null +++ b/arch/arm/mach-s5pv310/setup-i2c6.c @@ -0,0 +1,25 @@ +/* + * linux/arch/arm/mach-s5pv310/setup-i2c6.c + * + * Copyright (c) 2010 Samsung Electronics Co., Ltd. + * + * I2C6 GPIO configuration. + * + * 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. +*/ + +struct platform_device; /* don't need the contents */ + +#include +#include +#include + +void s5p_i2c6_cfg_gpio(struct platform_device *dev) +{ + s3c_gpio_cfgpin(S5PV310_GPC1(3), S3C_GPIO_SFN(2)); + s3c_gpio_setpull(S5PV310_GPC1(3), S3C_GPIO_PULL_UP); + s3c_gpio_cfgpin(S5PV310_GPC1(4), S3C_GPIO_SFN(2)); + s3c_gpio_setpull(S5PV310_GPC1(4), S3C_GPIO_PULL_UP); +} diff --git a/arch/arm/mach-s5pv310/setup-i2c7.c b/arch/arm/mach-s5pv310/setup-i2c7.c new file mode 100644 index 0000000..d0bc17c --- /dev/null +++ b/arch/arm/mach-s5pv310/setup-i2c7.c @@ -0,0 +1,25 @@ +/* + * linux/arch/arm/mach-s5pv310/setup-i2c7.c + * + * Copyright (c) 2010 Samsung Electronics Co., Ltd. + * + * I2C7 GPIO configuration. + * + * 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. +*/ + +struct platform_device; /* don't need the contents */ + +#include +#include +#include + +void s5p_i2c7_cfg_gpio(struct platform_device *dev) +{ + s3c_gpio_cfgpin(S5PV310_GPD0(2), S3C_GPIO_SFN(3)); + s3c_gpio_setpull(S5PV310_GPD0(2), S3C_GPIO_PULL_UP); + s3c_gpio_cfgpin(S5PV310_GPD0(3), S3C_GPIO_SFN(3)); + s3c_gpio_setpull(S5PV310_GPD0(3), S3C_GPIO_PULL_UP); +} diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index 2596096..a6e8e65 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig @@ -51,3 +51,28 @@ config S5P_DEV_ONENAND bool help Compile in platform device definition for OneNAND controller + +config S5P_DEV_I2C3 + bool + help + Compile in platform device definition for I2C controller 3 + +config S5P_DEV_I2C4 + bool + help + Compile in platform device definition for I2C controller 4 + +config S5P_DEV_I2C5 + bool + help + Compile in platform device definition for I2C controller 5 + +config S5P_DEV_I2C6 + bool + help + Compile in platform device definition for I2C controller 6 + +config S5P_DEV_I2C7 + bool + help + Compile in platform device definition for I2C controller 7 diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile index f3e917e..f57fab8 100644 --- a/arch/arm/plat-s5p/Makefile +++ b/arch/arm/plat-s5p/Makefile @@ -25,3 +25,8 @@ obj-$(CONFIG_S5P_DEV_FIMC0) += dev-fimc0.o obj-$(CONFIG_S5P_DEV_FIMC1) += dev-fimc1.o obj-$(CONFIG_S5P_DEV_FIMC2) += dev-fimc2.o obj-$(CONFIG_S5P_DEV_ONENAND) += dev-onenand.o +obj-$(CONFIG_S5P_DEV_I2C3) += dev-i2c3.o +obj-$(CONFIG_S5P_DEV_I2C4) += dev-i2c4.o +obj-$(CONFIG_S5P_DEV_I2C5) += dev-i2c5.o +obj-$(CONFIG_S5P_DEV_I2C6) += dev-i2c6.o +obj-$(CONFIG_S5P_DEV_I2C7) += dev-i2c7.o diff --git a/arch/arm/plat-s5p/dev-i2c3.c b/arch/arm/plat-s5p/dev-i2c3.c new file mode 100644 index 0000000..f92c4ea --- /dev/null +++ b/arch/arm/plat-s5p/dev-i2c3.c @@ -0,0 +1,67 @@ +/* linux/arch/arm/plat-s5p/dev-i2c3.c + * + * Copyright(C) 2010 Samsung Electronics + * + * S5P series device definition for i2c device 3 + * + * 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 +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +static struct resource s3c_i2c_resource[] = { + [0] = { + .start = S3C_PA_I2C3, + .end = S3C_PA_I2C3 + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = IRQ_I2C3, + .end = IRQ_I2C3, + .flags = IORESOURCE_IRQ, + }, +}; + +struct platform_device s3c_device_i2c3 = { + .name = "s3c2440-i2c", + .id = 3, + .num_resources = ARRAY_SIZE(s3c_i2c_resource), + .resource = s3c_i2c_resource, +}; + +static struct s3c2410_platform_i2c default_i2c_data3 __initdata = { + .flags = 0, + .bus_num = 3, + .slave_addr = 0x10, + .frequency = 100*1000, + .sda_delay = 100, +}; + +void __init s3c_i2c3_set_platdata(struct s3c2410_platform_i2c *pd) +{ + struct s3c2410_platform_i2c *npd; + + if (!pd) + pd = &default_i2c_data3; + + 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 = s5p_i2c3_cfg_gpio; + + s3c_device_i2c3.dev.platform_data = npd; +} diff --git a/arch/arm/plat-s5p/dev-i2c4.c b/arch/arm/plat-s5p/dev-i2c4.c new file mode 100644 index 0000000..10b5bd1 --- /dev/null +++ b/arch/arm/plat-s5p/dev-i2c4.c @@ -0,0 +1,67 @@ +/* linux/arch/arm/plat-s5p/dev-i2c4.c + * + * Copyright(C) 2010 Samsung Electronics + * + * S5P series device definition for i2c device 3 + * + * 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 +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +static struct resource s3c_i2c_resource[] = { + [0] = { + .start = S3C_PA_I2C4, + .end = S3C_PA_I2C4 + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = IRQ_I2C4, + .end = IRQ_I2C4, + .flags = IORESOURCE_IRQ, + }, +}; + +struct platform_device s3c_device_i2c4 = { + .name = "s3c2440-i2c", + .id = 4, + .num_resources = ARRAY_SIZE(s3c_i2c_resource), + .resource = s3c_i2c_resource, +}; + +static struct s3c2410_platform_i2c default_i2c_data4 __initdata = { + .flags = 0, + .bus_num = 4, + .slave_addr = 0x10, + .frequency = 100*1000, + .sda_delay = 100, +}; + +void __init s3c_i2c4_set_platdata(struct s3c2410_platform_i2c *pd) +{ + struct s3c2410_platform_i2c *npd; + + if (!pd) + pd = &default_i2c_data4; + + 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 = s5p_i2c4_cfg_gpio; + + s3c_device_i2c4.dev.platform_data = npd; +} diff --git a/arch/arm/plat-s5p/dev-i2c5.c b/arch/arm/plat-s5p/dev-i2c5.c new file mode 100644 index 0000000..a5ab875 --- /dev/null +++ b/arch/arm/plat-s5p/dev-i2c5.c @@ -0,0 +1,67 @@ +/* linux/arch/arm/plat-s5p/dev-i2c3.c + * + * Copyright(C) 2010 Samsung Electronics + * + * S5P series device definition for i2c device 3 + * + * 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 +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +static struct resource s3c_i2c_resource[] = { + [0] = { + .start = S3C_PA_I2C5, + .end = S3C_PA_I2C5 + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = IRQ_I2C5, + .end = IRQ_I2C5, + .flags = IORESOURCE_IRQ, + }, +}; + +struct platform_device s3c_device_i2c5 = { + .name = "s3c2440-i2c", + .id = 5, + .num_resources = ARRAY_SIZE(s3c_i2c_resource), + .resource = s3c_i2c_resource, +}; + +static struct s3c2410_platform_i2c default_i2c_data5 __initdata = { + .flags = 0, + .bus_num = 5, + .slave_addr = 0x10, + .frequency = 100*1000, + .sda_delay = 100, +}; + +void __init s3c_i2c5_set_platdata(struct s3c2410_platform_i2c *pd) +{ + struct s3c2410_platform_i2c *npd; + + if (!pd) + pd = &default_i2c_data5; + + 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 = s5p_i2c5_cfg_gpio; + + s3c_device_i2c5.dev.platform_data = npd; +} diff --git a/arch/arm/plat-s5p/dev-i2c6.c b/arch/arm/plat-s5p/dev-i2c6.c new file mode 100644 index 0000000..3c29a9b --- /dev/null +++ b/arch/arm/plat-s5p/dev-i2c6.c @@ -0,0 +1,67 @@ +/* linux/arch/arm/plat-s5p/dev-i2c6.c + * + * Copyright(C) 2010 Samsung Electronics + * + * S5P series device definition for i2c device 6 + * + * 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 +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +static struct resource s3c_i2c_resource[] = { + [0] = { + .start = S3C_PA_I2C6, + .end = S3C_PA_I2C6 + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = IRQ_I2C6, + .end = IRQ_I2C6, + .flags = IORESOURCE_IRQ, + }, +}; + +struct platform_device s3c_device_i2c6 = { + .name = "s3c2440-i2c", + .id = 6, + .num_resources = ARRAY_SIZE(s3c_i2c_resource), + .resource = s3c_i2c_resource, +}; + +static struct s3c2410_platform_i2c default_i2c_data6 __initdata = { + .flags = 0, + .bus_num = 6, + .slave_addr = 0x10, + .frequency = 100*1000, + .sda_delay = 100, +}; + +void __init s3c_i2c6_set_platdata(struct s3c2410_platform_i2c *pd) +{ + struct s3c2410_platform_i2c *npd; + + if (!pd) + pd = &default_i2c_data6; + + 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 = s5p_i2c6_cfg_gpio; + + s3c_device_i2c6.dev.platform_data = npd; +} diff --git a/arch/arm/plat-s5p/dev-i2c7.c b/arch/arm/plat-s5p/dev-i2c7.c new file mode 100644 index 0000000..98139a5 --- /dev/null +++ b/arch/arm/plat-s5p/dev-i2c7.c @@ -0,0 +1,67 @@ +/* linux/arch/arm/plat-s5p/dev-i2c7.c + * + * Copyright(C) 2010 Samsung Electronics + * + * S5P series device definition for i2c device 7 + * + * 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 +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +static struct resource s3c_i2c_resource[] = { + [0] = { + .start = S3C_PA_I2C7, + .end = S3C_PA_I2C7 + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = IRQ_I2C7, + .end = IRQ_I2C7, + .flags = IORESOURCE_IRQ, + }, +}; + +struct platform_device s3c_device_i2c7 = { + .name = "s3c2440-i2c", + .id = 7, + .num_resources = ARRAY_SIZE(s3c_i2c_resource), + .resource = s3c_i2c_resource, +}; + +static struct s3c2410_platform_i2c default_i2c_data7 __initdata = { + .flags = 0, + .bus_num = 7, + .slave_addr = 0x10, + .frequency = 100*1000, + .sda_delay = 100, +}; + +void __init s3c_i2c7_set_platdata(struct s3c2410_platform_i2c *pd) +{ + struct s3c2410_platform_i2c *npd; + + if (!pd) + pd = &default_i2c_data7; + + 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 = s5p_i2c7_cfg_gpio; + + s3c_device_i2c7.dev.platform_data = npd; +} diff --git a/arch/arm/plat-samsung/include/plat/iic.h b/arch/arm/plat-samsung/include/plat/iic.h index 133308b..893f6a1 100644 --- a/arch/arm/plat-samsung/include/plat/iic.h +++ b/arch/arm/plat-samsung/include/plat/iic.h @@ -60,5 +60,10 @@ extern void s3c_i2c2_set_platdata(struct s3c2410_platform_i2c *i2c); extern void s3c_i2c0_cfg_gpio(struct platform_device *dev); extern void s3c_i2c1_cfg_gpio(struct platform_device *dev); extern void s3c_i2c2_cfg_gpio(struct platform_device *dev); +extern void s5p_i2c3_cfg_gpio(struct platform_device *dev); +extern void s5p_i2c4_cfg_gpio(struct platform_device *dev); +extern void s5p_i2c5_cfg_gpio(struct platform_device *dev); +extern void s5p_i2c6_cfg_gpio(struct platform_device *dev); +extern void s5p_i2c7_cfg_gpio(struct platform_device *dev); #endif /* __ASM_ARCH_IIC_H */ -- 1.5.3.3