diff options
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smdk6410.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index 2c0353a8090..ecbea92bf83 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -48,7 +48,6 @@ | |||
48 | #include <asm/mach/irq.h> | 48 | #include <asm/mach/irq.h> |
49 | 49 | ||
50 | #include <mach/hardware.h> | 50 | #include <mach/hardware.h> |
51 | #include <mach/regs-fb.h> | ||
52 | #include <mach/map.h> | 51 | #include <mach/map.h> |
53 | 52 | ||
54 | #include <asm/irq.h> | 53 | #include <asm/irq.h> |
@@ -71,6 +70,8 @@ | |||
71 | #include <plat/adc.h> | 70 | #include <plat/adc.h> |
72 | #include <plat/ts.h> | 71 | #include <plat/ts.h> |
73 | #include <plat/keypad.h> | 72 | #include <plat/keypad.h> |
73 | #include <plat/backlight.h> | ||
74 | #include <plat/regs-fb-v4.h> | ||
74 | 75 | ||
75 | #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK | 76 | #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK |
76 | #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB | 77 | #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB |
@@ -209,17 +210,9 @@ static struct platform_device smdk6410_smsc911x = { | |||
209 | }; | 210 | }; |
210 | 211 | ||
211 | #ifdef CONFIG_REGULATOR | 212 | #ifdef CONFIG_REGULATOR |
212 | static struct regulator_consumer_supply smdk6410_b_pwr_5v_consumers[] = { | 213 | static struct regulator_consumer_supply smdk6410_b_pwr_5v_consumers[] __initdata = { |
213 | { | 214 | REGULATOR_SUPPLY("PVDD", "0-001b"), |
214 | /* WM8580 */ | 215 | REGULATOR_SUPPLY("AVDD", "0-001b"), |
215 | .supply = "PVDD", | ||
216 | .dev_name = "0-001b", | ||
217 | }, | ||
218 | { | ||
219 | /* WM8580 */ | ||
220 | .supply = "AVDD", | ||
221 | .dev_name = "0-001b", | ||
222 | }, | ||
223 | }; | 216 | }; |
224 | 217 | ||
225 | static struct regulator_init_data smdk6410_b_pwr_5v_data = { | 218 | static struct regulator_init_data smdk6410_b_pwr_5v_data = { |
@@ -337,16 +330,12 @@ static struct platform_device *smdk6410_devices[] __initdata = { | |||
337 | &s3c_device_rtc, | 330 | &s3c_device_rtc, |
338 | &s3c_device_ts, | 331 | &s3c_device_ts, |
339 | &s3c_device_wdt, | 332 | &s3c_device_wdt, |
340 | &s3c_device_timer[1], | ||
341 | &smdk6410_backlight_device, | ||
342 | }; | 333 | }; |
343 | 334 | ||
344 | #ifdef CONFIG_REGULATOR | 335 | #ifdef CONFIG_REGULATOR |
345 | /* ARM core */ | 336 | /* ARM core */ |
346 | static struct regulator_consumer_supply smdk6410_vddarm_consumers[] = { | 337 | static struct regulator_consumer_supply smdk6410_vddarm_consumers[] = { |
347 | { | 338 | REGULATOR_SUPPLY("vddarm", NULL), |
348 | .supply = "vddarm", | ||
349 | } | ||
350 | }; | 339 | }; |
351 | 340 | ||
352 | /* VDDARM, BUCK1 on J5 */ | 341 | /* VDDARM, BUCK1 on J5 */ |
@@ -484,11 +473,7 @@ static struct regulator_init_data wm8350_dcdc3_data = { | |||
484 | 473 | ||
485 | /* USB, EXT, PCM, ADC/DAC, USB, MMC */ | 474 | /* USB, EXT, PCM, ADC/DAC, USB, MMC */ |
486 | static struct regulator_consumer_supply wm8350_dcdc4_consumers[] = { | 475 | static struct regulator_consumer_supply wm8350_dcdc4_consumers[] = { |
487 | { | 476 | REGULATOR_SUPPLY("DVDD", "0-001b"), |
488 | /* WM8580 */ | ||
489 | .supply = "DVDD", | ||
490 | .dev_name = "0-001b", | ||
491 | }, | ||
492 | }; | 477 | }; |
493 | 478 | ||
494 | static struct regulator_init_data wm8350_dcdc4_data = { | 479 | static struct regulator_init_data wm8350_dcdc4_data = { |
@@ -599,7 +584,7 @@ static struct regulator_init_data wm1192_dcdc3 = { | |||
599 | }; | 584 | }; |
600 | 585 | ||
601 | static struct regulator_consumer_supply wm1192_ldo1_consumers[] = { | 586 | static struct regulator_consumer_supply wm1192_ldo1_consumers[] = { |
602 | { .supply = "DVDD", .dev_name = "0-001b", }, /* WM8580 */ | 587 | REGULATOR_SUPPLY("DVDD", "0-001b"), /* WM8580 */ |
603 | }; | 588 | }; |
604 | 589 | ||
605 | static struct regulator_init_data wm1192_ldo1 = { | 590 | static struct regulator_init_data wm1192_ldo1 = { |
@@ -679,6 +664,16 @@ static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { | |||
679 | .oversampling_shift = 2, | 664 | .oversampling_shift = 2, |
680 | }; | 665 | }; |
681 | 666 | ||
667 | /* LCD Backlight data */ | ||
668 | static struct samsung_bl_gpio_info smdk6410_bl_gpio_info = { | ||
669 | .no = S3C64XX_GPF(15), | ||
670 | .func = S3C_GPIO_SFN(2), | ||
671 | }; | ||
672 | |||
673 | static struct platform_pwm_backlight_data smdk6410_bl_data = { | ||
674 | .pwm_id = 1, | ||
675 | }; | ||
676 | |||
682 | static void __init smdk6410_map_io(void) | 677 | static void __init smdk6410_map_io(void) |
683 | { | 678 | { |
684 | u32 tmp; | 679 | u32 tmp; |
@@ -740,6 +735,8 @@ static void __init smdk6410_machine_init(void) | |||
740 | 735 | ||
741 | s3c_ide_set_platdata(&smdk6410_ide_pdata); | 736 | s3c_ide_set_platdata(&smdk6410_ide_pdata); |
742 | 737 | ||
738 | samsung_bl_set(&smdk6410_bl_gpio_info, &smdk6410_bl_data); | ||
739 | |||
743 | platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices)); | 740 | platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices)); |
744 | } | 741 | } |
745 | 742 | ||