Skip to content

Commit da49252

Browse files
pmundtpmundt
committed
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
Conflicts: arch/arm/mach-omap2/board-overo.c Signed-off-by: Paul Mundt <[email protected]>
2 parents eddecbb + b295d6e commit da49252

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+5323
-1362
lines changed

‎MAINTAINERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -4542,14 +4542,14 @@ S: Maintained
45424542
F: sound/soc/omap/
45434543

45444544
OMAP FRAMEBUFFER SUPPORT
4545-
M: Tomi Valkeinen <tomi.valkeinen@nokia.com>
4545+
M: Tomi Valkeinen <tomi.valkeinen@ti.com>
45464546
L: [email protected]
45474547
L: [email protected]
45484548
S: Maintained
45494549
F: drivers/video/omap/
45504550

45514551
OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
4552-
M: Tomi Valkeinen <tomi.valkeinen@nokia.com>
4552+
M: Tomi Valkeinen <tomi.valkeinen@ti.com>
45534553
L: [email protected]
45544554
L: [email protected]
45554555
S: Maintained

‎arch/arm/configs/omap2plus_defconfig

+11
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,17 @@ CONFIG_FIRMWARE_EDID=y
193193
CONFIG_FB_MODE_HELPERS=y
194194
CONFIG_FB_TILEBLITTING=y
195195
CONFIG_FB_OMAP_LCD_VGA=y
196+
CONFIG_OMAP2_DSS=m
197+
CONFIG_OMAP2_DSS_RFBI=y
198+
CONFIG_OMAP2_DSS_SDI=y
199+
CONFIG_OMAP2_DSS_DSI=y
200+
CONFIG_FB_OMAP2=m
201+
CONFIG_PANEL_GENERIC_DPI=m
202+
CONFIG_PANEL_SHARP_LS037V7DW01=m
203+
CONFIG_PANEL_NEC_NL8048HL11_01B=m
204+
CONFIG_PANEL_TAAL=m
205+
CONFIG_PANEL_TPO_TD043MTEA1=m
206+
CONFIG_PANEL_ACX565AKM=m
196207
CONFIG_BACKLIGHT_LCD_SUPPORT=y
197208
CONFIG_LCD_CLASS_DEVICE=y
198209
CONFIG_LCD_PLATFORM=y

‎arch/arm/mach-omap2/board-3430sdp.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,6 @@ static struct omap_dss_board_info sdp3430_dss_data = {
307307
.default_device = &sdp3430_lcd_device,
308308
};
309309

310-
static struct regulator_consumer_supply sdp3430_vdda_dac_supply =
311-
REGULATOR_SUPPLY("vdda_dac", "omapdss");
312-
313310
static struct omap_board_config_kernel sdp3430_config[] __initdata = {
314311
};
315312

@@ -398,12 +395,13 @@ static struct regulator_consumer_supply sdp3430_vaux3_supplies[] = {
398395
};
399396

400397
static struct regulator_consumer_supply sdp3430_vdda_dac_supplies[] = {
401-
REGULATOR_SUPPLY("vdda_dac", "omapdss"),
398+
REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),
402399
};
403400

404401
/* VPLL2 for digital video outputs */
405402
static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {
406403
REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
404+
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
407405
};
408406

409407
static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {

‎arch/arm/mach-omap2/board-4430sdp.c

+75
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include <plat/usb.h>
3737
#include <plat/mmc.h>
3838
#include <plat/omap4-keypad.h>
39+
#include <plat/display.h>
3940

4041
#include "mux.h"
4142
#include "hsmmc.h"
@@ -47,6 +48,8 @@
4748
#define ETH_KS8851_QUART 138
4849
#define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO 184
4950
#define OMAP4_SFH7741_ENABLE_GPIO 188
51+
#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
52+
#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
5053

5154
static const int sdp4430_keymap[] = {
5255
KEY(0, 0, KEY_E),
@@ -621,6 +624,76 @@ static void __init omap_sfh7741prox_init(void)
621624
}
622625
}
623626

