diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2010-05-12 04:27:29 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:21:21 -0400 |
| commit | baeb73e8027b8a62b32c11afc3035cf6cc0927dd (patch) | |
| tree | 84fb91c577fcce2841c4f9a7c278444c009ccc0d | |
| parent | b91da669472a534328bf796a8c913f2d042ede76 (diff) | |
omap4: Add i2c board support on omap4430 sdp platform
This patch adds the i2c board support for OMAP4430 SDP platform.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/configs/omap_4430sdp_defconfig | 46 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 14 |
2 files changed, 58 insertions, 2 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig index d87a349ed6f7..a5553055f428 100644 --- a/arch/arm/configs/omap_4430sdp_defconfig +++ b/arch/arm/configs/omap_4430sdp_defconfig | |||
| @@ -490,14 +490,58 @@ CONFIG_HW_RANDOM=y | |||
| 490 | # CONFIG_R3964 is not set | 490 | # CONFIG_R3964 is not set |
| 491 | # CONFIG_RAW_DRIVER is not set | 491 | # CONFIG_RAW_DRIVER is not set |
| 492 | # CONFIG_TCG_TPM is not set | 492 | # CONFIG_TCG_TPM is not set |
| 493 | # CONFIG_I2C is not set | 493 | CONFIG_I2C=y |
| 494 | CONFIG_I2C_BOARDINFO=y | ||
| 495 | CONFIG_I2C_COMPAT=y | ||
| 496 | CONFIG_I2C_CHARDEV=y | ||
| 497 | CONFIG_I2C_HELPER_AUTO=y | ||
| 498 | |||
| 499 | # | ||
| 500 | # I2C Hardware Bus support | ||
| 501 | # | ||
| 502 | |||
| 503 | # | ||
| 504 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 505 | # | ||
| 506 | # CONFIG_I2C_DESIGNWARE is not set | ||
| 507 | # CONFIG_I2C_GPIO is not set | ||
| 508 | # CONFIG_I2C_OCORES is not set | ||
| 509 | CONFIG_I2C_OMAP=y | ||
| 510 | # CONFIG_I2C_SIMTEC is not set | ||
| 511 | # CONFIG_I2C_XILINX is not set | ||
| 512 | |||
| 513 | # | ||
| 514 | # External I2C/SMBus adapter drivers | ||
| 515 | # | ||
| 516 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 517 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 518 | |||
| 519 | # | ||
| 520 | # Other I2C/SMBus bus drivers | ||
| 521 | # | ||
| 522 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 523 | # CONFIG_I2C_STUB is not set | ||
| 524 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 525 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 526 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 494 | CONFIG_SPI=y | 527 | CONFIG_SPI=y |
| 528 | # CONFIG_SPI_DEBUG is not set | ||
| 495 | CONFIG_SPI_MASTER=y | 529 | CONFIG_SPI_MASTER=y |
| 496 | 530 | ||
| 497 | # | 531 | # |
| 498 | # SPI Master Controller Drivers | 532 | # SPI Master Controller Drivers |
| 499 | # | 533 | # |
| 534 | # CONFIG_SPI_BITBANG is not set | ||
| 535 | # CONFIG_SPI_GPIO is not set | ||
| 500 | CONFIG_SPI_OMAP24XX=y | 536 | CONFIG_SPI_OMAP24XX=y |
| 537 | # CONFIG_SPI_XILINX is not set | ||
| 538 | # CONFIG_SPI_DESIGNWARE is not set | ||
| 539 | |||
| 540 | # | ||
| 541 | # SPI Protocol Masters | ||
| 542 | # | ||
| 543 | # CONFIG_SPI_SPIDEV is not set | ||
| 544 | # CONFIG_SPI_TLE62X0 is not set | ||
| 501 | 545 | ||
| 502 | # | 546 | # |
| 503 | # PPS support | 547 | # PPS support |
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 6cce6f229799..41fed9235f81 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
| @@ -135,11 +135,23 @@ static struct omap_musb_board_data musb_board_data = { | |||
| 135 | .mode = MUSB_PERIPHERAL, | 135 | .mode = MUSB_PERIPHERAL, |
| 136 | .power = 100, | 136 | .power = 100, |
| 137 | }; | 137 | }; |
| 138 | 138 | static int __init omap4_i2c_init(void) | |
| 139 | { | ||
| 140 | /* | ||
| 141 | * Phoenix Audio IC needs I2C1 to | ||
| 142 | * start with 400 KHz or less | ||
| 143 | */ | ||
| 144 | omap_register_i2c_bus(1, 400, NULL, 0); | ||
| 145 | omap_register_i2c_bus(2, 400, NULL, 0); | ||
| 146 | omap_register_i2c_bus(3, 400, NULL, 0); | ||
| 147 | omap_register_i2c_bus(4, 400, NULL, 0); | ||
| 148 | return 0; | ||
| 149 | } | ||
| 139 | static void __init omap_4430sdp_init(void) | 150 | static void __init omap_4430sdp_init(void) |
| 140 | { | 151 | { |
| 141 | int status; | 152 | int status; |
| 142 | 153 | ||
| 154 | omap4_i2c_init(); | ||
| 143 | platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); | 155 | platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); |
| 144 | omap_serial_init(); | 156 | omap_serial_init(); |
| 145 | /* OMAP4 SDP uses internal transceiver so register nop transceiver */ | 157 | /* OMAP4 SDP uses internal transceiver so register nop transceiver */ |
