Commit da49252f authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux 



Conflicts:
	arch/arm/mach-omap2/board-overo.c

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents eddecbb6 b295d6e5

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -4542,14 +4542,14 @@ S: Maintained 
F:	sound/soc/omap/



OMAP FRAMEBUFFER SUPPORT

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

M:	Tomi Valkeinen <tomi.valkeinen@ti.com>

L:	linux-fbdev@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/video/omap/



OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

M:	Tomi Valkeinen <tomi.valkeinen@ti.com>

L:	linux-omap@vger.kernel.org

L:	linux-fbdev@vger.kernel.org

S:	Maintained

arch/arm/configs/omap2plus_defconfig

+11 −0
Original line number Diff line number Diff line
@@ -193,6 +193,17 @@ CONFIG_FIRMWARE_EDID=y 
CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FB_OMAP_LCD_VGA=y

CONFIG_OMAP2_DSS=m

CONFIG_OMAP2_DSS_RFBI=y

CONFIG_OMAP2_DSS_SDI=y

CONFIG_OMAP2_DSS_DSI=y

CONFIG_FB_OMAP2=m

CONFIG_PANEL_GENERIC_DPI=m

CONFIG_PANEL_SHARP_LS037V7DW01=m

CONFIG_PANEL_NEC_NL8048HL11_01B=m

CONFIG_PANEL_TAAL=m

CONFIG_PANEL_TPO_TD043MTEA1=m

CONFIG_PANEL_ACX565AKM=m

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_PLATFORM=y

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

+2 −4
Original line number Diff line number Diff line
@@ -307,9 +307,6 @@ static struct omap_dss_board_info sdp3430_dss_data = { 
	.default_device	= &sdp3430_lcd_device,

};



static struct regulator_consumer_supply sdp3430_vdda_dac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss");



static struct omap_board_config_kernel sdp3430_config[] __initdata = {

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



static struct regulator_consumer_supply sdp3430_vdda_dac_supplies[] = {

	REGULATOR_SUPPLY("vdda_dac", "omapdss"),

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),

};



/* VPLL2 for digital video outputs */

static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {

	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),

	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),

};



static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {

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

+75 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <plat/usb.h>

#include <plat/mmc.h>

#include <plat/omap4-keypad.h>

#include <plat/display.h>



#include "mux.h"

#include "hsmmc.h"
@@ -47,6 +48,8 @@ 
#define ETH_KS8851_QUART		138

#define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO	184

#define OMAP4_SFH7741_ENABLE_GPIO		188

#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */

#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */



static const int sdp4430_keymap[] = {

	KEY(0, 0, KEY_E),
@@ -621,6 +624,76 @@ static void __init omap_sfh7741prox_init(void) 
	}

}



static void sdp4430_hdmi_mux_init(void)

{

	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */

	omap_mux_init_signal("hdmi_hpd",

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_cec",

			OMAP_PIN_INPUT_PULLUP);

	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */

	omap_mux_init_signal("hdmi_ddc_scl",

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_ddc_sda",

			OMAP_PIN_INPUT_PULLUP);

}



static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)

{

	int status;



	status = gpio_request_one(HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH,

							"hdmi_gpio_hpd");

	if (status) {

		pr_err("Cannot request GPIO %d\n", HDMI_GPIO_HPD);

		return status;

	}

	status = gpio_request_one(HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH,

							"hdmi_gpio_ls_oe");

	if (status) {

		pr_err("Cannot request GPIO %d\n", HDMI_GPIO_LS_OE);

		goto error1;

	}



	return 0;



error1:

	gpio_free(HDMI_GPIO_HPD);



	return status;

}



static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)

{

	gpio_free(HDMI_GPIO_LS_OE);

	gpio_free(HDMI_GPIO_HPD);

}



static struct omap_dss_device sdp4430_hdmi_device = {

	.name = "hdmi",

	.driver_name = "hdmi_panel",

	.type = OMAP_DISPLAY_TYPE_HDMI,

	.platform_enable = sdp4430_panel_enable_hdmi,

	.platform_disable = sdp4430_panel_disable_hdmi,

	.channel = OMAP_DSS_CHANNEL_DIGIT,

};



static struct omap_dss_device *sdp4430_dss_devices[] = {

	&sdp4430_hdmi_device,

};



static struct omap_dss_board_info sdp4430_dss_data = {

	.num_devices	= ARRAY_SIZE(sdp4430_dss_devices),

	.devices	= sdp4430_dss_devices,

	.default_device	= &sdp4430_hdmi_device,

};



void omap_4430sdp_display_init(void)

{

	sdp4430_hdmi_mux_init();

	omap_display_init(&sdp4430_dss_data);

}



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
@@ -729,6 +802,8 @@ static void __init omap_4430sdp_init(void) 
	status = omap4_keyboard_init(&sdp4430_keypad_data);

	if (status)

		pr_err("Keypad initialization failed: %d\n", status);



	omap_4430sdp_display_init();

}



static void __init omap_4430sdp_map_io(void)

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

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static struct regulator_consumer_supply cm_t35_vsim_supply = { 
};



static struct regulator_consumer_supply cm_t35_vdac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss");

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");



static struct regulator_consumer_supply cm_t35_vdvi_supply =

	REGULATOR_SUPPLY("vdvi", "omapdss");