aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-01-22 13:46:37 +0100
committerLars-Peter Clausen <lars@metafoo.de>2010-01-22 13:51:07 +0100
commit0f934952e071d73916be967d44a150c408edf2cb (patch)
tree3cf7bf6ad6ba7bab0e1d2369119a94d5ec834c21 /arch
parent3c4a1161634e1b425c9f1154b1935c6b9f422394 (diff)
gta02: Those changes were lost during merging...
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index eb41ad901cf..3e0b12ac45d 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>
@@ -510,6 +511,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 = {
@@ -1055,7 +1058,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,
};
@@ -1275,6 +1277,9 @@ static void __init gta02_machine_init(void)
/* Set the panic callback to make AUX LED blink at ~5Hz. */
panic_blink = gta02_panic_blink;
+ 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();