aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorBalaji Rao <balajirrao@openmoko.org>2009-03-02 10:45:56 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-02 10:45:56 +0000
commita6af63e826b79ae1ba2d8cbfa66805cc2dfe367c (patch)
tree920c884b8aef9422b80cf2e5279d51a940836d13 /arch/arm/mach-s3c2410
parent86247495c3d585349e2a43de416d9275a48bda8c (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-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/spi-gpio.h8
-rw-r--r--arch/arm/mach-s3c2410/mach-gta01.c3
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
index 2506b4ca028..0ff8949b244 100644
--- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
@@ -22,14 +22,6 @@ struct s3c2410_spigpio_info {
int bus_num;
int non_blocking_transfer;
- /*
- * 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 s3c2410_spigpio_info *spi, int csid, int cs);
};
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index d424211b9d6..f1ceeec0508 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -801,8 +801,6 @@ static struct s3c2410_spigpio_info spi_gpio_cfg = {
.pin_clk = S3C2410_GPG7,
.pin_mosi = S3C2410_GPG6,
.pin_miso = S3C2410_GPG5,
- .board_size = ARRAY_SIZE(gta01_spi_board_info),
- .board_info = gta01_spi_board_info,
.chip_select = &spi_gpio_cs,
.num_chipselect = 2, /*** Should be 1 or 2 for gta01? ***/
};
@@ -983,6 +981,7 @@ static void __init gta01_machine_init(void)
}
mangle_pmu_pdata_by_system_rev();
i2c_register_board_info(0, gta01_i2c_devs, ARRAY_SIZE(gta01_i2c_devs));
+ spi_register_board_info(gta01_spi_board_info, ARRAY_SIZE(gta01_spi_board_info));
platform_device_register(&gta01_led_dev);