diff options
| author | Balaji Rao <balajirrao@openmoko.org> | 2009-03-02 10:45:56 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-02 10:45:56 +0000 |
| commit | a6af63e826b79ae1ba2d8cbfa66805cc2dfe367c (patch) | |
| tree | 920c884b8aef9422b80cf2e5279d51a940836d13 /arch/arm/mach-s3c6410 | |
| parent | 86247495c3d585349e2a43de416d9275a48bda8c (diff) | |
Subject: Get rid of board_info information in glamo and s3c24xx_gpio spigpio_info.
X-Git-Url: http://git.openmoko.org/?p=kernel.git;a=commitdiff_plain;h=740c6704e830829d8539a6cc34346ff1980cd9ee
Get rid of board_info information in glamo and s3c24xx_gpio spigpio_info.
The board info does not belong there and has been removed. In
spi_s3c24xx_gpio, board_info has been removed in mainline.
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
Diffstat (limited to 'arch/arm/mach-s3c6410')
| -rw-r--r-- | arch/arm/mach-s3c6410/include/mach/spi-gpio.h | 8 | ||||
| -rw-r--r-- | arch/arm/mach-s3c6410/mach-om-gta03.c | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/mach-s3c6410/include/mach/spi-gpio.h b/arch/arm/mach-s3c6410/include/mach/spi-gpio.h index 35716ff0a1e..46ad9d67b24 100644 --- a/arch/arm/mach-s3c6410/include/mach/spi-gpio.h +++ b/arch/arm/mach-s3c6410/include/mach/spi-gpio.h @@ -21,14 +21,6 @@ struct s3c64xx_spigpio_info { int bus_num; int num_chipselect; - /* - * FIXME: board_size and board_info DO NOT belong here. - * These were already removed upstream... but we still rely on them - * so leave for now and revisit this. - */ - unsigned long board_size; - struct spi_board_info *board_info; - void (*chip_select)(struct s3c64xx_spigpio_info *spi, int csid, int cs); }; diff --git a/arch/arm/mach-s3c6410/mach-om-gta03.c b/arch/arm/mach-s3c6410/mach-om-gta03.c index 4f90239c646..4f4178a792f 100644 --- a/arch/arm/mach-s3c6410/mach-om-gta03.c +++ b/arch/arm/mach-s3c6410/mach-om-gta03.c @@ -998,10 +998,9 @@ static struct s3c64xx_spigpio_info spi_gpio_cfg = { .pin_clk = GTA03_GPIO_LCM_CLK, .pin_mosi = GTA03_GPIO_LCM_MOSI, /* no pinout to MISO */ - .board_size = ARRAY_SIZE(gta03_spi_board_info), - .board_info = gta03_spi_board_info, .chip_select = &spi_gpio_cs, .num_chipselect = 1, + .bus_num = 1, }; struct platform_device gta03_device_spi_lcm = { @@ -1044,6 +1043,9 @@ static void __init om_gta03_machine_init(void) i2c_register_board_info(0, om_gta03_i2c_devs, ARRAY_SIZE(om_gta03_i2c_devs)); + spi_register_board_info(gta03_spi_board_info, + ARRAY_SIZE(gta03_spi_board_info)); + platform_add_devices(om_gta03_devices, ARRAY_SIZE(om_gta03_devices)); /* Register the HDQ and vibrator as children of pwm device */ |