Skip to content

Commit

Permalink
mfd/tc3589x: rename tc35892 structs/registers to tc359x
Browse files Browse the repository at this point in the history
Most of the register layout, client IRQ numbers on the TC35892 is shared also
by other variants. Make this generic as tc3589x

Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Sundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
  • Loading branch information
Sundar Iyer authored and Linus Walleij committed Dec 19, 2010
1 parent f4e8afd commit 20406eb
Show file tree
Hide file tree
Showing 4 changed files with 351 additions and 353 deletions.
12 changes: 5 additions & 7 deletions arch/arm/mach-ux500/board-mop500.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
#include <linux/amba/pl022.h>
#include <linux/spi/spi.h>
#include <linux/mfd/ab8500.h>
#include <linux/mfd/tc35892.h>
#include <linux/input/matrix_keypad.h>
#include <linux/mfd/tc3589x.h>

#include <asm/mach-types.h>
#include <asm/mach/arch.h>
Expand Down Expand Up @@ -112,24 +111,24 @@ static struct pl022_ssp_controller ssp0_platform_data = {
* TC35892
*/

static void mop500_tc35892_init(struct tc35892 *tc35892, unsigned int base)
static void mop500_tc35892_init(struct tc3589x *tc3589x, unsigned int base)
{
mop500_sdi_tc35892_init();
}

static struct tc35892_gpio_platform_data mop500_tc35892_gpio_data = {
static struct tc3589x_gpio_platform_data mop500_tc35892_gpio_data = {
.gpio_base = MOP500_EGPIO(0),
.setup = mop500_tc35892_init,
};

static struct tc35892_platform_data mop500_tc35892_data = {
static struct tc3589x_platform_data mop500_tc35892_data = {
.gpio = &mop500_tc35892_gpio_data,
.irq_base = MOP500_EGPIO_IRQ_BASE,
};

static struct i2c_board_info mop500_i2c0_devices[] = {
{
I2C_BOARD_INFO("tc35892", 0x42),
I2C_BOARD_INFO("tc3589x", 0x42),
.irq = NOMADIK_GPIO_TO_IRQ(217),
.platform_data = &mop500_tc35892_data,
},
Expand Down Expand Up @@ -302,7 +301,6 @@ static void __init u8500_init_machine(void)

nmk_config_pins(mop500_pins, ARRAY_SIZE(mop500_pins));

ux500_ske_keypad_device.dev.platform_data = &ske_keypad_board;
platform_add_devices(platform_devs, ARRAY_SIZE(platform_devs));

mop500_i2c_init();
Expand Down
Loading

0 comments on commit 20406eb

Please sign in to comment.