From b119deb2b0f1bbabc80d3138c98c2ab31b8728b9 Mon Sep 17 00:00:00 2001 From: lars Date: Thu, 16 Jul 2009 10:00:27 +0000 Subject: [s3c24xx] mach_gta02: Add some missing always_on regulator constraints and declare regulator constraints to be fully specified. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16859 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'target/linux/s3c24xx/files-2.6.30/arch') diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c index 2ad941e4d0..3bd404b798 100644 --- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c +++ b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c @@ -573,6 +573,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .max_uV = 3300000, .valid_modes_mask = REGULATOR_MODE_NORMAL, .boot_on = 1, + .always_on = 1, .apply_uV = 1, .state_mem = { .enabled = 1, @@ -587,6 +588,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .max_uV = 1600000, .valid_modes_mask = REGULATOR_MODE_NORMAL, .boot_on = 1, + .always_on = 1, .apply_uV = 1, }, .num_consumer_supplies = 0, @@ -599,6 +601,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .valid_modes_mask = REGULATOR_MODE_NORMAL, .apply_uV = 1, .boot_on = 1, + .always_on = 1, .state_mem = { .enabled = 1, }, @@ -676,6 +679,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .name = "LCM_3V", .min_uV = 0, .max_uV = 3300000, + .always_on = 1, .valid_modes_mask = REGULATOR_MODE_NORMAL, }, .num_consumer_supplies = 0, @@ -1083,7 +1087,7 @@ static struct platform_device gta02_bl_dev = { static void gta02_jbt6k74_reset(int devidx, int level) { glamo_lcm_reset(>a02_glamo_dev, level); -} +} static void gta02_jbt6k74_probe_completed(struct device *dev) { @@ -1587,7 +1591,7 @@ static void gta02_pmu_attach_child_devices(struct pcf50633 *pcf) platform_add_devices(gta02_devices_pmu_children, ARRAY_SIZE(gta02_devices_pmu_children)); -/* regulator_has_full_constraints();*/ + regulator_has_full_constraints(); } static void gta02_poweroff(void) @@ -1639,7 +1643,7 @@ static void __init gta02_machine_init(void) s3c24xx_udc_set_platdata(>a02_udc_cfg); s3c_i2c0_set_platdata(NULL); set_s3c2410ts_info(>a02_ts_cfg); - + mangle_glamo_res_by_system_rev(); i2c_register_board_info(0, gta02_i2c_devs, ARRAY_SIZE(gta02_i2c_devs)); @@ -1679,7 +1683,7 @@ static void __init gta02_machine_init(void) platform_device_register(>a02_hdq_device); #endif #ifdef CONFIG_LEDS_GTA02_VIBRATOR - gta02_vibrator_dev.dev.parent = &s3c24xx_pwm_device.dev; + gta02_vibrator_dev.dev.parent = &s3c24xx_pwm_device.dev; platform_device_register(>a02_vibrator_dev); #endif } -- cgit v1.2.3