627+
static void sdp4430_hdmi_mux_init(void)
628+
{
629+
/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
630+
omap_mux_init_signal("hdmi_hpd",
631+
OMAP_PIN_INPUT_PULLUP);
632+
omap_mux_init_signal("hdmi_cec",
633+
OMAP_PIN_INPUT_PULLUP);
634+
/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
635+
omap_mux_init_signal("hdmi_ddc_scl",
636+
OMAP_PIN_INPUT_PULLUP);
637+
omap_mux_init_signal("hdmi_ddc_sda",
638+
OMAP_PIN_INPUT_PULLUP);
639+
}
640+
641+
static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
642+
{
643+
int status;
644+
645+
status = gpio_request_one(HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH,
646+
"hdmi_gpio_hpd");
647+
if (status) {
648+
pr_err("Cannot request GPIO %d\n", HDMI_GPIO_HPD);
649+
return status;
650+
}
651+
status = gpio_request_one(HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH,
652+
"hdmi_gpio_ls_oe");
653+
if (status) {
654+
pr_err("Cannot request GPIO %d\n", HDMI_GPIO_LS_OE);
655+
goto error1;
656+
}
657+
658+
return 0;
659+
660+
error1:
661+
gpio_free(HDMI_GPIO_HPD);
662+
663+
return status;
664+
}
665+
666+
static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
667+
{
668+
gpio_free(HDMI_GPIO_LS_OE);
669+
gpio_free(HDMI_GPIO_HPD);
670+
}
671+
672+
static struct omap_dss_device sdp4430_hdmi_device = {
673+
.name = "hdmi",
674+
.driver_name = "hdmi_panel",
675+
.type = OMAP_DISPLAY_TYPE_HDMI,
676+
.platform_enable = sdp4430_panel_enable_hdmi,
677+
.platform_disable = sdp4430_panel_disable_hdmi,
678+
.channel = OMAP_DSS_CHANNEL_DIGIT,
679+
};
680+
681+
static struct omap_dss_device *sdp4430_dss_devices[] = {
682+
&sdp4430_hdmi_device,
683+
};
684+
685+
static struct omap_dss_board_info sdp4430_dss_data = {
686+
.num_devices = ARRAY_SIZE(sdp4430_dss_devices),
687+
.devices = sdp4430_dss_devices,
688+
.default_device = &sdp4430_hdmi_device,
689+
};
690+
691+
void omap_4430sdp_display_init(void)
692+
{
693+
sdp4430_hdmi_mux_init();
694+
omap_display_init(&sdp4430_dss_data);
695+
}
696+
624697
#ifdef CONFIG_OMAP_MUX
625698
static struct omap_board_mux board_mux[] __initdata = {
626699
OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
@@ -729,6 +802,8 @@ static void __init omap_4430sdp_init(void)
729802
status = omap4_keyboard_init(&sdp4430_keypad_data);
730803
if (status)
731804
pr_err("Keypad initialization failed: %d\n", status);
805+
806+
omap_4430sdp_display_init();
732807
}
733808

734809
static void __init omap_4430sdp_map_io(void)

‎arch/arm/mach-omap2/board-cm-t35.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ static struct regulator_consumer_supply cm_t35_vsim_supply = {
488488
};
489489

490490
static struct regulator_consumer_supply cm_t35_vdac_supply =
491-
REGULATOR_SUPPLY("vdda_dac", "omapdss");
491+
REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");
492492

493493
static struct regulator_consumer_supply cm_t35_vdvi_supply =
494494
REGULATOR_SUPPLY("vdvi", "omapdss");

‎arch/arm/mach-omap2/board-devkit8000.c

+7-5
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ static struct omap_dss_board_info devkit8000_dss_data = {
196196
};
197197

