Skip to content

L
linux
Commit 9b71fb5c authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files
Options

Merge branch 'for-l-o-3.5' 

Conflicts:
	drivers/video/omap2/displays/panel-taal.c

Merge OMAP DSS related board file changes. The branch will also be
merged through linux-omap tree to solve conflicts.
parents 1dfafbc6 e4a9e94c
Hide whitespace changes
Inline Side-by-side
Showing with 251 additions and 448 deletions
arch/arm/mach-omap2/board-3430sdp.c
View file @ 9b71fb5c
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/gpmc.h> #include <plat/gpmc.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include <plat/gpmc-smc91x.h> #include <plat/gpmc-smc91x.h>
...@@ -113,9 +113,6 @@ static struct gpio sdp3430_dss_gpios[] __initdata = { ...@@ -113,9 +113,6 @@ static struct gpio sdp3430_dss_gpios[] __initdata = {
{SDP3430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD Backlight"}, {SDP3430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD Backlight"},
}; };
static int lcd_enabled;
static int dvi_enabled;
static void __init sdp3430_display_init(void) static void __init sdp3430_display_init(void)
{ {
int r; int r;
...@@ -129,44 +126,18 @@ static void __init sdp3430_display_init(void) ...@@ -129,44 +126,18 @@ static void __init sdp3430_display_init(void)
static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev) static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev)
{ {
if (dvi_enabled) {
printk(KERN_ERR "cannot enable LCD, DVI is enabled\n");
return -EINVAL;
}
gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 1); gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 1);
gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 1); gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 1);
lcd_enabled = 1;
return 0; return 0;
} }
static void sdp3430_panel_disable_lcd(struct omap_dss_device *dssdev) static void sdp3430_panel_disable_lcd(struct omap_dss_device *dssdev)
{ {
lcd_enabled = 0;
gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 0); gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 0);
gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 0); gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 0);
} }
static int sdp3430_panel_enable_dvi(struct omap_dss_device *dssdev)
{
if (lcd_enabled) {
printk(KERN_ERR "cannot enable DVI, LCD is enabled\n");
return -EINVAL;
}
dvi_enabled = 1;
return 0;
}
static void sdp3430_panel_disable_dvi(struct omap_dss_device *dssdev)
{
dvi_enabled = 0;
}
static int sdp3430_panel_enable_tv(struct omap_dss_device *dssdev) static int sdp3430_panel_enable_tv(struct omap_dss_device *dssdev)
{ {
return 0; return 0;
...@@ -186,15 +157,14 @@ static struct omap_dss_device sdp3430_lcd_device = { ...@@ -186,15 +157,14 @@ static struct omap_dss_device sdp3430_lcd_device = {
.platform_disable = sdp3430_panel_disable_lcd, .platform_disable = sdp3430_panel_disable_lcd,
}; };
static struct panel_dvi_platform_data dvi_panel = { static struct tfp410_platform_data dvi_panel = {
.platform_enable = sdp3430_panel_enable_dvi, .power_down_gpio = -1,
.platform_disable = sdp3430_panel_disable_dvi,
}; };
static struct omap_dss_device sdp3430_dvi_device = { static struct omap_dss_device sdp3430_dvi_device = {
.name = "dvi", .name = "dvi",
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.driver_name = "dvi", .driver_name = "tfp410",
.data = &dvi_panel, .data = &dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
}; };
......
arch/arm/mach-omap2/board-4430sdp.c
View file @ 9b71fb5c
...@@ -666,6 +666,10 @@ static struct nokia_dsi_panel_data dsi1_panel = { ...@@ -666,6 +666,10 @@ static struct nokia_dsi_panel_data dsi1_panel = {
.use_ext_te = false, .use_ext_te = false,
.ext_te_gpio = 101, .ext_te_gpio = 101,
.esd_interval = 0, .esd_interval = 0,
.pin_config = {
.num_pins = 6,
.pins = { 0, 1, 2, 3, 4, 5 },
},
}; };
static struct omap_dss_device sdp4430_lcd_device = { static struct omap_dss_device sdp4430_lcd_device = {
...@@ -674,13 +678,6 @@ static struct omap_dss_device sdp4430_lcd_device = { ...@@ -674,13 +678,6 @@ static struct omap_dss_device sdp4430_lcd_device = {
.type = OMAP_DISPLAY_TYPE_DSI, .type = OMAP_DISPLAY_TYPE_DSI,
.data = &dsi1_panel, .data = &dsi1_panel,
.phy.dsi = { .phy.dsi = {
.clk_lane = 1,
.clk_pol = 0,
.data1_lane = 2,
.data1_pol = 0,
.data2_lane = 3,
.data2_pol = 0,
.module = 0, .module = 0,
}, },
...@@ -715,6 +712,10 @@ static struct nokia_dsi_panel_data dsi2_panel = { ...@@ -715,6 +712,10 @@ static struct nokia_dsi_panel_data dsi2_panel = {
.use_ext_te = false, .use_ext_te = false,
.ext_te_gpio = 103, .ext_te_gpio = 103,
.esd_interval = 0, .esd_interval = 0,
.pin_config = {
.num_pins = 6,
.pins = { 0, 1, 2, 3, 4, 5 },
},
}; };
static struct omap_dss_device sdp4430_lcd2_device = { static struct omap_dss_device sdp4430_lcd2_device = {
...@@ -723,12 +724,6 @@ static struct omap_dss_device sdp4430_lcd2_device = { ...@@ -723,12 +724,6 @@ static struct omap_dss_device sdp4430_lcd2_device = {
.type = OMAP_DISPLAY_TYPE_DSI, .type = OMAP_DISPLAY_TYPE_DSI,
.data = &dsi2_panel, .data = &dsi2_panel,
.phy.dsi = { .phy.dsi = {
.clk_lane = 1,
.clk_pol = 0,
.data1_lane = 2,
.data1_pol = 0,
.data2_lane = 3,
.data2_pol = 0,
.module = 1, .module = 1,
}, },
...@@ -758,21 +753,6 @@ static struct omap_dss_device sdp4430_lcd2_device = { ...@@ -758,21 +753,6 @@ static struct omap_dss_device sdp4430_lcd2_device = {
.channel = OMAP_DSS_CHANNEL_LCD2, .channel = OMAP_DSS_CHANNEL_LCD2,
}; };
static void sdp4430_lcd_init(void)
{
int r;
r = gpio_request_one(dsi1_panel.reset_gpio, GPIOF_DIR_OUT,
"lcd1_reset_gpio");
if (r)
pr_err("%s: Could not get lcd1_reset_gpio\n", __func__);
r = gpio_request_one(dsi2_panel.reset_gpio, GPIOF_DIR_OUT,
"lcd2_reset_gpio");
if (r)
pr_err("%s: Could not get lcd2_reset_gpio\n", __func__);
}
static struct omap_dss_hdmi_data sdp4430_hdmi_data = { static struct omap_dss_hdmi_data sdp4430_hdmi_data = {
.hpd_gpio = HDMI_GPIO_HPD, .hpd_gpio = HDMI_GPIO_HPD,
}; };
...@@ -858,7 +838,6 @@ static void __init omap_4430sdp_display_init(void) ...@@ -858,7 +838,6 @@ static void __init omap_4430sdp_display_init(void)
if (r) if (r)
pr_err("%s: Could not get display_sel GPIO\n", __func__); pr_err("%s: Could not get display_sel GPIO\n", __func__);
sdp4430_lcd_init();
sdp4430_picodlp_init(); sdp4430_picodlp_init();
omap_display_init(&sdp4430_dss_data); omap_display_init(&sdp4430_dss_data);
/* /*
......
arch/arm/mach-omap2/board-am3517evm.c
View file @ 9b71fb5c
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <plat/usb.h> #include <plat/usb.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h> #include <video/omap-panel-generic-dpi.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include "am35xx-emac.h" #include "am35xx-emac.h"
#include "mux.h" #include "mux.h"
...@@ -207,31 +207,14 @@ static struct omap_dss_device am3517_evm_tv_device = { ...@@ -207,31 +207,14 @@ static struct omap_dss_device am3517_evm_tv_device = {
.platform_disable = am3517_evm_panel_disable_tv, .platform_disable = am3517_evm_panel_disable_tv,
}; };
static int am3517_evm_panel_enable_dvi(struct omap_dss_device *dssdev) static struct tfp410_platform_data dvi_panel = {
{ .power_down_gpio = -1,
if (lcd_enabled) {
printk(KERN_ERR "cannot enable DVI, LCD is enabled\n");
return -EINVAL;
}
dvi_enabled = 1;
return 0;
}
static void am3517_evm_panel_disable_dvi(struct omap_dss_device *dssdev)
{
dvi_enabled = 0;
}
static struct panel_dvi_platform_data dvi_panel = {
.platform_enable = am3517_evm_panel_enable_dvi,
.platform_disable = am3517_evm_panel_disable_dvi,
}; };
static struct omap_dss_device am3517_evm_dvi_device = { static struct omap_dss_device am3517_evm_dvi_device = {
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.name = "dvi", .name = "dvi",
.driver_name = "dvi", .driver_name = "tfp410",
.data = &dvi_panel, .data = &dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
}; };
......
arch/arm/mach-omap2/board-cm-t35.c
View file @ 9b71fb5c
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <plat/usb.h> #include <plat/usb.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h> #include <video/omap-panel-generic-dpi.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include <plat/mcspi.h> #include <plat/mcspi.h>
#include <mach/hardware.h> #include <mach/hardware.h>
...@@ -218,25 +218,6 @@ static void cm_t35_panel_disable_lcd(struct omap_dss_device *dssdev) ...@@ -218,25 +218,6 @@ static void cm_t35_panel_disable_lcd(struct omap_dss_device *dssdev)
gpio_set_value(CM_T35_LCD_EN_GPIO, 0); gpio_set_value(CM_T35_LCD_EN_GPIO, 0);
} }
static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev)
{
if (lcd_enabled) {
printk(KERN_ERR "cannot enable DVI, LCD is enabled\n");
return -EINVAL;
}
gpio_set_value(CM_T35_DVI_EN_GPIO, 0);
dvi_enabled = 1;
return 0;
}
static void cm_t35_panel_disable_dvi(struct omap_dss_device *dssdev)
{
gpio_set_value(CM_T35_DVI_EN_GPIO, 1);
dvi_enabled = 0;
}
static int cm_t35_panel_enable_tv(struct omap_dss_device *dssdev) static int cm_t35_panel_enable_tv(struct omap_dss_device *dssdev)
{ {
return 0; return 0;
...@@ -260,15 +241,14 @@ static struct omap_dss_device cm_t35_lcd_device = { ...@@ -260,15 +241,14 @@ static struct omap_dss_device cm_t35_lcd_device = {
.phy.dpi.data_lines = 18, .phy.dpi.data_lines = 18,
}; };
static struct panel_dvi_platform_data dvi_panel = { static struct tfp410_platform_data dvi_panel = {
.platform_enable = cm_t35_panel_enable_dvi, .power_down_gpio = CM_T35_DVI_EN_GPIO,
.platform_disable = cm_t35_panel_disable_dvi,
}; };
static struct omap_dss_device cm_t35_dvi_device = { static struct omap_dss_device cm_t35_dvi_device = {
.name = "dvi", .name = "dvi",
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.driver_name = "dvi", .driver_name = "tfp410",
.data = &dvi_panel, .data = &dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
}; };
...@@ -316,7 +296,6 @@ static struct spi_board_info cm_t35_lcd_spi_board_info[] __initdata = { ...@@ -316,7 +296,6 @@ static struct spi_board_info cm_t35_lcd_spi_board_info[] __initdata = {
static struct gpio cm_t35_dss_gpios[] __initdata = { static struct gpio cm_t35_dss_gpios[] __initdata = {
{ CM_T35_LCD_EN_GPIO, GPIOF_OUT_INIT_LOW, "lcd enable" }, { CM_T35_LCD_EN_GPIO, GPIOF_OUT_INIT_LOW, "lcd enable" },
{ CM_T35_LCD_BL_GPIO, GPIOF_OUT_INIT_LOW, "lcd bl enable" }, { CM_T35_LCD_BL_GPIO, GPIOF_OUT_INIT_LOW, "lcd bl enable" },
{ CM_T35_DVI_EN_GPIO, GPIOF_OUT_INIT_HIGH, "dvi enable" },
}; };
static void __init cm_t35_init_display(void) static void __init cm_t35_init_display(void)
...@@ -335,7 +314,6 @@ static void __init cm_t35_init_display(void) ...@@ -335,7 +314,6 @@ static void __init cm_t35_init_display(void)
gpio_export(CM_T35_LCD_EN_GPIO, 0); gpio_export(CM_T35_LCD_EN_GPIO, 0);
gpio_export(CM_T35_LCD_BL_GPIO, 0); gpio_export(CM_T35_LCD_BL_GPIO, 0);
gpio_export(CM_T35_DVI_EN_GPIO, 0);
msleep(50); msleep(50);
gpio_set_value(CM_T35_LCD_EN_GPIO, 1); gpio_set_value(CM_T35_LCD_EN_GPIO, 1);
......
arch/arm/mach-omap2/board-devkit8000.c
View file @ 9b71fb5c
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <plat/usb.h> #include <plat/usb.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h> #include <video/omap-panel-generic-dpi.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include <plat/mcspi.h> #include <plat/mcspi.h>
#include <linux/input/matrix_keypad.h> #include <linux/input/matrix_keypad.h>
...@@ -118,19 +118,6 @@ static void devkit8000_panel_disable_lcd(struct omap_dss_device *dssdev) ...@@ -118,19 +118,6 @@ static void devkit8000_panel_disable_lcd(struct omap_dss_device *dssdev)
gpio_set_value_cansleep(dssdev->reset_gpio, 0); gpio_set_value_cansleep(dssdev->reset_gpio, 0);
} }
static int devkit8000_panel_enable_dvi(struct omap_dss_device *dssdev)
{
if (gpio_is_valid(dssdev->reset_gpio))
gpio_set_value_cansleep(dssdev->reset_gpio, 1);
return 0;
}
static void devkit8000_panel_disable_dvi(struct omap_dss_device *dssdev)
{
if (gpio_is_valid(dssdev->reset_gpio))
gpio_set_value_cansleep(dssdev->reset_gpio, 0);
}
static struct regulator_consumer_supply devkit8000_vmmc1_supply[] = { static struct regulator_consumer_supply devkit8000_vmmc1_supply[] = {
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
}; };
...@@ -154,15 +141,14 @@ static struct omap_dss_device devkit8000_lcd_device = { ...@@ -154,15 +141,14 @@ static struct omap_dss_device devkit8000_lcd_device = {
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
}; };
static struct panel_dvi_platform_data dvi_panel = { static struct tfp410_platform_data dvi_panel = {
.platform_enable = devkit8000_panel_enable_dvi, .power_down_gpio = -1,
.platform_disable = devkit8000_panel_disable_dvi,
}; };
static struct omap_dss_device devkit8000_dvi_device = { static struct omap_dss_device devkit8000_dvi_device = {
.name = "dvi", .name = "dvi",
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.driver_name = "dvi", .driver_name = "tfp410",
.data = &dvi_panel, .data = &dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
}; };
...@@ -244,13 +230,7 @@ static int devkit8000_twl_gpio_setup(struct device *dev, ...@@ -244,13 +230,7 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
} }
/* gpio + 7 is "DVI_PD" (out, active low) */ /* gpio + 7 is "DVI_PD" (out, active low) */
devkit8000_dvi_device.reset_gpio = gpio + 7; dvi_panel.power_down_gpio = gpio + 7;
ret = gpio_request_one(devkit8000_dvi_device.reset_gpio,
GPIOF_OUT_INIT_LOW, "DVI PowerDown");
if (ret < 0) {
devkit8000_dvi_device.reset_gpio = -EINVAL;
printk(KERN_ERR "Failed to request GPIO for DVI PowerDown\n");
}
return 0; return 0;
} }
......
arch/arm/mach-omap2/board-igep0020.c
View file @ 9b71fb5c
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <plat/gpmc.h> #include <plat/gpmc.h>
#include <plat/usb.h> #include <plat/usb.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include <plat/onenand.h> #include <plat/onenand.h>
#include "mux.h" #include "mux.h"
...@@ -444,28 +444,15 @@ static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = { ...@@ -444,28 +444,15 @@ static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = {
.setup = igep_twl_gpio_setup, .setup = igep_twl_gpio_setup,
}; };
static int igep2_enable_dvi(struct omap_dss_device *dssdev) static struct tfp410_platform_data dvi_panel = {
{ .i2c_bus_num = 3,
gpio_direction_output(IGEP2_GPIO_DVI_PUP, 1); .power_down_gpio = IGEP2_GPIO_DVI_PUP,
return 0;
}
static void igep2_disable_dvi(struct omap_dss_device *dssdev)
{
gpio_direction_output(IGEP2_GPIO_DVI_PUP, 0);
}
static struct panel_dvi_platform_data dvi_panel = {
.platform_enable = igep2_enable_dvi,
.platform_disable = igep2_disable_dvi,
.i2c_bus_num = 3,
}; };
static struct omap_dss_device igep2_dvi_device = { static struct omap_dss_device igep2_dvi_device = {
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.name = "dvi", .name = "dvi",
.driver_name = "dvi", .driver_name = "tfp410",
.data = &dvi_panel, .data = &dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
}; };
...@@ -480,14 +467,6 @@ static struct omap_dss_board_info igep2_dss_data = { ...@@ -480,14 +467,6 @@ static struct omap_dss_board_info igep2_dss_data = {
.default_device = &igep2_dvi_device, .default_device = &igep2_dvi_device,
}; };
static void __init igep2_display_init(void)
{
int err = gpio_request_one(IGEP2_GPIO_DVI_PUP, GPIOF_OUT_INIT_HIGH,
"GPIO_DVI_PUP");
if (err)
pr_err("IGEP v2: Could not obtain gpio GPIO_DVI_PUP\n");
}
static struct platform_device *igep_devices[] __initdata = { static struct platform_device *igep_devices[] __initdata = {
&igep_vwlan_device, &igep_vwlan_device,
}; };
...@@ -668,7 +647,6 @@ static void __init igep_init(void) ...@@ -668,7 +647,6 @@ static void __init igep_init(void)
if (machine_is_igep0020()) { if (machine_is_igep0020()) {
omap_display_init(&igep2_dss_data); omap_display_init(&igep2_dss_data);
igep2_display_init();
igep2_init_smsc911x(); igep2_init_smsc911x();
usbhs_init(&igep2_usbhs_bdata); usbhs_init(&igep2_usbhs_bdata);
} else { } else {
......
arch/arm/mach-omap2/board-omap3beagle.c
View file @ 9b71fb5c
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include <plat/board.h> #include <plat/board.h>
#include "common.h" #include "common.h"
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include <plat/gpmc.h> #include <plat/gpmc.h>
#include <plat/nand.h> #include <plat/nand.h>
#include <plat/usb.h> #include <plat/usb.h>
...@@ -189,33 +189,17 @@ static struct mtd_partition omap3beagle_nand_partitions[] = { ...@@ -189,33 +189,17 @@ static struct mtd_partition omap3beagle_nand_partitions[] = {
/* DSS */ /* DSS */
static int beagle_enable_dvi(struct omap_dss_device *dssdev) static struct tfp410_platform_data dvi_panel = {
{
if (gpio_is_valid(dssdev->reset_gpio))
gpio_set_value(dssdev->reset_gpio, 1);
return 0;
}
static void beagle_disable_dvi(struct omap_dss_device *dssdev)
{
if (gpio_is_valid(dssdev->reset_gpio))
gpio_set_value(dssdev->reset_gpio, 0);
}
static struct panel_dvi_platform_data dvi_panel = {
.platform_enable = beagle_enable_dvi,
.platform_disable = beagle_disable_dvi,
.i2c_bus_num = 3, .i2c_bus_num = 3,
.power_down_gpio = -1,
}; };
static struct omap_dss_device beagle_dvi_device = { static struct omap_dss_device beagle_dvi_device = {
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.name = "dvi", .name = "dvi",
.driver_name = "dvi", .driver_name = "tfp410",
.data = &dvi_panel, .data = &dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
.reset_gpio = -EINVAL,
}; };
static struct omap_dss_device beagle_tv_device = { static struct omap_dss_device beagle_tv_device = {
...@@ -236,16 +220,6 @@ static struct omap_dss_board_info beagle_dss_data = { ...@@ -236,16 +220,6 @@ static struct omap_dss_board_info beagle_dss_data = {
.default_device = &beagle_dvi_device, .default_device = &beagle_dvi_device,
}; };
static void __init beagle_display_init(void)
{
int r;
r = gpio_request_one(beagle_dvi_device.reset_gpio, GPIOF_OUT_INIT_LOW,
"DVI reset");
if (r < 0)
printk(KERN_ERR "Unable to get DVI reset GPIO\n");
}
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
static struct omap2_hsmmc_info mmc[] = { static struct omap2_hsmmc_info mmc[] = {
...@@ -309,7 +283,7 @@ static int beagle_twl_gpio_setup(struct device *dev, ...@@ -309,7 +283,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
if (gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC")) if (gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC"))
pr_err("%s: unable to configure EHCI_nOC\n", __func__); pr_err("%s: unable to configure EHCI_nOC\n", __func__);
} }
beagle_dvi_device.reset_gpio = beagle_config.reset_gpio; dvi_panel.power_down_gpio = beagle_config.reset_gpio;
gpio_request_one(gpio + TWL4030_GPIO_MAX, beagle_config.usb_pwr_level, gpio_request_one(gpio + TWL4030_GPIO_MAX, beagle_config.usb_pwr_level,
"nEN_USB_PWR"); "nEN_USB_PWR");
...@@ -552,7 +526,6 @@ static void __init omap3_beagle_init(void) ...@@ -552,7 +526,6 @@ static void __init omap3_beagle_init(void)
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT); omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
beagle_display_init();
beagle_opp_init(); beagle_opp_init();
} }
......
arch/arm/mach-omap2/board-omap3evm.c
View file @ 9b71fb5c
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "common.h" #include "common.h"
#include <plat/mcspi.h> #include <plat/mcspi.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include "mux.h" #include "mux.h"
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
...@@ -219,35 +219,14 @@ static struct omap_dss_device omap3_evm_tv_device = { ...@@ -219,35 +219,14 @@ static struct omap_dss_device omap3_evm_tv_device = {
.platform_disable = omap3_evm_disable_tv, .platform_disable = omap3_evm_disable_tv,
}; };
static int omap3_evm_enable_dvi(struct omap_dss_device *dssdev) static struct tfp410_platform_data dvi_panel = {
{ .power_down_gpio = OMAP3EVM_DVI_PANEL_EN_GPIO,
if (lcd_enabled) {
printk(KERN_ERR "cannot enable DVI, LCD is enabled\n");
return -EINVAL;
}
gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 1);
dvi_enabled = 1;
return 0;
}
static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev)
{
gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 0);
dvi_enabled = 0;
}
static struct panel_dvi_platform_data dvi_panel = {
.platform_enable = omap3_evm_enable_dvi,
.platform_disable = omap3_evm_disable_dvi,
}; };
static struct omap_dss_device omap3_evm_dvi_device = { static struct omap_dss_device omap3_evm_dvi_device = {
.name = "dvi", .name = "dvi",
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.driver_name = "dvi", .driver_name = "tfp410",
.data = &dvi_panel, .data = &dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
}; };
......
arch/arm/mach-omap2/board-omap3stalker.c
View file @ 9b71fb5c
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include <plat/usb.h> #include <plat/usb.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h> #include <video/omap-panel-generic-dpi.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include <plat/mcspi.h> #include <plat/mcspi.h>
#include <linux/input/matrix_keypad.h> #include <linux/input/matrix_keypad.h>
...@@ -92,9 +92,6 @@ static inline void __init omap3stalker_init_eth(void) ...@@ -92,9 +92,6 @@ static inline void __init omap3stalker_init_eth(void)
#define LCD_PANEL_BKLIGHT_GPIO 210 #define LCD_PANEL_BKLIGHT_GPIO 210
#define ENABLE_VPLL2_DEV_GRP 0xE0 #define ENABLE_VPLL2_DEV_GRP 0xE0
static int lcd_enabled;
static int dvi_enabled;
static void __init omap3_stalker_display_init(void) static void __init omap3_stalker_display_init(void)
{ {
return; return;
...@@ -122,32 +119,14 @@ static struct omap_dss_device omap3_stalker_tv_device = { ...@@ -122,32 +119,14 @@ static struct omap_dss_device omap3_stalker_tv_device = {
.platform_disable = omap3_stalker_disable_tv, .platform_disable = omap3_stalker_disable_tv,
}; };
static int omap3_stalker_enable_dvi(struct omap_dss_device *dssdev) static struct tfp410_platform_data dvi_panel = {
{ .power_down_gpio = DSS_ENABLE_GPIO,
if (lcd_enabled) {
printk(KERN_ERR "cannot enable DVI, LCD is enabled\n");
return -EINVAL;
}
gpio_set_value(DSS_ENABLE_GPIO, 1);
dvi_enabled = 1;
return 0;
}
static void omap3_stalker_disable_dvi(struct omap_dss_device *dssdev)
{
gpio_set_value(DSS_ENABLE_GPIO, 0);
dvi_enabled = 0;
}
static struct panel_dvi_platform_data dvi_panel = {
.platform_enable = omap3_stalker_enable_dvi,
.platform_disable = omap3_stalker_disable_dvi,
}; };
static struct omap_dss_device omap3_stalker_dvi_device = { static struct omap_dss_device omap3_stalker_dvi_device = {
.name = "dvi", .name = "dvi",
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.driver_name = "dvi", .driver_name = "tfp410",
.data = &dvi_panel, .data = &dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
}; };
......
arch/arm/mach-omap2/board-omap4panda.c
View file @ 9b71fb5c
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "common.h" #include "common.h"
#include <plat/usb.h> #include <plat/usb.h>
#include <plat/mmc.h> #include <plat/mmc.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include "hsmmc.h" #include "hsmmc.h"
#include "control.h" #include "control.h"
...@@ -420,46 +420,22 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -420,46 +420,22 @@ static struct omap_board_mux board_mux[] __initdata = {
/* Display DVI */ /* Display DVI */
#define PANDA_DVI_TFP410_POWER_DOWN_GPIO 0 #define PANDA_DVI_TFP410_POWER_DOWN_GPIO 0
static int omap4_panda_enable_dvi(struct omap_dss_device *dssdev)
{
gpio_set_value(dssdev->reset_gpio, 1);
return 0;
}
static void omap4_panda_disable_dvi(struct omap_dss_device *dssdev)
{
gpio_set_value(dssdev->reset_gpio, 0);
}
/* Using generic display panel */ /* Using generic display panel */
static struct panel_dvi_platform_data omap4_dvi_panel = { static struct tfp410_platform_data omap4_dvi_panel = {
.platform_enable = omap4_panda_enable_dvi, .i2c_bus_num = 3,
.platform_disable = omap4_panda_disable_dvi, .power_down_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO,
.i2c_bus_num = 3,
}; };
struct omap_dss_device omap4_panda_dvi_device = { struct omap_dss_device omap4_panda_dvi_device = {
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.name = "dvi", .name = "dvi",
.driver_name = "dvi", .driver_name = "tfp410",
.data = &omap4_dvi_panel, .data = &omap4_dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
.reset_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO, .reset_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO,
.channel = OMAP_DSS_CHANNEL_LCD2, .channel = OMAP_DSS_CHANNEL_LCD2,
}; };
int __init omap4_panda_dvi_init(void)
{
int r;
/* Requesting TFP410 DVI GPIO and disabling it, at bootup */
r = gpio_request_one(omap4_panda_dvi_device.reset_gpio,
GPIOF_OUT_INIT_LOW, "DVI PD");
if (r)
pr_err("Failed to get DVI powerdown GPIO\n");
return r;
}
static struct gpio panda_hdmi_gpios[] = { static struct gpio panda_hdmi_gpios[] = {
{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" }, { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
...@@ -511,11 +487,6 @@ static struct omap_dss_board_info omap4_panda_dss_data = { ...@@ -511,11 +487,6 @@ static struct omap_dss_board_info omap4_panda_dss_data = {
void __init omap4_panda_display_init(void) void __init omap4_panda_display_init(void)
{ {
int r;
r = omap4_panda_dvi_init();
if (r)
pr_err("error initializing panda DVI\n");
omap_display_init(&omap4_panda_dss_data); omap_display_init(&omap4_panda_dss_data);
......
arch/arm/mach-omap2/board-overo.c
View file @ 9b71fb5c
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "common.h" #include "common.h"
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h> #include <video/omap-panel-generic-dpi.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
#include <plat/gpmc.h> #include <plat/gpmc.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <plat/nand.h> #include <plat/nand.h>
...@@ -167,32 +167,15 @@ static void __init overo_display_init(void) ...@@ -167,32 +167,15 @@ static void __init overo_display_init(void)
gpio_export(OVERO_GPIO_LCD_BL, 0); gpio_export(OVERO_GPIO_LCD_BL, 0);
} }
static int overo_panel_enable_dvi(struct omap_dss_device *dssdev) static struct tfp410_platform_data dvi_panel = {
{
if (lcd_enabled) {
printk(KERN_ERR "cannot enable DVI, LCD is enabled\n");
return -EINVAL;
}
dvi_enabled = 1;
return 0;
}
static void overo_panel_disable_dvi(struct omap_dss_device *dssdev)
{
dvi_enabled = 0;
}
static struct panel_dvi_platform_data dvi_panel = {
.platform_enable = overo_panel_enable_dvi,
.platform_disable = overo_panel_disable_dvi,
.i2c_bus_num = 3, .i2c_bus_num = 3,
.power_down_gpio = -1,
}; };
static struct omap_dss_device overo_dvi_device = { static struct omap_dss_device overo_dvi_device = {
.name = "dvi", .name = "dvi",
.type = OMAP_DISPLAY_TYPE_DPI, .type = OMAP_DISPLAY_TYPE_DPI,
.driver_name = "dvi", .driver_name = "tfp410",
.data = &dvi_panel, .data = &dvi_panel,
.phy.dpi.data_lines = 24, .phy.dpi.data_lines = 24,
}; };
......
drivers/video/omap2/displays/Kconfig
View file @ 9b71fb5c
...@@ -10,12 +10,12 @@ config PANEL_GENERIC_DPI ...@@ -10,12 +10,12 @@ config PANEL_GENERIC_DPI
Supports LCD Panel used in TI SDP3430 and EVM boards, Supports LCD Panel used in TI SDP3430 and EVM boards,
OMAP3517 EVM boards and CM-T35. OMAP3517 EVM boards and CM-T35.
config PANEL_DVI config PANEL_TFP410
tristate "DVI output" tristate "TFP410 DPI-to-DVI chip"
depends on OMAP2_DSS_DPI && I2C depends on OMAP2_DSS_DPI && I2C
help help
Driver for external monitors, connected via DVI. The driver uses i2c Driver for TFP410 DPI-to-DVI chip. The driver uses i2c to read EDID
to read EDID information from the monitor. information from the monitor.
config PANEL_LGPHILIPS_LB035Q02 config PANEL_LGPHILIPS_LB035Q02
tristate "LG.Philips LB035Q02 LCD Panel" tristate "LG.Philips LB035Q02 LCD Panel"
......
drivers/video/omap2/displays/Makefile
View file @ 9b71fb5c
obj-$(CONFIG_PANEL_GENERIC_DPI) += panel-generic-dpi.o obj-$(CONFIG_PANEL_GENERIC_DPI) += panel-generic-dpi.o
obj-$(CONFIG_PANEL_DVI) += panel-dvi.o obj-$(CONFIG_PANEL_TFP410) += panel-tfp410.o
obj-$(CONFIG_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o obj-$(CONFIG_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o
obj-$(CONFIG_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o obj-$(CONFIG_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
obj-$(CONFIG_PANEL_NEC_NL8048HL11_01B) += panel-nec-nl8048hl11-01b.o obj-$(CONFIG_PANEL_NEC_NL8048HL11_01B) += panel-nec-nl8048hl11-01b.o
......
drivers/video/omap2/displays/panel-taal.c
View file @ 9b71fb5c
...@@ -912,6 +912,15 @@ static int taal_probe(struct omap_dss_device *dssdev) ...@@ -912,6 +912,15 @@ static int taal_probe(struct omap_dss_device *dssdev)
dev_set_drvdata(&dssdev->dev, td); dev_set_drvdata(&dssdev->dev, td);
if (gpio_is_valid(panel_data->reset_gpio)) {
r = gpio_request_one(panel_data->reset_gpio, GPIOF_OUT_INIT_LOW,
"taal rst");
if (r) {
dev_err(&dssdev->dev, "failed to request reset gpio\n");
goto err_rst_gpio;
}
}
taal_hw_reset(dssdev); taal_hw_reset(dssdev);
if (panel_data->use_dsi_backlight) { if (panel_data->use_dsi_backlight) {
...@@ -992,6 +1001,9 @@ static int taal_probe(struct omap_dss_device *dssdev) ...@@ -992,6 +1001,9 @@ static int taal_probe(struct omap_dss_device *dssdev)
if (bldev != NULL) if (bldev != NULL)
backlight_device_unregister(bldev); backlight_device_unregister(bldev);
err_bl: err_bl:
if (gpio_is_valid(panel_data->reset_gpio))
gpio_free(panel_data->reset_gpio);
err_rst_gpio:
destroy_workqueue(td->workqueue); destroy_workqueue(td->workqueue);
err_wq: err_wq:
kfree(td); kfree(td);
...@@ -1030,15 +1042,25 @@ static void __exit taal_remove(struct omap_dss_device *dssdev) ...@@ -1030,15 +1042,25 @@ static void __exit taal_remove(struct omap_dss_device *dssdev)
/* reset, to be sure that the panel is in a valid state */ /* reset, to be sure that the panel is in a valid state */
taal_hw_reset(dssdev); taal_hw_reset(dssdev);
if (gpio_is_valid(panel_data->reset_gpio))
gpio_free(panel_data->reset_gpio);
kfree(td); kfree(td);
} }
static int taal_power_on(struct omap_dss_device *dssdev) static int taal_power_on(struct omap_dss_device *dssdev)
{ {
struct taal_data *td = dev_get_drvdata(&dssdev->dev); struct taal_data *td = dev_get_drvdata(&dssdev->dev);
struct nokia_dsi_panel_data *panel_data = get_panel_data(dssdev);
u8 id1, id2, id3; u8 id1, id2, id3;
int r; int r;
r = omapdss_dsi_configure_pins(dssdev, &panel_data->pin_config);
if (r) {
dev_err(&dssdev->dev, "failed to configure DSI pins\n");
goto err0;
};
r = omapdss_dsi_display_enable(dssdev); r = omapdss_dsi_display_enable(dssdev);
if (r) { if (r) {
dev_err(&dssdev->dev, "failed to enable DSI\n"); dev_err(&dssdev->dev, "failed to enable DSI\n");
......
drivers/video/omap2/displays/panel-dvi.c → drivers/video/omap2/displays/panel-tfp410.c
View file @ 9b71fb5c
/* /*
* DVI output support * TFP410 DPI-to-DVI chip
* *
* Copyright (C) 2011 Texas Instruments Inc * Copyright (C) 2011 Texas Instruments Inc
* Author: Tomi Valkeinen <tomi.valkeinen@ti.com> * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
...@@ -21,11 +21,12 @@ ...@@ -21,11 +21,12 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/gpio.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <video/omap-panel-dvi.h> #include <video/omap-panel-tfp410.h>
static const struct omap_video_timings panel_dvi_default_timings = { static const struct omap_video_timings tfp410_default_timings = {
.x_res = 640, .x_res = 640,
.y_res = 480, .y_res = 480,
...@@ -44,17 +45,19 @@ struct panel_drv_data { ...@@ -44,17 +45,19 @@ struct panel_drv_data {
struct omap_dss_device *dssdev; struct omap_dss_device *dssdev;
struct mutex lock; struct mutex lock;
int pd_gpio;
}; };
static inline struct panel_dvi_platform_data static inline struct tfp410_platform_data
*get_pdata(const struct omap_dss_device *dssdev) *get_pdata(const struct omap_dss_device *dssdev)
{ {
return dssdev->data; return dssdev->data;
} }
static int panel_dvi_power_on(struct omap_dss_device *dssdev) static int tfp410_power_on(struct omap_dss_device *dssdev)
{ {
struct panel_dvi_platform_data *pdata = get_pdata(dssdev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
int r; int r;
if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
...@@ -64,57 +67,72 @@ static int panel_dvi_power_on(struct omap_dss_device *dssdev) ...@@ -64,57 +67,72 @@ static int panel_dvi_power_on(struct omap_dss_device *dssdev)
if (r) if (r)
goto err0; goto err0;
if (pdata->platform_enable) { if (gpio_is_valid(ddata->pd_gpio))
r = pdata->platform_enable(dssdev); gpio_set_value(ddata->pd_gpio, 1);
if (r)
goto err1;
}
return 0; return 0;
err1:
omapdss_dpi_display_disable(dssdev);
err0: err0:
return r; return r;
} }
static void panel_dvi_power_off(struct omap_dss_device *dssdev) static void tfp410_power_off(struct omap_dss_device *dssdev)
{ {
struct panel_dvi_platform_data *pdata = get_pdata(dssdev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
return; return;
if (pdata->platform_disable) if (gpio_is_valid(ddata->pd_gpio))
pdata->platform_disable(dssdev); gpio_set_value(ddata->pd_gpio, 0);
omapdss_dpi_display_disable(dssdev); omapdss_dpi_display_disable(dssdev);
} }
static int panel_dvi_probe(struct omap_dss_device *dssdev) static int tfp410_probe(struct omap_dss_device *dssdev)
{ {
struct tfp410_platform_data *pdata = get_pdata(dssdev);
struct panel_drv_data *ddata; struct panel_drv_data *ddata;
int r;
ddata = kzalloc(sizeof(*ddata), GFP_KERNEL); ddata = kzalloc(sizeof(*ddata), GFP_KERNEL);
if (!ddata) if (!ddata)
return -ENOMEM; return -ENOMEM;
dssdev->panel.timings = panel_dvi_default_timings; dssdev->panel.timings = tfp410_default_timings;
dssdev->panel.config = OMAP_DSS_LCD_TFT; dssdev->panel.config = OMAP_DSS_LCD_TFT;
ddata->dssdev = dssdev; ddata->dssdev = dssdev;
mutex_init(&ddata->lock); mutex_init(&ddata->lock);
if (pdata)
ddata->pd_gpio = pdata->power_down_gpio;
else
ddata->pd_gpio = -1;
if (gpio_is_valid(ddata->pd_gpio)) {
r = gpio_request_one(ddata->pd_gpio, GPIOF_OUT_INIT_LOW,
"tfp410 pd");
if (r) {
dev_err(&dssdev->dev, "Failed to request PD GPIO %d\n",
ddata->pd_gpio);
ddata->pd_gpio = -1;
}
}
dev_set_drvdata(&dssdev->dev, ddata); dev_set_drvdata(&dssdev->dev, ddata);
return 0; return 0;
} }
static void __exit panel_dvi_remove(struct omap_dss_device *dssdev) static void __exit tfp410_remove(struct omap_dss_device *dssdev)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
mutex_lock(&ddata->lock); mutex_lock(&ddata->lock);
if (gpio_is_valid(ddata->pd_gpio))
gpio_free(ddata->pd_gpio);
dev_set_drvdata(&dssdev->dev, NULL); dev_set_drvdata(&dssdev->dev, NULL);
mutex_unlock(&ddata->lock); mutex_unlock(&ddata->lock);
...@@ -122,14 +140,14 @@ static void __exit panel_dvi_remove(struct omap_dss_device *dssdev) ...@@ -122,14 +140,14 @@ static void __exit panel_dvi_remove(struct omap_dss_device *dssdev)
kfree(ddata); kfree(ddata);
} }
static int panel_dvi_enable(struct omap_dss_device *dssdev) static int tfp410_enable(struct omap_dss_device *dssdev)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
int r; int r;
mutex_lock(&ddata->lock); mutex_lock(&ddata->lock);
r = panel_dvi_power_on(dssdev); r = tfp410_power_on(dssdev);
if (r == 0) if (r == 0)
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE; dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
...@@ -138,26 +156,26 @@ static int panel_dvi_enable(struct omap_dss_device *dssdev) ...@@ -138,26 +156,26 @@ static int panel_dvi_enable(struct omap_dss_device *dssdev)
return r; return r;
} }
static void panel_dvi_disable(struct omap_dss_device *dssdev) static void tfp410_disable(struct omap_dss_device *dssdev)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
mutex_lock(&ddata->lock); mutex_lock(&ddata->lock);
panel_dvi_power_off(dssdev); tfp410_power_off(dssdev);
dssdev->state = OMAP_DSS_DISPLAY_DISABLED; dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
mutex_unlock(&ddata->lock); mutex_unlock(&ddata->lock);
} }
static int panel_dvi_suspend(struct omap_dss_device *dssdev) static int tfp410_suspend(struct omap_dss_device *dssdev)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
mutex_lock(&ddata->lock); mutex_lock(&ddata->lock);
panel_dvi_power_off(dssdev); tfp410_power_off(dssdev);
dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED; dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
...@@ -166,14 +184,14 @@ static int panel_dvi_suspend(struct omap_dss_device *dssdev) ...@@ -166,14 +184,14 @@ static int panel_dvi_suspend(struct omap_dss_device *dssdev)
return 0; return 0;
} }
static int panel_dvi_resume(struct omap_dss_device *dssdev) static int tfp410_resume(struct omap_dss_device *dssdev)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
int r; int r;
mutex_lock(&ddata->lock); mutex_lock(&ddata->lock);
r = panel_dvi_power_on(dssdev); r = tfp410_power_on(dssdev);
if (r == 0) if (r == 0)
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE; dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
...@@ -182,7 +200,7 @@ static int panel_dvi_resume(struct omap_dss_device *dssdev) ...@@ -182,7 +200,7 @@ static int panel_dvi_resume(struct omap_dss_device *dssdev)
return r; return r;
} }
static void panel_dvi_set_timings(struct omap_dss_device *dssdev, static void tfp410_set_timings(struct omap_dss_device *dssdev,
struct omap_video_timings *timings) struct omap_video_timings *timings)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
...@@ -192,7 +210,7 @@ static void panel_dvi_set_timings(struct omap_dss_device *dssdev, ...@@ -192,7 +210,7 @@ static void panel_dvi_set_timings(struct omap_dss_device *dssdev,
mutex_unlock(&ddata->lock); mutex_unlock(&ddata->lock);
} }
static void panel_dvi_get_timings(struct omap_dss_device *dssdev, static void tfp410_get_timings(struct omap_dss_device *dssdev,
struct omap_video_timings *timings) struct omap_video_timings *timings)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
...@@ -202,7 +220,7 @@ static void panel_dvi_get_timings(struct omap_dss_device *dssdev, ...@@ -202,7 +220,7 @@ static void panel_dvi_get_timings(struct omap_dss_device *dssdev,
mutex_unlock(&ddata->lock); mutex_unlock(&ddata->lock);
} }
static int panel_dvi_check_timings(struct omap_dss_device *dssdev, static int tfp410_check_timings(struct omap_dss_device *dssdev,
struct omap_video_timings *timings) struct omap_video_timings *timings)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
...@@ -216,7 +234,7 @@ static int panel_dvi_check_timings(struct omap_dss_device *dssdev, ...@@ -216,7 +234,7 @@ static int panel_dvi_check_timings(struct omap_dss_device *dssdev,
} }
static int panel_dvi_ddc_read(struct i2c_adapter *adapter, static int tfp410_ddc_read(struct i2c_adapter *adapter,
unsigned char *buf, u16 count, u8 offset) unsigned char *buf, u16 count, u8 offset)
{ {
int r, retries; int r, retries;
...@@ -247,11 +265,11 @@ static int panel_dvi_ddc_read(struct i2c_adapter *adapter, ...@@ -247,11 +265,11 @@ static int panel_dvi_ddc_read(struct i2c_adapter *adapter,
return r < 0 ? r : -EIO; return r < 0 ? r : -EIO;
} }
static int panel_dvi_read_edid(struct omap_dss_device *dssdev, static int tfp410_read_edid(struct omap_dss_device *dssdev,
u8 *edid, int len) u8 *edid, int len)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
struct panel_dvi_platform_data *pdata = get_pdata(dssdev); struct tfp410_platform_data *pdata = get_pdata(dssdev);
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
int r, l, bytes_read; int r, l, bytes_read;
...@@ -271,7 +289,7 @@ static int panel_dvi_read_edid(struct omap_dss_device *dssdev, ...@@ -271,7 +289,7 @@ static int panel_dvi_read_edid(struct omap_dss_device *dssdev,
} }
l = min(EDID_LENGTH, len); l = min(EDID_LENGTH, len);
r = panel_dvi_ddc_read(adapter, edid, l, 0); r = tfp410_ddc_read(adapter, edid, l, 0);
if (r) if (r)
goto err; goto err;
...@@ -281,7 +299,7 @@ static int panel_dvi_read_edid(struct omap_dss_device *dssdev, ...@@ -281,7 +299,7 @@ static int panel_dvi_read_edid(struct omap_dss_device *dssdev,
if (len > EDID_LENGTH && edid[0x7e] > 0) { if (len > EDID_LENGTH && edid[0x7e] > 0) {
l = min(EDID_LENGTH, len - EDID_LENGTH); l = min(EDID_LENGTH, len - EDID_LENGTH);
r = panel_dvi_ddc_read(adapter, edid + EDID_LENGTH, r = tfp410_ddc_read(adapter, edid + EDID_LENGTH,
l, EDID_LENGTH); l, EDID_LENGTH);
if (r) if (r)
goto err; goto err;
...@@ -298,10 +316,10 @@ static int panel_dvi_read_edid(struct omap_dss_device *dssdev, ...@@ -298,10 +316,10 @@ static int panel_dvi_read_edid(struct omap_dss_device *dssdev,
return r; return r;
} }
static bool panel_dvi_detect(struct omap_dss_device *dssdev) static bool tfp410_detect(struct omap_dss_device *dssdev)
{ {
struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev); struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
struct panel_dvi_platform_data *pdata = get_pdata(dssdev); struct tfp410_platform_data *pdata = get_pdata(dssdev);
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
unsigned char out; unsigned char out;
int r; int r;
...@@ -315,7 +333,7 @@ static bool panel_dvi_detect(struct omap_dss_device *dssdev) ...@@ -315,7 +333,7 @@ static bool panel_dvi_detect(struct omap_dss_device *dssdev)
if (!adapter) if (!adapter)
goto out; goto out;
r = panel_dvi_ddc_read(adapter, &out, 1, 0); r = tfp410_ddc_read(adapter, &out, 1, 0);
mutex_unlock(&ddata->lock); mutex_unlock(&ddata->lock);
...@@ -326,38 +344,38 @@ static bool panel_dvi_detect(struct omap_dss_device *dssdev) ...@@ -326,38 +344,38 @@ static bool panel_dvi_detect(struct omap_dss_device *dssdev)
return true; return true;
} }
static struct omap_dss_driver panel_dvi_driver = { static struct omap_dss_driver tfp410_driver = {
.probe = panel_dvi_probe, .probe = tfp410_probe,
.remove = __exit_p(panel_dvi_remove), .remove = __exit_p(tfp410_remove),
.enable = panel_dvi_enable, .enable = tfp410_enable,
.disable = panel_dvi_disable, .disable = tfp410_disable,
.suspend = panel_dvi_suspend, .suspend = tfp410_suspend,
.resume = panel_dvi_resume, .resume = tfp410_resume,
.set_timings = panel_dvi_set_timings, .set_timings = tfp410_set_timings,
.get_timings = panel_dvi_get_timings, .get_timings = tfp410_get_timings,
.check_timings = panel_dvi_check_timings, .check_timings = tfp410_check_timings,
.read_edid = panel_dvi_read_edid, .read_edid = tfp410_read_edid,
.detect = panel_dvi_detect, .detect = tfp410_detect,
.driver = { .driver = {
.name = "dvi", .name = "tfp410",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
static int __init panel_dvi_init(void) static int __init tfp410_init(void)
{ {
return omap_dss_register_driver(&panel_dvi_driver); return omap_dss_register_driver(&tfp410_driver);
} }
static void __exit panel_dvi_exit(void) static void __exit tfp410_exit(void)
{ {
omap_dss_unregister_driver(&panel_dvi_driver); omap_dss_unregister_driver(&tfp410_driver);
} }
module_init(panel_dvi_init); module_init(tfp410_init);
module_exit(panel_dvi_exit); module_exit(tfp410_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/video/omap2/dss/dsi.c
View file @ 9b71fb5c
...@@ -2045,65 +2045,6 @@ static unsigned dsi_get_line_buf_size(struct platform_device *dsidev) ...@@ -2045,65 +2045,6 @@ static unsigned dsi_get_line_buf_size(struct platform_device *dsidev)
} }
} }
static int dsi_parse_lane_config(struct omap_dss_device *dssdev)
{
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
u8 lanes[DSI_MAX_NR_LANES];
u8 polarities[DSI_MAX_NR_LANES];
int num_lanes, i;
static const enum dsi_lane_function functions[] = {
DSI_LANE_CLK,
DSI_LANE_DATA1,
DSI_LANE_DATA2,
DSI_LANE_DATA3,
DSI_LANE_DATA4,
};
lanes[0] = dssdev->phy.dsi.clk_lane;
lanes[1] = dssdev->phy.dsi.data1_lane;
lanes[2] = dssdev->phy.dsi.data2_lane;
lanes[3] = dssdev->phy.dsi.data3_lane;
lanes[4] = dssdev->phy.dsi.data4_lane;
polarities[0] = dssdev->phy.dsi.clk_pol;
polarities[1] = dssdev->phy.dsi.data1_pol;
polarities[2] = dssdev->phy.dsi.data2_pol;
polarities[3] = dssdev->phy.dsi.data3_pol;
polarities[4] = dssdev->phy.dsi.data4_pol;
num_lanes = 0;
for (i = 0; i < dsi->num_lanes_supported; ++i)
dsi->lanes[i].function = DSI_LANE_UNUSED;
for (i = 0; i < dsi->num_lanes_supported; ++i) {
int num;
if (lanes[i] == DSI_LANE_UNUSED)
break;
num = lanes[i] - 1;
if (num >= dsi->num_lanes_supported)
return -EINVAL;
if (dsi->lanes[num].function != DSI_LANE_UNUSED)
return -EINVAL;
dsi->lanes[num].function = functions[i];
dsi->lanes[num].polarity = polarities[i];
num_lanes++;
}
if (num_lanes < 2 || num_lanes > dsi->num_lanes_supported)
return -EINVAL;
dsi->num_lanes_used = num_lanes;
return 0;
}
static int dsi_set_lane_config(struct omap_dss_device *dssdev) static int dsi_set_lane_config(struct omap_dss_device *dssdev)
{ {
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev); struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
...@@ -3944,6 +3885,74 @@ static void dsi_proto_timings(struct omap_dss_device *dssdev) ...@@ -3944,6 +3885,74 @@ static void dsi_proto_timings(struct omap_dss_device *dssdev)
} }
} }
int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev,
const struct omap_dsi_pin_config *pin_cfg)
{
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
int num_pins;
const int *pins;
struct dsi_lane_config lanes[DSI_MAX_NR_LANES];
int num_lanes;
int i;
static const enum dsi_lane_function functions[] = {
DSI_LANE_CLK,
DSI_LANE_DATA1,
DSI_LANE_DATA2,
DSI_LANE_DATA3,
DSI_LANE_DATA4,
};
num_pins = pin_cfg->num_pins;
pins = pin_cfg->pins;
if (num_pins < 4 || num_pins > dsi->num_lanes_supported * 2
|| num_pins % 2 != 0)
return -EINVAL;
for (i = 0; i < DSI_MAX_NR_LANES; ++i)
lanes[i].function = DSI_LANE_UNUSED;
num_lanes = 0;
for (i = 0; i < num_pins; i += 2) {
u8 lane, pol;
int dx, dy;
dx = pins[i];
dy = pins[i + 1];
if (dx < 0 || dx >= dsi->num_lanes_supported * 2)
return -EINVAL;
if (dy < 0 || dy >= dsi->num_lanes_supported * 2)
return -EINVAL;
if (dx & 1) {
if (dy != dx - 1)
return -EINVAL;
pol = 1;
} else {
if (dy != dx + 1)
return -EINVAL;
pol = 0;
}
lane = dx / 2;
lanes[lane].function = functions[i / 2];
lanes[lane].polarity = pol;
num_lanes++;
}
memcpy(dsi->lanes, lanes, sizeof(dsi->lanes));
dsi->num_lanes_used = num_lanes;
return 0;
}
EXPORT_SYMBOL(omapdss_dsi_configure_pins);
int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
{ {
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev); struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
...@@ -4301,12 +4310,6 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev) ...@@ -4301,12 +4310,6 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev)
int dsi_module = dsi_get_dsidev_id(dsidev); int dsi_module = dsi_get_dsidev_id(dsidev);
int r; int r;
r = dsi_parse_lane_config(dssdev);
if (r) {
DSSERR("illegal lane config");
goto err0;
}
r = dsi_pll_init(dsidev, true, true); r = dsi_pll_init(dsidev, true, true);
if (r) if (r)
goto err0; goto err0;
......
include/video/omap-panel-nokia-dsi.h
View file @ 9b71fb5c
...@@ -11,6 +11,7 @@ struct omap_dss_device; ...@@ -11,6 +11,7 @@ struct omap_dss_device;
* @esd_interval: interval of ESD checks, 0 = disabled (ms) * @esd_interval: interval of ESD checks, 0 = disabled (ms)
* @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms) * @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms)
* @use_dsi_backlight: true if panel uses DSI command to control backlight * @use_dsi_backlight: true if panel uses DSI command to control backlight
* @pin_config: DSI pin configuration
*/ */
struct nokia_dsi_panel_data { struct nokia_dsi_panel_data {
const char *name; const char *name;
...@@ -24,6 +25,8 @@ struct nokia_dsi_panel_data { ...@@ -24,6 +25,8 @@ struct nokia_dsi_panel_data {
unsigned ulps_timeout; unsigned ulps_timeout;
bool use_dsi_backlight; bool use_dsi_backlight;
struct omap_dsi_pin_config pin_config;
}; };
#endif /* __OMAP_NOKIA_DSI_PANEL_H */ #endif /* __OMAP_NOKIA_DSI_PANEL_H */
include/video/omap-panel-dvi.h → include/video/omap-panel-tfp410.h
View file @ 9b71fb5c
/* /*
* Header for DVI output driver * Header for TFP410 chip driver
* *
* Copyright (C) 2011 Texas Instruments Inc * Copyright (C) 2011 Texas Instruments Inc
* Author: Tomi Valkeinen <tomi.valkeinen@ti.com> * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
...@@ -17,21 +17,19 @@ ...@@ -17,21 +17,19 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __OMAP_PANEL_DVI_H #ifndef __OMAP_PANEL_TFP410_H
#define __OMAP_PANEL_DVI_H #define __OMAP_PANEL_TFP410_H
struct omap_dss_device; struct omap_dss_device;
/** /**
* struct panel_dvi_platform_data - panel driver configuration data * struct tfp410_platform_data - panel driver configuration data
* @platform_enable: platform specific panel enable function
* @platform_disable: platform specific panel disable function
* @i2c_bus_num: i2c bus id for the panel * @i2c_bus_num: i2c bus id for the panel
* @power_down_gpio: gpio number for PD pin (or -1 if not available)
*/ */
struct panel_dvi_platform_data { struct tfp410_platform_data {
int (*platform_enable)(struct omap_dss_device *dssdev);
void (*platform_disable)(struct omap_dss_device *dssdev);
u16 i2c_bus_num; u16 i2c_bus_num;
int power_down_gpio;
}; };
#endif /* __OMAP_PANEL_DVI_H */ #endif /* __OMAP_PANEL_TFP410_H */
include/video/omapdss.h
View file @ 9b71fb5c
...@@ -469,6 +469,21 @@ struct omap_overlay_manager { ...@@ -469,6 +469,21 @@ struct omap_overlay_manager {
int (*wait_for_vsync)(struct omap_overlay_manager *mgr); int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
}; };
/* 22 pins means 1 clk lane and 10 data lanes */
#define OMAP_DSS_MAX_DSI_PINS 22
struct omap_dsi_pin_config {
int num_pins;
/*
* pin numbers in the following order:
* clk+, clk-
* data1+, data1-
* data2+, data2-
* ...
*/
int pins[OMAP_DSS_MAX_DSI_PINS];
};
struct omap_dss_device { struct omap_dss_device {
struct device dev; struct device dev;
...@@ -491,17 +506,6 @@ struct omap_dss_device { ...@@ -491,17 +506,6 @@ struct omap_dss_device {
} sdi; } sdi;
struct { struct {
u8 clk_lane;
u8 clk_pol;
u8 data1_lane;
u8 data1_pol;
u8 data2_lane;
u8 data2_pol;
u8 data3_lane;
u8 data3_pol;
u8 data4_lane;
u8 data4_pol;
int module; int module;
bool ext_te; bool ext_te;
...@@ -690,6 +694,8 @@ int omap_dsi_update(struct omap_dss_device *dssdev, int channel, ...@@ -690,6 +694,8 @@ int omap_dsi_update(struct omap_dss_device *dssdev, int channel,
int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel); int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel);
int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id); int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id);
void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel); void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel);
int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev,
const struct omap_dsi_pin_config *pin_cfg);
int omapdss_dsi_display_enable(struct omap_dss_device *dssdev); int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);
void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, void omapdss_dsi_display_disable(struct omap_dss_device *dssdev,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7