aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-01-22 12:27:16 +0100
committerLars-Peter Clausen <lars@metafoo.de>2010-01-22 12:27:16 +0100
commitb7aba0ffec6c26230c452b8970903850009b4e73 (patch)
tree24a7a2b0c7ea344e4f342510e615c55e11ead0a1 /arch/arm
parent9f937436d9efb6e812e0d19008011f1c661209a5 (diff)
Replace glamo gpio probe callback with generic solution.
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index b182c3392a2..575064988da 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -259,7 +259,6 @@ static struct glamo_mmc_platform_data gta02_glamo_mmc_pdata = {
static struct glamo_gpio_platform_data gta02_glamo_gpio_pdata = {
.base = GTA02_GPIO_GLAMO_BASE,
- .registered = gta02_glamo_registered,
};
static struct glamo_platform_data gta02_glamo_pdata = {
@@ -1129,11 +1128,20 @@ struct gta02_device_children {
void (*probed_callback)(struct device *dev);
};
+static struct platform_device* gta02_glamo_gpio_children[] = {
+ &spigpio_device,
+};
+
static struct platform_device* gta02_hdq_children[] = {
&bq27000_battery_device,
};
static struct gta02_device_children gta02_device_children[] = {
+ {
+ .dev_name = "glamo-gpio.0",
+ .num_children = 1,
+ .children = gta02_glamo_gpio_children,
+ },
{
.dev_name = "hdq.0",
.num_children = 1,