aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-01-22 13:57:23 +0100
committerLars-Peter Clausen <lars@metafoo.de>2010-01-22 13:57:23 +0100
commit1fd0ee3998c4ea542b3990b80e1bd8663ca28fe7 (patch)
tree1bd8f6a2b953c17179f968e9063c9295904a331e /arch
parent5dcc9e4e521eaa806dcfaa359a29ee7a3ee48dd5 (diff)
parent0f934952e071d73916be967d44a150c408edf2cb (diff)
Merge branch 'gta02-machine-2.6.32' into gta02-machine-devices-2.6.32
Conflicts: arch/arm/mach-s3c2442/include/mach/gta02.h arch/arm/mach-s3c2442/mach-gta02.c
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index 302a5f0cc59..9214699ac8d 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>
@@ -512,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 = {
@@ -1103,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,
};
@@ -1172,7 +1174,7 @@ static struct platform_device* gta02_hdq_children[] = {
};
static struct gta02_device_children gta02_device_children[] = {
- {
+ {
.dev_name = "glamo-gpio.0",
.num_children = 1,
.children = gta02_glamo_gpio_children,
@@ -1335,6 +1337,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();