diff options
author | Tomasz Stanislawski <t.stanislaws@samsung.com> | 2011-09-16 05:48:52 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 05:58:35 -0400 |
commit | b74f2fb5147baea65f554afcc73e3688e49b8112 (patch) | |
tree | ac624ddf893b5876ba1236e2e82242faa4fe8081 /arch/arm/mach-s5pv210 | |
parent | d737cf29bfb60ad5c881a8a43fd4d7b38c2a1ee9 (diff) |
ARM: S5PV210: enable TV support on GONI board
This patch adds platform devices and regulators for TV devices on
Samsung Goni board.
Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index d960090e4656..18f3a6815e54 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
@@ -94,6 +94,7 @@ config MACH_GONI | |||
94 | select S3C_DEV_USB_HSOTG | 94 | select S3C_DEV_USB_HSOTG |
95 | select S5P_DEV_ONENAND | 95 | select S5P_DEV_ONENAND |
96 | select SAMSUNG_DEV_KEYPAD | 96 | select SAMSUNG_DEV_KEYPAD |
97 | select S5P_DEV_TV | ||
97 | select S5PV210_SETUP_FB_24BPP | 98 | select S5PV210_SETUP_FB_24BPP |
98 | select S5PV210_SETUP_I2C1 | 99 | select S5PV210_SETUP_I2C1 |
99 | select S5PV210_SETUP_I2C2 | 100 | select S5PV210_SETUP_I2C2 |
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index 85c2d51a0956..14578f567c83 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c | |||
@@ -285,6 +285,7 @@ static struct regulator_consumer_supply goni_ldo5_consumers[] = { | |||
285 | 285 | ||
286 | static struct regulator_consumer_supply goni_ldo8_consumers[] = { | 286 | static struct regulator_consumer_supply goni_ldo8_consumers[] = { |
287 | REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), | 287 | REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), |
288 | REGULATOR_SUPPLY("vdd33a_dac", "s5p-sdo"), | ||
288 | }; | 289 | }; |
289 | 290 | ||
290 | static struct regulator_consumer_supply goni_ldo11_consumers[] = { | 291 | static struct regulator_consumer_supply goni_ldo11_consumers[] = { |
@@ -475,6 +476,10 @@ static struct regulator_consumer_supply buck1_consumer = | |||
475 | static struct regulator_consumer_supply buck2_consumer = | 476 | static struct regulator_consumer_supply buck2_consumer = |
476 | REGULATOR_SUPPLY("vddint", NULL); | 477 | REGULATOR_SUPPLY("vddint", NULL); |
477 | 478 | ||
479 | static struct regulator_consumer_supply buck3_consumer = | ||
480 | REGULATOR_SUPPLY("vdet", "s5p-sdo"); | ||
481 | |||
482 | |||
478 | static struct regulator_init_data goni_buck1_data = { | 483 | static struct regulator_init_data goni_buck1_data = { |
479 | .constraints = { | 484 | .constraints = { |
480 | .name = "VARM_1.2V", | 485 | .name = "VARM_1.2V", |
@@ -511,6 +516,8 @@ static struct regulator_init_data goni_buck3_data = { | |||
511 | .enabled = 1, | 516 | .enabled = 1, |
512 | }, | 517 | }, |
513 | }, | 518 | }, |
519 | .num_consumer_supplies = 1, | ||
520 | .consumer_supplies = &buck3_consumer, | ||
514 | }; | 521 | }; |
515 | 522 | ||
516 | static struct regulator_init_data goni_buck4_data = { | 523 | static struct regulator_init_data goni_buck4_data = { |
@@ -812,6 +819,8 @@ static struct platform_device *goni_devices[] __initdata = { | |||
812 | &s5p_device_mfc, | 819 | &s5p_device_mfc, |
813 | &s5p_device_mfc_l, | 820 | &s5p_device_mfc_l, |
814 | &s5p_device_mfc_r, | 821 | &s5p_device_mfc_r, |
822 | &s5p_device_mixer, | ||
823 | &s5p_device_sdo, | ||
815 | &s3c_device_i2c0, | 824 | &s3c_device_i2c0, |
816 | &s5p_device_fimc0, | 825 | &s5p_device_fimc0, |
817 | &s5p_device_fimc1, | 826 | &s5p_device_fimc1, |