198198
static struct regulator_consumer_supply devkit8000_vdda_dac_supply =
199-
REGULATOR_SUPPLY("vdda_dac", "omapdss");
199+
REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");
200200

201201
static uint32_t board_keymap[] = {
202202
KEY(0, 0, KEY_1),
@@ -277,8 +277,10 @@ static struct twl4030_gpio_platform_data devkit8000_gpio_data = {
277277
.setup = devkit8000_twl_gpio_setup,
278278
};
279279

280-
static struct regulator_consumer_supply devkit8000_vpll1_supply =
281-
REGULATOR_SUPPLY("vdds_dsi", "omapdss");
280+
static struct regulator_consumer_supply devkit8000_vpll1_supplies[] = {
281+
REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
282+
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
283+
};
282284

283285
/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
284286
static struct regulator_init_data devkit8000_vmmc1 = {
@@ -319,8 +321,8 @@ static struct regulator_init_data devkit8000_vpll1 = {
319321
.valid_ops_mask = REGULATOR_CHANGE_MODE
320322
| REGULATOR_CHANGE_STATUS,
321323
},
322-
.num_consumer_supplies = 1,
323-
.consumer_supplies = &devkit8000_vpll1_supply,
324+
.num_consumer_supplies = ARRAY_SIZE(devkit8000_vpll1_supplies),
325+
.consumer_supplies = devkit8000_vpll1_supplies,
324326
};
325327

326328
/* VAUX4 for ads7846 and nubs */

‎arch/arm/mach-omap2/board-igep0020.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,10 @@ static struct omap_dss_board_info igep2_dss_data = {
485485
.default_device = &igep2_dvi_device,
486486
};
487487

488-
static struct regulator_consumer_supply igep2_vpll2_supply =
489-
REGULATOR_SUPPLY("vdds_dsi", "omapdss");
488+
static struct regulator_consumer_supply igep2_vpll2_supplies[] = {
489+
REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
490+
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
491+
};
490492

491493
static struct regulator_init_data igep2_vpll2 = {
492494
.constraints = {
@@ -499,8 +501,8 @@ static struct regulator_init_data igep2_vpll2 = {
499501
.valid_ops_mask = REGULATOR_CHANGE_MODE
500502
| REGULATOR_CHANGE_STATUS,
501503
},
502-
.num_consumer_supplies = 1,
503-
.consumer_supplies = &igep2_vpll2_supply,
504+
.num_consumer_supplies = ARRAY_SIZE(igep2_vpll2_supplies),
505+
.consumer_supplies = igep2_vpll2_supplies,
504506
};
505507

506508
static void __init igep2_display_init(void)

‎arch/arm/mach-omap2/board-omap3beagle.c

+7-5
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,12 @@ static struct omap_dss_board_info beagle_dss_data = {
232232
};
233233

234234
static struct regulator_consumer_supply beagle_vdac_supply =
235-
REGULATOR_SUPPLY("vdda_dac", "omapdss");
235+
REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");
236236

237-
static struct regulator_consumer_supply beagle_vdvi_supply =
238-
REGULATOR_SUPPLY("vdds_dsi", "omapdss");
237+
static struct regulator_consumer_supply beagle_vdvi_supplies[] = {
238+
REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
239+
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
240+
};
239241

240242
static void __init beagle_display_init(void)
241243
{
@@ -422,8 +424,8 @@ static struct regulator_init_data beagle_vpll2 = {
422424
.valid_ops_mask = REGULATOR_CHANGE_MODE
423425
| REGULATOR_CHANGE_STATUS,
424426
},
425-
.num_consumer_supplies = 1,
426-
.consumer_supplies = &beagle_vdvi_supply,
427+
.num_consumer_supplies = ARRAY_SIZE(beagle_vdvi_supplies),
428+
.consumer_supplies = beagle_vdvi_supplies,
427429
};
428430

429431
static struct twl4030_usb_data beagle_usb_data = {

‎arch/arm/mach-omap2/board-omap3evm.c

+7-5
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ static struct twl4030_codec_data omap3evm_codec_data = {
542542
};
543543

544544
static struct regulator_consumer_supply omap3_evm_vdda_dac_supply =
545-
REGULATOR_SUPPLY("vdda_dac", "omapdss");
545+
REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");
546546

547547
/* VDAC for DSS driving S-Video */
548548
static struct regulator_init_data omap3_evm_vdac = {
@@ -560,8 +560,10 @@ static struct regulator_init_data omap3_evm_vdac = {
560560
};
561561

562562
/* VPLL2 for digital video outputs */
563-
static struct regulator_consumer_supply omap3_evm_vpll2_supply =
564-
REGULATOR_SUPPLY("vdds_dsi", "omapdss");
563+
static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = {
564+
REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
565+
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
566+
};
565567

566568
static struct regulator_init_data omap3_evm_vpll2 = {
567569
.constraints = {
@@ -573,8 +575,8 @@ static struct regulator_init_data omap3_evm_vpll2 = {
573575
.valid_ops_mask = REGULATOR_CHANGE_MODE
574576
| REGULATOR_CHANGE_STATUS,
575577
},
576-
.num_consumer_supplies = 1,
577-
.consumer_supplies = &omap3_evm_vpll2_supply,
578+
.num_consumer_supplies = ARRAY_SIZE(omap3_evm_vpll2_supplies),
579+
.consumer_supplies = omap3_evm_vpll2_supplies,
578580
};
579581

580582
/* ads7846 on SPI */

‎arch/arm/mach-omap2/board-omap3pandora.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,12 @@ static struct regulator_consumer_supply pandora_vmmc3_supply =
342342
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.2");
343343

344344
static struct regulator_consumer_supply pandora_vdda_dac_supply =
345-
REGULATOR_SUPPLY("vdda_dac", "omapdss");
345+
REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");
346346

347347
static struct regulator_consumer_supply pandora_vdds_supplies[] = {
348348
REGULATOR_SUPPLY("vdds_sdi", "omapdss"),
349349
REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
350+
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
350351
};
351352

352353
static struct regulator_consumer_supply pandora_vcc_lcd_supply =

‎arch/arm/mach-omap2/board-omap3stalker.c

+7-5
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ static struct twl4030_codec_data omap3stalker_codec_data = {
439439
};
440440

441441
static struct regulator_consumer_supply omap3_stalker_vdda_dac_supply =
442-
REGULATOR_SUPPLY("vdda_dac", "omapdss");
442+
REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");
443443

444444
/* VDAC for DSS driving S-Video */
445445
static struct regulator_init_data omap3_stalker_vdac = {
@@ -457,8 +457,10 @@ static struct regulator_init_data omap3_stalker_vdac = {
457457
};
458458

459459
/* VPLL2 for digital video outputs */
460-
static struct regulator_consumer_supply omap3_stalker_vpll2_supply =
461-
REGULATOR_SUPPLY("vdds_dsi", "omapdss");
460+
static struct regulator_consumer_supply omap3_stalker_vpll2_supplies[] = {
461+
REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
462+
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
463+
};
462464

463465
static struct regulator_init_data omap3_stalker_vpll2 = {
464466
.constraints = {
@@ -471,8 +473,8 @@ static struct regulator_init_data omap3_stalker_vpll2 = {
471473
.valid_ops_mask = REGULATOR_CHANGE_MODE
472474
| REGULATOR_CHANGE_STATUS,
473475
},
474-
.num_consumer_supplies = 1,
475-
.consumer_supplies = &omap3_stalker_vpll2_supply,
476+
.num_consumer_supplies = ARRAY_SIZE(omap3_stalker_vpll2_supplies),
477+
.consumer_supplies = omap3_stalker_vpll2_supplies,
476478
};
477479

478480
static struct twl4030_platform_data omap3stalker_twldata = {

0 commit comments

Comments
 (0)