X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ca9c31d8ca049247c66033d5d4bc50958c260750..b119deb2b0f1bbabc80d3138c98c2ab31b8728b9:/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c

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 f099c6446..3bd404b79 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
@@ -535,16 +535,9 @@ static struct regulator_consumer_supply ldo5_consumers[] = {
 	},
 };
 
-/*
- * We need this dummy thing to fill the regulator consumers
- */
-static struct platform_device gta02_mmc_dev = {
-	/* details filled in by glamo core */
-};
-
 static struct regulator_consumer_supply hcldo_consumers[] = {
 	{
-		.dev = &gta02_mmc_dev.dev,
+		.dev = &gta02_glamo_dev.dev,
 		.supply = "SD_3V3",
 	},
 };
@@ -580,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,
@@ -594,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,
@@ -606,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,
 				},
@@ -683,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,
@@ -1089,8 +1086,8 @@ static struct platform_device gta02_bl_dev = {
 
 static void gta02_jbt6k74_reset(int devidx, int level)
 {
-	glamo_lcm_reset(level);
-}	
+	glamo_lcm_reset(&gta02_glamo_dev, level);
+}
 
 static void gta02_jbt6k74_probe_completed(struct device *dev)
 {
@@ -1111,13 +1108,6 @@ const struct jbt6k74_platform_data jbt6k74_pdata = {
 	.probe_completed = gta02_jbt6k74_probe_completed,
 };
 
-#if 0 /* currently this is not used and we use gpio spi */
-static struct glamo_spi_info glamo_spi_cfg = {
-	.board_size	= ARRAY_SIZE(gta02_spi_board_info),
-	.board_info	= gta02_spi_board_info,
-};
-#endif /* 0 */
-
 static struct glamo_spigpio_info glamo_spigpio_cfg = {
 	.pin_clk	= GLAMO_GPIO10_OUTPUT,
 	.pin_mosi	= GLAMO_GPIO11_OUTPUT,
@@ -1431,16 +1421,13 @@ static struct fb_videomode gta02_glamo_modes[] = {
 static struct glamofb_platform_data gta02_glamo_pdata = {
 	.width		= 43,
 	.height		= 58,
-	.fb_mem_size	= 0x400000, /* glamo has 8 megs of SRAM. we use 4 */
 
 	.num_modes = ARRAY_SIZE(gta02_glamo_modes),
 	.modes = gta02_glamo_modes,
 
-	//.spi_info	= &glamo_spi_cfg,
 	.spigpio_info	= &glamo_spigpio_cfg,
 
 	/* glamo MMC function platform data */
-	.mmc_dev = &gta02_mmc_dev,
 	.glamo_can_set_mci_power = gta02_glamo_can_set_mmc_power,
 	.glamo_mci_use_slow = gta02_glamo_mci_use_slow,
 	.glamo_irq_is_wired = glamo_irq_is_wired,
@@ -1604,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)
@@ -1656,7 +1643,7 @@ static void __init gta02_machine_init(void)
 	s3c24xx_udc_set_platdata(&gta02_udc_cfg);
 	s3c_i2c0_set_platdata(NULL);
 	set_s3c2410ts_info(&gta02_ts_cfg);
-	
+
 	mangle_glamo_res_by_system_rev();
 
 	i2c_register_board_info(0, gta02_i2c_devs, ARRAY_SIZE(gta02_i2c_devs));
@@ -1696,7 +1683,7 @@ static void __init gta02_machine_init(void)
 	platform_device_register(&gta02_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(&gta02_vibrator_dev);
 #endif
 }