aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Krishna Ch <ch.naveen@samsung.com>2010-07-29 05:49:34 -0400
committerKukjin Kim <kgene.kim@samsung.com>2010-08-05 05:32:52 -0400
commit4b623926ba8e29393077fc3e01d1141a3ee2e2e9 (patch)
tree28e1d0a12ceb0d0feaec63f52996f4f978c7769c
parent03eb2749c21b006456249dfd8b6c24a5081c84c1 (diff)
ARM: SAMSUNG: i2c/busses: Add HAVE_S3C2410_I2C option to include I2C for Samsung SoCs
This patch adds HAVE_S3C2410_I2C to control inclusion of I2C bus driver on Samsung SoCs and makes I2C bus driver dependency SoC specific instead of machine specific. This will enalbe all machines using Samsung ARCH_S3C2410, _S3C64XX, _S5P6440, _S5PC100, and _S5PV210 to select the I2C driver by default Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Cc: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/Kconfig5
-rw-r--r--drivers/i2c/busses/Kconfig11
2 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ea668a41b991..bc9506cdf4d1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -634,6 +634,7 @@ config ARCH_S3C2410
634 select ARCH_HAS_CPUFREQ 634 select ARCH_HAS_CPUFREQ
635 select HAVE_CLK 635 select HAVE_CLK
636 select ARCH_USES_GETTIMEOFFSET 636 select ARCH_USES_GETTIMEOFFSET
637 select HAVE_S3C2410_I2C
637 help 638 help
638 Samsung S3C2410X CPU based systems, such as the Simtec Electronics 639 Samsung S3C2410X CPU based systems, such as the Simtec Electronics
639 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or 640 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -663,6 +664,7 @@ config ARCH_S3C64XX
663 select S3C_DEV_NAND 664 select S3C_DEV_NAND
664 select USB_ARCH_HAS_OHCI 665 select USB_ARCH_HAS_OHCI
665 select SAMSUNG_GPIOLIB_4BIT 666 select SAMSUNG_GPIOLIB_4BIT
667 select HAVE_S3C2410_I2C
666 help 668 help
667 Samsung S3C64XX series based systems 669 Samsung S3C64XX series based systems
668 670
@@ -672,6 +674,7 @@ config ARCH_S5P6440
672 select GENERIC_GPIO 674 select GENERIC_GPIO
673 select HAVE_CLK 675 select HAVE_CLK
674 select ARCH_USES_GETTIMEOFFSET 676 select ARCH_USES_GETTIMEOFFSET
677 select HAVE_S3C2410_I2C
675 select HAVE_S3C_RTC 678 select HAVE_S3C_RTC
676 help 679 help
677 Samsung S5P6440 CPU based systems 680 Samsung S5P6440 CPU based systems
@@ -692,6 +695,7 @@ config ARCH_S5PC100
692 select CPU_V7 695 select CPU_V7
693 select ARM_L1_CACHE_SHIFT_6 696 select ARM_L1_CACHE_SHIFT_6
694 select ARCH_USES_GETTIMEOFFSET 697 select ARCH_USES_GETTIMEOFFSET
698 select HAVE_S3C2410_I2C
695 select HAVE_S3C_RTC 699 select HAVE_S3C_RTC
696 help 700 help
697 Samsung S5PC100 series based systems 701 Samsung S5PC100 series based systems
@@ -703,6 +707,7 @@ config ARCH_S5PV210
703 select HAVE_CLK 707 select HAVE_CLK
704 select ARM_L1_CACHE_SHIFT_6 708 select ARM_L1_CACHE_SHIFT_6
705 select ARCH_USES_GETTIMEOFFSET 709 select ARCH_USES_GETTIMEOFFSET
710 select HAVE_S3C2410_I2C
706 select HAVE_S3C_RTC 711 select HAVE_S3C_RTC
707 help 712 help
708 Samsung S5PV210/S5PC110 series based systems 713 Samsung S5PV210/S5PC110 series based systems
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index bceafbfa7268..80143899ccec 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -521,12 +521,19 @@ config I2C_PXA_SLAVE
521 is necessary for systems where the PXA may be a target on the 521 is necessary for systems where the PXA may be a target on the
522 I2C bus. 522 I2C bus.
523 523
524config HAVE_S3C2410_I2C
525 bool
526 help
527 This will include I2C support for Samsung SoCs. If you want to
528 include I2C support for any machine, kindly select this in the
529 respective Kconfig file.
530
524config I2C_S3C2410 531config I2C_S3C2410
525 tristate "S3C2410 I2C Driver" 532 tristate "S3C2410 I2C Driver"
526 depends on ARCH_S3C2410 || ARCH_S3C64XX 533 depends on HAVE_S3C2410_I2C
527 help 534 help
528 Say Y here to include support for I2C controller in the 535 Say Y here to include support for I2C controller in the
529 Samsung S3C2410 based System-on-Chip devices. 536 Samsung SoCs.
530 537
531config I2C_S6000 538config I2C_S6000
532 tristate "S6000 I2C support" 539 tristate "S6000 I2C support"