aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-01-22 13:59:08 +0100
committerLars-Peter Clausen <lars@metafoo.de>2010-01-22 13:59:08 +0100
commite447c3d0b2ddaf8c2e98c9819d1c545ae7274f20 (patch)
tree7d719168447feb267613cb5105735dca5093c5fc /arch
parent159b90922d47078834dda75f3efab63c1bbecab6 (diff)
parent1fd0ee3998c4ea542b3990b80e1bd8663ca28fe7 (diff)
Merge branch 'gta02-machine-devices-2.6.32' into om-gta02-2.6.32
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index 74bd5564ec8..269e03e3117 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -51,6 +51,7 @@
#include <linux/i2c.h>
#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
#include <linux/mfd/pcf50633/core.h>
#include <linux/mfd/pcf50633/mbc.h>
@@ -210,12 +211,6 @@ static struct platform_device spigpio_device = {
},
};
-static void gta02_glamo_registered(struct device *dev)
-{
- spigpio_device.dev.parent = dev;
- platform_device_register(&spigpio_device);
-}
-
static struct fb_videomode gta02_glamo_modes[] = {
{
.name = "480x640",
@@ -518,6 +513,8 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
.backlight_data = &gta02_backlight_data,
+ .gpio_base = GTA02_GPIO_PCF_BASE,
+
.reg_init_data = {
[PCF50633_REGULATOR_AUTO] = {
.constraints = {
@@ -1109,7 +1106,6 @@ static struct platform_device *gta02_devices[] __initdata = {
&gta02_pwm_leds_device,
&gta02_pm_gps_dev,
&gta02_pm_bt_dev,
- &gta02_pm_gsm_dev,
&gta02_pm_wlan_dev,
&s3c_device_adc,
};
@@ -1184,6 +1180,11 @@ static struct gta02_device_children gta02_device_children[] = {
.children = gta02_glamo_gpio_children,
},
{
+ .dev_name = "glamo-gpio.0",
+ .num_children = 1,
+ .children = gta02_glamo_gpio_children,
+ },
+ {
.dev_name = "hdq.0",
.num_children = 1,
.children = gta02_hdq_children,
@@ -1341,6 +1342,9 @@ static void __init gta02_machine_init(void)
s3c_device_ts.name = "s3c2440-ts";
+ bus_register_notifier(&platform_bus_type, &gta02_device_register_notifier);
+ bus_register_notifier(&spi_bus_type, &gta02_device_register_notifier);
+
gta02_hijack_gpb();
gta02_request_gpios();