Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64a9de8f authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files

Merge branch 'for-3.3-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-for-linus

parents f7f5ef0a c49d005b

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

+14 −4
Original line number Diff line number Diff line
@@ -52,8 +52,9 @@ 
#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_CT_CP_HPD 60 /* HPD mode enable/disable */

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

#define HDMI_GPIO_HPD  63 /* Hotplug detect */

#define DISPLAY_SEL_GPIO	59	/* LCD2/PicoDLP switch */

#define DLP_POWER_ON_GPIO	40
@@ -596,8 +597,9 @@ static void __init omap_sfh7741prox_init(void) 
}



static struct gpio sdp4430_hdmi_gpios[] = {

	{ HDMI_GPIO_HPD,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_hpd"   },

	{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },

	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_ls_oe" },

	{ HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },

};



static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -614,8 +616,7 @@ static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev) 


static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)

{

	gpio_free(HDMI_GPIO_LS_OE);

	gpio_free(HDMI_GPIO_HPD);

	gpio_free_array(sdp4430_hdmi_gpios, ARRAY_SIZE(sdp4430_hdmi_gpios));

}



static struct nokia_dsi_panel_data dsi1_panel = {
@@ -731,6 +732,10 @@ static void sdp4430_lcd_init(void) 
		pr_err("%s: Could not get lcd2_reset_gpio\n", __func__);

}



static struct omap_dss_hdmi_data sdp4430_hdmi_data = {

	.hpd_gpio = HDMI_GPIO_HPD,

};



static struct omap_dss_device sdp4430_hdmi_device = {

	.name = "hdmi",

	.driver_name = "hdmi_panel",
@@ -738,6 +743,7 @@ static struct omap_dss_device sdp4430_hdmi_device = { 
	.platform_enable = sdp4430_panel_enable_hdmi,

	.platform_disable = sdp4430_panel_disable_hdmi,

	.channel = OMAP_DSS_CHANNEL_DIGIT,

	.data = &sdp4430_hdmi_data,

};



static struct picodlp_panel_data sdp4430_picodlp_pdata = {
@@ -822,6 +828,10 @@ static void omap_4430sdp_display_init(void) 
		omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);

	else

		omap_hdmi_init(0);



	omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);

}



#ifdef CONFIG_OMAP_MUX

arch/arm/mach-omap2/board-omap4panda.c

+14 −4
Original line number Diff line number Diff line
@@ -51,8 +51,9 @@ 
#define GPIO_HUB_NRESET		62

#define GPIO_WIFI_PMENA		43

#define GPIO_WIFI_IRQ		53

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

#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */

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

#define HDMI_GPIO_HPD  63 /* Hotplug detect */



/* wl127x BT, FM, GPS connectivity chip */

static int wl1271_gpios[] = {46, -1, -1};
@@ -479,8 +480,9 @@ int __init omap4_panda_dvi_init(void) 
}



static struct gpio panda_hdmi_gpios[] = {

	{ HDMI_GPIO_HPD,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd"   },

	{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },

	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },

	{ HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },

};



static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -497,10 +499,13 @@ static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev) 


static void omap4_panda_panel_disable_hdmi(struct omap_dss_device *dssdev)

{

	gpio_free(HDMI_GPIO_LS_OE);

	gpio_free(HDMI_GPIO_HPD);

	gpio_free_array(panda_hdmi_gpios, ARRAY_SIZE(panda_hdmi_gpios));

}



static struct omap_dss_hdmi_data omap4_panda_hdmi_data = {

	.hpd_gpio = HDMI_GPIO_HPD,

};



static struct omap_dss_device  omap4_panda_hdmi_device = {

	.name = "hdmi",

	.driver_name = "hdmi_panel",
@@ -508,6 +513,7 @@ static struct omap_dss_device omap4_panda_hdmi_device = { 
	.platform_enable = omap4_panda_panel_enable_hdmi,

	.platform_disable = omap4_panda_panel_disable_hdmi,

	.channel = OMAP_DSS_CHANNEL_DIGIT,

	.data = &omap4_panda_hdmi_data,

};



static struct omap_dss_device *omap4_panda_dss_devices[] = {
@@ -539,6 +545,10 @@ void omap4_panda_display_init(void) 
		omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);

	else

		omap_hdmi_init(0);



	omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);

}



static void __init omap4_panda_init(void)

arch/arm/mach-omap2/display.c

+0 −4
Original line number Diff line number Diff line
@@ -102,12 +102,8 @@ static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags) 
	u32 reg;

	u16 control_i2c_1;



	/* 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",

drivers/video/omap2/dss/dispc.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ void dispc_runtime_put(void) 


	DSSDBG("dispc_runtime_put\n");



	r = pm_runtime_put(&dispc.pdev->dev);

	r = pm_runtime_put_sync(&dispc.pdev->dev);

	WARN_ON(r < 0);

}

drivers/video/omap2/dss/dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ void dsi_runtime_put(struct platform_device *dsidev) 


	DSSDBG("dsi_runtime_put\n");



	r = pm_runtime_put(&dsi->pdev->dev);

	r = pm_runtime_put_sync(&dsi->pdev->dev);

	WARN_ON(r < 0);

}