Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next (193984f4) · Commits · e / devices / android_kernel_fairphone_FP4

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

+8 −15

Original line number	Diff line number	Diff line
		@@ -595,20 +595,6 @@ static void __init omap_sfh7741prox_init(void)
		__func__, OMAP4_SFH7741_ENABLE_GPIO, error);
		}

		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 struct gpio sdp4430_hdmi_gpios[] = {
		{ HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd" },
		{ HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
		@@ -826,9 +812,16 @@ static void omap_4430sdp_display_init(void)
		pr_err("%s: Could not get display_sel GPIO\n", __func__);

		sdp4430_lcd_init();
		sdp4430_hdmi_mux_init();
		sdp4430_picodlp_init();
		omap_display_init(&sdp4430_dss_data);
		/*
		* OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and
		* later have external pull up on the HDMI I2C lines
		*/
		if (cpu_is_omap446x() \|\| omap_rev() > OMAP4430_REV_ES2_2)
		omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
		else
		omap_hdmi_init(0);
		}

		#ifdef CONFIG_OMAP_MUX

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

+9 −16

Original line number	Diff line number	Diff line
		@@ -478,21 +478,6 @@ int __init omap4_panda_dvi_init(void)
		return r;
		}


		static void omap4_panda_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 struct gpio panda_hdmi_gpios[] = {
		{ HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd" },
		{ HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
		@@ -544,8 +529,16 @@ void omap4_panda_display_init(void)
		if (r)
		pr_err("error initializing panda DVI\n");

		omap4_panda_hdmi_mux_init();
		omap_display_init(&omap4_panda_dss_data);

		/*
		* OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and
		* later have external pull up on the HDMI I2C lines
		*/
		if (cpu_is_omap446x() \|\| omap_rev() > OMAP4430_REV_ES2_2)
		omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
		else
		omap_hdmi_init(0);
		}

		static void __init omap4_panda_init(void)

arch/arm/mach-omap2/display.c

+39 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include <plat/omap-pm.h>
		#include <plat/common.h>

		#include "mux.h"
		#include "control.h"
		#include "display.h"

		@@ -96,6 +97,36 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
		{ "dss_hdmi", "omapdss_hdmi", -1 },
		};

		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",
		OMAP_PIN_INPUT_PULLUP);

		/*
		* CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and
		* HDMI_DDC_SCL_PULLUPRESX (bit 24) are set to disable
		* internal pull up resistor.
		*/
		if (flags & OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP) {
		control_i2c_1 = OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_1;
		reg = omap4_ctrl_pad_readl(control_i2c_1);
		reg \|= (OMAP4_HDMI_DDC_SDA_PULLUPRESX_MASK \|
		OMAP4_HDMI_DDC_SCL_PULLUPRESX_MASK);
		omap4_ctrl_pad_writel(reg, control_i2c_1);
		}
		}

		static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
		{
		u32 enable_mask, enable_shift;
		@@ -129,6 +160,14 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
		return 0;
		}

		int omap_hdmi_init(enum omap_hdmi_flags flags)
		{
		if (cpu_is_omap44xx())
		omap4_hdmi_mux_pads(flags);

		return 0;
		}

		static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask)
		{
		if (cpu_is_omap44xx())

drivers/media/video/omap/omap_vout.c

+15 −18

Original line number	Diff line number	Diff line
		@@ -423,7 +423,7 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
		"%s enable=%d addr=%x width=%d\n height=%d color_mode=%d\n"
		"rotation=%d mirror=%d posx=%d posy=%d out_width = %d \n"
		"out_height=%d rotation_type=%d screen_width=%d\n",
		__func__, info.enabled, info.paddr, info.width, info.height,
		__func__, ovl->is_enabled(ovl), info.paddr, info.width, info.height,
		info.color_mode, info.rotation, info.mirror, info.pos_x,
		info.pos_y, info.out_width, info.out_height, info.rotation_type,
		info.screen_width);
		@@ -942,12 +942,8 @@ static int omap_vout_release(struct file *file)
		/* Disable all the overlay managers connected with this interface */
		for (i = 0; i < ovid->num_overlays; i++) {
		struct omap_overlay *ovl = ovid->overlays[i];
		if (ovl->manager && ovl->manager->device) {
		struct omap_overlay_info info;
		ovl->get_overlay_info(ovl, &info);
		info.enabled = 0;
		ovl->set_overlay_info(ovl, &info);
		}
		if (ovl->manager && ovl->manager->device)
		ovl->disable(ovl);
		}
		/* Turn off the pipeline */
		ret = omapvid_apply_changes(vout);
		@@ -1667,7 +1663,6 @@ static int vidioc_streamon(struct file file, void fh, enum v4l2_buf_type i)
		if (ovl->manager && ovl->manager->device) {
		struct omap_overlay_info info;
		ovl->get_overlay_info(ovl, &info);
		info.enabled = 1;
		info.paddr = addr;
		if (ovl->set_overlay_info(ovl, &info)) {
		ret = -EINVAL;
		@@ -1686,6 +1681,16 @@ static int vidioc_streamon(struct file file, void fh, enum v4l2_buf_type i)
		if (ret)
		v4l2_err(&vout->vid_dev->v4l2_dev, "failed to change mode\n");

		for (j = 0; j < ovid->num_overlays; j++) {
		struct omap_overlay *ovl = ovid->overlays[j];

		if (ovl->manager && ovl->manager->device) {
		ret = ovl->enable(ovl);
		if (ret)
		goto streamon_err1;
		}
		}

		ret = 0;

		streamon_err1:
		@@ -1715,16 +1720,8 @@ static int vidioc_streamoff(struct file file, void fh, enum v4l2_buf_type i)
		for (j = 0; j < ovid->num_overlays; j++) {
		struct omap_overlay *ovl = ovid->overlays[j];

		if (ovl->manager && ovl->manager->device) {
		struct omap_overlay_info info;

		ovl->get_overlay_info(ovl, &info);
		info.enabled = 0;
		ret = ovl->set_overlay_info(ovl, &info);
		if (ret)
		v4l2_err(&vout->vid_dev->v4l2_dev,
		"failed to update overlay info in streamoff\n");
		}
		if (ovl->manager && ovl->manager->device)
		ovl->disable(ovl);
		}

		/* Turn of the pipeline */

drivers/video/omap/lcd_ams_delta.c

+2 −13

Original line number	Diff line number	Diff line
		@@ -198,7 +198,7 @@ static int ams_delta_panel_resume(struct platform_device *pdev)
		return 0;
		}

		struct platform_driver ams_delta_panel_driver = {
		static struct platform_driver ams_delta_panel_driver = {
		.probe = ams_delta_panel_probe,
		.remove = ams_delta_panel_remove,
		.suspend = ams_delta_panel_suspend,
		@@ -209,15 +209,4 @@ struct platform_driver ams_delta_panel_driver = {
		},
		};

		static int __init ams_delta_panel_drv_init(void)
		{
		return platform_driver_register(&ams_delta_panel_driver);
		}

		static void __exit ams_delta_panel_drv_cleanup(void)
		{
		platform_driver_unregister(&ams_delta_panel_driver);
		}

		module_init(ams_delta_panel_drv_init);
		module_exit(ams_delta_panel_drv_cleanup);
		module_platform_driver(ams_delta_panel_driver);