Skip to content

L
linux-davinci
Commit e5bb1ba6 authored by Imre Deak's avatar Imre Deak Committed by Juha Yrjola
Browse files
Options

ARM: OMAP: omapfb: update LCD drivers 

- replace custom debugging stuff with the default kernel one
- pass a pointer to the LCD object instance to member functions
- rename lcd_lph8923 to the more generic lcd_mipid
- use SPI_MODE_1 instead of SPI_MODE_0 in lcd_mipid
- add ESD spike recovery support to lcd_mipid
Signed-off-by: default avatarImre Deak <ext-imre.deak@nokia.com>
Signed-off-by: default avatarJuha Yrjola <juha.yrjola@solidboot.com>
parent e563dc81
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 677 additions and 695 deletions
drivers/video/omap/lcd_apollon.c
View file @ e5bb1ba6
......@@ -30,44 +30,32 @@
#include <asm/arch/mux.h>
#include <asm/arch/omapfb.h>
/* #define OMAPFB_DBG 1 */
/* #define USE_35INCH_LCD 1 */
#include "debug.h"
static int apollon_panel_init(struct omapfb_device *fbdev)
static int apollon_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)
{
DBGENTER(1);
DBGLEAVE(1);
return 0;
}
static void apollon_panel_cleanup(void)
static void apollon_panel_cleanup(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static int apollon_panel_enable(void)
static int apollon_panel_enable(struct lcd_panel *panel)
{
DBGENTER(1);
/* configure LCD PWR_EN */
omap_cfg_reg(M21_242X_GPIO11);
DBGLEAVE(1);
return 0;
}
static void apollon_panel_disable(void)
static void apollon_panel_disable(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static unsigned long apollon_panel_get_caps(void)
static unsigned long apollon_panel_get_caps(struct lcd_panel *panel)
{
return 0;
}
......@@ -109,26 +97,22 @@ struct lcd_panel apollon_panel = {
static int apollon_panel_probe(struct platform_device *pdev)
{
DBGENTER(1);
omapfb_register_panel(&apollon_panel);
return 0;
}
static int apollon_panel_remove(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
static int apollon_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
{
DBGENTER(1);
return 0;
}
static int apollon_panel_resume(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
......
drivers/video/omap/lcd_h2.c
View file @ e5bb1ba6
......@@ -27,9 +27,6 @@
#include <asm/arch/mux.h>
#include <asm/arch/omapfb.h>
/* #define OMAPFB_DBG 1 */
#include "debug.h"
#include "../drivers/ssi/omap-uwire.h"
#define MODULE_NAME "omapfb-lcd_h2"
......@@ -42,8 +39,6 @@ static int tsc2101_write_reg(int page, int reg, u16 data)
u16 cmd;
int r;
DBGENTER(1);
cmd = ((page & 3) << 11) | ((reg & 0x3f) << 5);
if (omap_uwire_data_transfer(TSC2101_UWIRE_CS, cmd, 16, 0, NULL, 1))
r = -1;
......@@ -51,14 +46,12 @@ static int tsc2101_write_reg(int page, int reg, u16 data)
r = omap_uwire_data_transfer(TSC2101_UWIRE_CS, data, 16, 0,
NULL, 0);
DBGLEAVE(1);
return r;
}
static int h2_panel_init(struct omapfb_device *fbdev)
static int h2_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
{
unsigned long uwire_flags;
DBGENTER(1);
/* Configure N15 pin to be uWire CS1 */
omap_cfg_reg(N15_1610_UWIRE_CS1);
......@@ -66,45 +59,35 @@ static int h2_panel_init(struct omapfb_device *fbdev)
uwire_flags |= UWIRE_FREQ_DIV_8;
omap_uwire_configure_mode(TSC2101_UWIRE_CS, uwire_flags);
DBGLEAVE(1);
return 0;
}
static void h2_panel_cleanup(void)
static void h2_panel_cleanup(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static int h2_panel_enable(void)
static int h2_panel_enable(struct lcd_panel *panel)
{
int r;
DBGENTER(1);
/* Assert LCD_EN, BKLIGHT_EN pins on LCD panel
* page2, GPIO config reg, GPIO(0,1) to out and asserted
*/
r = tsc2101_write_reg(2, 0x23, 0xCC00) ? -1 : 0;
DBGLEAVE(1);
return r;
}
static void h2_panel_disable(void)
static void h2_panel_disable(struct lcd_panel *panel)
{
DBGENTER(1);
/* Deassert LCD_EN and BKLIGHT_EN pins on LCD panel
* page2, GPIO config reg, GPIO(0,1) to out and deasserted
*/
if (tsc2101_write_reg(2, 0x23, 0x8800))
pr_err("failed to disable LCD panel\n");
DBGLEAVE(1);
}
static unsigned long h2_panel_get_caps(void)
static unsigned long h2_panel_get_caps(struct lcd_panel *panel)
{
return 0;
}
......@@ -134,26 +117,22 @@ struct lcd_panel h2_panel = {
static int h2_panel_probe(struct platform_device *pdev)
{
DBGENTER(1);
omapfb_register_panel(&h2_panel);
return 0;
}
static int h2_panel_remove(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
static int h2_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
{
DBGENTER(1);
return 0;
}
static int h2_panel_resume(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
......
drivers/video/omap/lcd_h3.c
View file @ e5bb1ba6
......@@ -28,33 +28,23 @@
#include <asm/arch/tps65010.h>
#include <asm/arch/omapfb.h>
/* #define OMAPFB_DBG 1 */
#include "debug.h"
#define MODULE_NAME "omapfb-lcd_h3"
#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args)
static int h3_panel_init(struct omapfb_device *fbdev)
static int h3_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
{
DBGENTER(1);
DBGLEAVE(1);
return 0;
}
static void h3_panel_cleanup(void)
static void h3_panel_cleanup(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static int h3_panel_enable(void)
static int h3_panel_enable(struct lcd_panel *panel)
{
int r = 0;
DBGENTER(1);
/* GPIO1 and GPIO2 of TPS65010 send LCD_ENBKL and LCD_ENVDD signals */
r = tps65010_set_gpio_out_value(GPIO1, HIGH);
if (!r)
......@@ -62,27 +52,22 @@ static int h3_panel_enable(void)
if (r)
pr_err("Unable to turn on LCD panel\n");
DBGLEAVE(1);
return r;
}
static void h3_panel_disable(void)
static void h3_panel_disable(struct lcd_panel *panel)
{
int r = 0;
DBGENTER(1);
/* GPIO1 and GPIO2 of TPS65010 send LCD_ENBKL and LCD_ENVDD signals */
r = tps65010_set_gpio_out_value(GPIO1, LOW);
if (!r)
tps65010_set_gpio_out_value(GPIO2, LOW);
if (r)
pr_err("Unable to turn off LCD panel\n");
DBGLEAVE(1);
}
static unsigned long h3_panel_get_caps(void)
static unsigned long h3_panel_get_caps(struct lcd_panel *panel)
{
return 0;
}
......@@ -113,26 +98,22 @@ struct lcd_panel h3_panel = {
static int h3_panel_probe(struct platform_device *pdev)
{
DBGENTER(1);
omapfb_register_panel(&h3_panel);
return 0;
}
static int h3_panel_remove(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
static int h3_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
{
DBGENTER(1);
return 0;
}
static int h3_panel_resume(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
......
drivers/video/omap/lcd_h4.c
View file @ e5bb1ba6
......@@ -26,38 +26,25 @@
#include <asm/arch/omapfb.h>
/* #define OMAPFB_DBG 1 */
#include "debug.h"
static int h4_panel_init(struct omapfb_device *fbdev)
static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
{
DBGENTER(1);
DBGLEAVE(1);
return 0;
}
static void h4_panel_cleanup(void)
static void h4_panel_cleanup(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static int h4_panel_enable(void)
static int h4_panel_enable(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
return 0;
}
static void h4_panel_disable(void)
static void h4_panel_disable(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static unsigned long h4_panel_get_caps(void)
static unsigned long h4_panel_get_caps(struct lcd_panel *panel)
{
return 0;
}
......@@ -87,26 +74,22 @@ struct lcd_panel h4_panel = {
static int h4_panel_probe(struct platform_device *pdev)
{
DBGENTER(1);
omapfb_register_panel(&h4_panel);
return 0;
}
static int h4_panel_remove(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
static int h4_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
{
DBGENTER(1);
return 0;
}
static int h4_panel_resume(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
......
drivers/video/omap/lcd_inn1510.c
View file @ e5bb1ba6
......@@ -29,43 +29,28 @@
#include <asm/arch/fpga.h>
#include <asm/arch/omapfb.h>
/* #define OMAPFB_DBG 1 */
#include "debug.h"
static int innovator1510_panel_init(struct omapfb_device *fbdev)
static int innovator1510_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)
{
DBGENTER(1);
DBGLEAVE(1);
return 0;
}
static void innovator1510_panel_cleanup(void)
static void innovator1510_panel_cleanup(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static int innovator1510_panel_enable(void)
static int innovator1510_panel_enable(struct lcd_panel *panel)
{
DBGENTER(1);
fpga_write(0x7, OMAP1510_FPGA_LCD_PANEL_CONTROL);
DBGLEAVE(1);
return 0;
}
static void innovator1510_panel_disable(void)
static void innovator1510_panel_disable(struct lcd_panel *panel)
{
DBGENTER(1);
fpga_write(0x0, OMAP1510_FPGA_LCD_PANEL_CONTROL);
DBGLEAVE(1);
}
static unsigned long innovator1510_panel_get_caps(void)
static unsigned long innovator1510_panel_get_caps(struct lcd_panel *panel)
{
return 0;
}
......@@ -96,26 +81,22 @@ struct lcd_panel innovator1510_panel = {
static int innovator1510_panel_probe(struct platform_device *pdev)
{
DBGENTER(1);
omapfb_register_panel(&innovator1510_panel);
return 0;
}
static int innovator1510_panel_remove(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
static int innovator1510_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
{
DBGENTER(1);
return 0;
}
static int innovator1510_panel_resume(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
......
drivers/video/omap/lcd_inn1610.c
View file @ e5bb1ba6
......@@ -27,20 +27,15 @@
#include <asm/arch/gpio.h>
#include <asm/arch/omapfb.h>
/* #define OMAPFB_DBG 1 */
#include "debug.h"
#define MODULE_NAME "omapfb-lcd_h3"
#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args)
static int innovator1610_panel_init(struct omapfb_device *fbdev)
static int innovator1610_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)
{
int r = 0;
DBGENTER(1);
if (omap_request_gpio(14)) {
pr_err("can't request GPIO 14\n");
r = -1;
......@@ -56,44 +51,31 @@ static int innovator1610_panel_init(struct omapfb_device *fbdev)
omap_set_gpio_direction(14, 0);
omap_set_gpio_direction(15, 0);
exit:
DBGLEAVE(1);
return r;
}
static void innovator1610_panel_cleanup(void)
static void innovator1610_panel_cleanup(struct lcd_panel *panel)
{
DBGENTER(1);
omap_free_gpio(15);
omap_free_gpio(14);
DBGLEAVE(1);
}
static int innovator1610_panel_enable(void)
static int innovator1610_panel_enable(struct lcd_panel *panel)
{
DBGENTER(1);
/* set GPIO14 and GPIO15 high */
omap_set_gpio_dataout(14, 1);
omap_set_gpio_dataout(15, 1);
DBGLEAVE(1);
return 0;
}
static void innovator1610_panel_disable(void)
static void innovator1610_panel_disable(struct lcd_panel *panel)
{
DBGENTER(1);
/* set GPIO13, GPIO14 and GPIO15 low */
omap_set_gpio_dataout(14, 0);
omap_set_gpio_dataout(15, 0);
DBGLEAVE(1);
}
static unsigned long innovator1610_panel_get_caps(void)
static unsigned long innovator1610_panel_get_caps(struct lcd_panel *panel)
{
return 0;
}
......@@ -124,26 +106,22 @@ struct lcd_panel innovator1610_panel = {
static int innovator1610_panel_probe(struct platform_device *pdev)
{
DBGENTER(1);
omapfb_register_panel(&innovator1610_panel);
return 0;
}
static int innovator1610_panel_remove(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
static int innovator1610_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
{
DBGENTER(1);
return 0;
}
static int innovator1610_panel_resume(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
......
drivers/video/omap/lcd_lph8923.c deleted 100644 → 0
View file @ e563dc81
#include <linux/module.h>
#include <linux/delay.h>
#include <asm/arch/hardware.h>
#include <asm/arch/gpio.h>
#include <asm/arch/board.h>
#include <asm/arch/omapfb.h>
#include <asm/arch/lcd_lph8923.h>
#include <linux/spi/spi.h>
#include <asm/arch/mcspi.h>
#include "../../cbus/tahvo.h"
/* #define OMAPFB_DBG 1 */
#include "debug.h"
#define LPH8923_MODULE_NAME "lcd_lph8923"
#define LPH8923_VER_BUGGY 1
#define LPH8923_VER_NON_BUGGY 3
struct {
int enabled;
int version;
u8 display_id[3];
unsigned int saved_bklight_level;
unsigned long hw_guard_end; /* next value of jiffies
when we can issue the
next sleep in/out command */
unsigned long hw_guard_wait; /* max guard time in jiffies */
struct omapfb_device *fbdev;
struct spi_device *spi;
} lph8923;
#define LPH8923_CMD_READ_DISP_ID 0x04
#define LPH8923_CMD_READ_RED 0x06
#define LPH8923_CMD_READ_GREEN 0x07
#define LPH8923_CMD_READ_BLUE 0x08
#define LPH8923_CMD_READ_DISP_STATUS 0x09
#define LPH8923_CMD_SLEEP_IN 0x10
#define LPH8923_CMD_SLEEP_OUT 0x11
#define LPH8923_CMD_DISP_OFF 0x28
#define LPH8923_CMD_DISP_ON 0x29
static struct lcd_panel lph8923_panel;
#define LPH8923_SPEED_HZ 12000000
static int lph8923_spi_probe(struct spi_device *spi)
{
DBGENTER(1);
spi->dev.power.power_state = PMSG_ON;
spi->mode = SPI_MODE_0;
spi->bits_per_word = 9;
spi_setup(spi);
DBGPRINT(1, "spi %p\n", spi);
lph8923.spi = spi;
omapfb_register_panel(&lph8923_panel);
return 0;
}
static int lph8923_spi_remove(struct spi_device *spi)
{
DBGENTER(1);
lph8923.spi = NULL;
return 0;
}
static struct spi_driver lph8923_spi_driver = {
.driver = {
.name = LPH8923_MODULE_NAME,
.bus = &spi_bus_type,
.owner = THIS_MODULE,
},
.probe = lph8923_spi_probe,
.remove = __devexit_p(lph8923_spi_remove),
};
static int lph8923_drv_init(void)
{
spi_register_driver(&lph8923_spi_driver);
return 0;
}
module_init(lph8923_drv_init);
static void lph8923_drv_cleanup(void)
{
spi_unregister_driver(&lph8923_spi_driver);
}
module_exit(lph8923_drv_cleanup);
static void set_spi_data_width(int width)
{
if (lph8923.spi->bits_per_word != width) {
lph8923.spi->bits_per_word = width;
spi_setup(lph8923.spi);
}
}
static void lph8923_read(int cmd, u8 *buf, int len)
{
struct spi_message m;
struct spi_transfer t;
u16 w;
BUG_ON(lph8923.spi == NULL);
spi_message_init(&m);
m.spi = lph8923.spi;
if (len > 1) {
cmd <<= 1;
set_spi_data_width(10);
} else
set_spi_data_width(9);
w = cmd;
t.cs_change = len ? 1 : 0;
t.tx_buf = &w;
t.rx_buf = NULL;
t.len = 2;
spi_message_add_tail(&t, &m);
spi_sync(m.spi, &m);
if (!len)
return;
spi_message_init(&m);
m.spi = lph8923.spi;
t.cs_change = 0;
t.tx_buf = NULL;
t.rx_buf = buf;
t.len = len;
set_spi_data_width(8);
spi_message_add_tail(&t, &m);
spi_sync(m.spi, &m);
}
static void lph8923_write(int cmd, const u8 *buf, int len)
{
struct spi_message m;
struct spi_transfer t;
u16 w;
int i;
BUG_ON(lph8923.spi == NULL);
spi_message_init(&m);
m.spi = lph8923.spi;
set_spi_data_width(9);
t.cs_change = 0;
w = cmd;
t.tx_buf = &w;
t.rx_buf = NULL;
t.len = 2;
spi_message_add_tail(&t, &m);
spi_sync(m.spi, &m);
if (!len)
return;
t.tx_buf = &w;
for (i = 0; i < len; i++) {
spi_message_init(&m);
m.spi = lph8923.spi;
spi_message_add_tail(&t, &m);
w = buf[i] | (1 << 8);
spi_sync(m.spi, &m);
}
}
static inline void lph8923_cmd(int cmd)
{
lph8923_write(cmd, NULL, 0);
}
struct cmd_data {
u8 cmd;
u8 len;
const u8 *data;
} __attribute__ ((packed));;
static const struct cmd_data init_cmds_buggy_lph8923[] = {
{ 0xb0, 1, "\x08" },
{ 0xb1, 2, "\x0b\x1c" },
{ 0xb2, 4, "\x00\x00\x00\x00" },
{ 0xb3, 4, "\x00\x00\x00\x00" },
{ 0xb4, 1, "\x87" },
{ 0xb5, 4, "\x37\x07\x37\x07" },
{ 0xb6, 2, "\x64\x24" },
{ 0xb7, 1, "\x90" },
{ 0xb8, 3, "\x10\x11\x20" },
{ 0xb9, 2, "\x31\x02" },
{ 0xba, 3, "\x04\xa3\x9d" },
{ 0xbb, 4, "\x15\xb2\x8c\x00" },
{ 0xc2, 3, "\x02\x00\x00" },
};
static const struct cmd_data init_cmds_non_buggy_lph8923[] = {
{ 0xc2, 3, "\x02\x00\x00" },
};
static inline void lph8923_set_16bit_mode(void)
{
lph8923_write(0x3a, "\x50", 1);
}
static void lph8923_send_init_string(void)
{
int c;
const struct cmd_data *cd;
switch (lph8923.version) {
case LPH8923_VER_BUGGY:
c = sizeof(init_cmds_buggy_lph8923)/sizeof(init_cmds_buggy_lph8923[0]);
cd = init_cmds_buggy_lph8923;
break;
case LPH8923_VER_NON_BUGGY:
default:
c = sizeof(init_cmds_non_buggy_lph8923)/sizeof(init_cmds_non_buggy_lph8923[0]);
cd = init_cmds_non_buggy_lph8923;
break;
}
while (c--) {
lph8923_write(cd->cmd, cd->data, cd->len);
cd++;
}
lph8923_set_16bit_mode();
}
static void hw_guard_start(int guard_msec)
{
lph8923.hw_guard_wait = msecs_to_jiffies(guard_msec);
lph8923.hw_guard_end = jiffies + lph8923.hw_guard_wait;
}
static void hw_guard_wait(void)
{
unsigned long wait = lph8923.hw_guard_end - jiffies;
if ((long)wait > 0 && wait <= lph8923.hw_guard_wait) {
set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(wait);
}
}
static void lph8923_set_sleep_mode(int on)
{
int cmd, sleep_time = 5;
if (on)
cmd = LPH8923_CMD_SLEEP_IN;
else
cmd = LPH8923_CMD_SLEEP_OUT;
hw_guard_wait();
lph8923_cmd(cmd);
hw_guard_start(120);
/* When we enable the panel, it seems we _have_ to sleep
* 120 ms before sending the init string */
if (!on)
sleep_time = 120;
msleep(sleep_time);
}
static void lph8923_set_display_state(int enabled)
{
int cmd = enabled ? LPH8923_CMD_DISP_ON : LPH8923_CMD_DISP_OFF;
lph8923_cmd(cmd);
}
static void lph8923_detect(void)
{
lph8923_read(LPH8923_CMD_READ_DISP_ID, lph8923.display_id, 3);
printk(KERN_INFO "Moscow display id: %02x%02x%02x\n",
lph8923.display_id[0], lph8923.display_id[1],
lph8923.display_id[2]);
if (lph8923.display_id[0] == 0x45) {
lph8923.version = LPH8923_VER_NON_BUGGY;
printk(KERN_INFO "Non-buggy Moscow detected\n");
return;
} else {
lph8923.version = LPH8923_VER_BUGGY;
printk(KERN_INFO "Buggy Moscow detected\n");
}
}
static int lph8923_enabled(void)
{
u32 disp_status;
int enabled;
lph8923_read(LPH8923_CMD_READ_DISP_STATUS, (u8 *)&disp_status, 4);
disp_status = __be32_to_cpu(disp_status);
enabled = (disp_status & (1 << 17)) && (disp_status & (1 << 10));
DBGPRINT(1, ": panel %senabled by bootloader (status 0x%04x)\n",
enabled ? "" : "not ", disp_status);
return enabled;
}
static int lph8923_panel_init(struct omapfb_device *fbdev)
{
lph8923.fbdev = fbdev;
lph8923.enabled = 1;
lph8923_detect();
if (lph8923.version == LPH8923_VER_NON_BUGGY)
lph8923.enabled = lph8923_enabled();
else
/* We can't be sure, but assume the bootloader
* enabled it already */
lph8923.enabled = 1;
return 0;
}
static void lph8923_panel_cleanup(void)
{
}
static int lph8923_panel_set_bklight_level(unsigned int level)
{
if (level > tahvo_get_max_backlight_level())
return -EINVAL;
if (!lph8923.enabled) {
lph8923.saved_bklight_level = level;
return 0;
}
tahvo_set_backlight_level(level);
return 0;
}
static unsigned int lph8923_panel_get_bklight_level(void)
{
return tahvo_get_backlight_level();
}
static unsigned int lph8923_panel_get_bklight_max(void)
{
return tahvo_get_max_backlight_level();
}
static int lph8923_panel_enable(void)
{
if (lph8923.enabled)
return 0;
lph8923_set_sleep_mode(0);
lph8923.enabled = 1;
lph8923_send_init_string();
lph8923_set_display_state(1);
lph8923_panel_set_bklight_level(lph8923.saved_bklight_level);
return 0;
}
static void lph8923_panel_disable(void)
{
if (!lph8923.enabled)
return;
lph8923.saved_bklight_level = lph8923_panel_get_bklight_level();
lph8923_panel_set_bklight_level(0);
lph8923_set_display_state(0);
lph8923_set_sleep_mode(1);
lph8923.enabled = 0;
}
static unsigned long lph8923_panel_get_caps(void)
{
return OMAPFB_CAPS_SET_BACKLIGHT;
}
static u16 read_first_pixel(void)
{
u8 b;
u16 pixel;
lph8923_read(LPH8923_CMD_READ_RED, &b, 1);
pixel = (b >> 1) << 11;
lph8923_read(LPH8923_CMD_READ_GREEN, &b, 1);
pixel |= b << 5;
lph8923_read(LPH8923_CMD_READ_BLUE, &b, 1);
pixel |= (b >> 1);
return pixel;
}
static int lph8923_panel_test(int test_num)
{
static const u16 test_values[4] = {
0x0000, 0xffff, 0xaaaa, 0x5555,
};
int i;
if (test_num != LCD_LPH8923_TEST_RGB_LINES)
return LCD_LPH8923_TEST_INVALID;
for (i = 0; i < ARRAY_SIZE(test_values); i++) {
int delay;
unsigned long tmo;
omapfb_write_first_pixel(lph8923.fbdev, test_values[i]);
tmo = jiffies + msecs_to_jiffies(100);
delay = msecs_to_jiffies(25);
while (1) {
u16 pixel;
set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(delay);
pixel = read_first_pixel();
if (pixel == test_values[i])
break;
if (time_after(jiffies, tmo)) {
printk(KERN_ERR "Moscow RGB I/F test failed: "
"expecting %04x, got %04x\n",
test_values[i], pixel);
return LCD_LPH8923_TEST_FAILED;
}
delay = msecs_to_jiffies(10);
}
}
return 0;
}
static struct lcd_panel lph8923_panel = {
.name = "lph8923",
.config = OMAP_LCDC_PANEL_TFT,
.bpp = 16,
.data_lines = 16,
.x_res = 800,
.y_res = 480,
.pixel_clock = 21940,
.hsw = 50,
.hfp = 20,
.hbp = 15,
.vsw = 2,
.vfp = 1,
.vbp = 3,
.init = lph8923_panel_init,
.cleanup = lph8923_panel_cleanup,
.enable = lph8923_panel_enable,
.disable = lph8923_panel_disable,
.get_caps = lph8923_panel_get_caps,
.set_bklight_level= lph8923_panel_set_bklight_level,
.get_bklight_level= lph8923_panel_get_bklight_level,
.get_bklight_max= lph8923_panel_get_bklight_max,
.run_test = lph8923_panel_test,
};
drivers/video/omap/lcd_mipid.c 0 → 100644
View file @ e5bb1ba6
This diff is collapsed.
drivers/video/omap/lcd_osk.c
View file @ e5bb1ba6
......@@ -29,27 +29,17 @@
#include <asm/arch/mux.h>
#include <asm/arch/omapfb.h>
/* #define OMAPFB_DBG 1 */
#include "debug.h"
static int osk_panel_init(struct omapfb_device *fbdev)
static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
{
DBGENTER(1);
DBGLEAVE(1);
return 0;
}
static void osk_panel_cleanup(void)
static void osk_panel_cleanup(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static int osk_panel_enable(void)
static int osk_panel_enable(struct lcd_panel *panel)
{
DBGENTER(1);
/* configure PWL pin */
omap_cfg_reg(PWL);
......@@ -65,14 +55,11 @@ static int osk_panel_enable(void)
/* set GPIO2 high */
omap_set_gpio_dataout(2, 1);
DBGLEAVE(1);
return 0;
}
static void osk_panel_disable(void)
static void osk_panel_disable(struct lcd_panel *panel)
{
DBGENTER(1);
/* Set PWL level to zero */
omap_writeb(0x00, OMAP16XX_PWL_ENABLE);
......@@ -81,11 +68,9 @@ static void osk_panel_disable(void)
/* set GPIO2 low */
omap_set_gpio_dataout(2, 0);
DBGLEAVE(1);
}
static unsigned long osk_panel_get_caps(void)
static unsigned long osk_panel_get_caps(struct lcd_panel *panel)
{
return 0;
}
......@@ -116,26 +101,22 @@ struct lcd_panel osk_panel = {
static int osk_panel_probe(struct platform_device *pdev)
{
DBGENTER(1);
omapfb_register_panel(&osk_panel);
return 0;
}
static int osk_panel_remove(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
static int osk_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
{
DBGENTER(1);
return 0;
}
static int osk_panel_resume(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
......
drivers/video/omap/lcd_p2.c
View file @ e5bb1ba6
......@@ -148,29 +148,23 @@ const unsigned short INIT_SCSTART[2] = { 0x00, 0x00 };
/* ----- end of epson_md_tft.h ----- */
#include "debug.h"
#include "../drivers/ssi/omap-uwire.h"
#define LCD_UWIRE_CS 0
static int p2_panel_init(struct omapfb_device *fbdev)
static int p2_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
{
DBGENTER(1);
DBGLEAVE(1);
return 0;
}
static void p2_panel_cleanup(void)
static void p2_panel_cleanup(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static int p2_panel_enable(void)
static int p2_panel_enable(struct lcd_panel *panel)
{
int i;
unsigned long value;
DBGENTER(1);
/* thwack the reset line */
omap_set_gpio_direction(19, 0);
......@@ -268,17 +262,14 @@ static int p2_panel_enable(void)
omap_set_gpio_direction(134, 0);
omap_set_gpio_dataout(134, 1);
DBGLEAVE(1);
return 0;
}
static void p2_panel_disable(void)
static void p2_panel_disable(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static unsigned long p2_panel_get_caps(void)
static unsigned long p2_panel_get_caps(struct lcd_panel *panel)
{
return 0;
}
......@@ -308,26 +299,22 @@ struct lcd_panel p2_panel = {
static int p2_panel_probe(struct platform_device *pdev)
{
DBGENTER(1);
omapfb_register_panel(&p2_panel);
return 0;
}
static int p2_panel_remove(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
static int p2_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
{
DBGENTER(1);
return 0;
}
static int p2_panel_resume(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
......
drivers/video/omap/lcd_palmte.c
View file @ e5bb1ba6
......@@ -29,37 +29,26 @@
#include <asm/arch/fpga.h>
#include <asm/arch/omapfb.h>
/* #define OMAPFB_DBG 1 */
#include "debug.h"
static int palmte_panel_init(struct omapfb_device *panel)
static int palmte_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)
{
DBGENTER(1);
DBGLEAVE(1);
return 0;
}
static void palmte_panel_cleanup(void)
static void palmte_panel_cleanup(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static int palmte_panel_enable(void)
static int palmte_panel_enable(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
return 0;
}
static void palmte_panel_disable(void)
static void palmte_panel_disable(struct lcd_panel *panel)
{
DBGENTER(1);
DBGLEAVE(1);
}
static unsigned long palmte_panel_get_caps(void)
static unsigned long palmte_panel_get_caps(struct lcd_panel *panel)
{
return 0;
}
......@@ -92,26 +81,22 @@ struct lcd_panel palmte_panel = {
static int palmte_panel_probe(struct platform_device *pdev)
{
DBGENTER(1);
omapfb_register_panel(&palmte_panel);
return 0;
}
static int palmte_panel_remove(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
static int palmte_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
{
DBGENTER(1);
return 0;
}
static int palmte_panel_resume(struct platform_device *pdev)
{
DBGENTER(1);
return 0;
}
......@@ -138,3 +123,4 @@ static void palmte_panel_drv_cleanup(void)
module_init(palmte_panel_drv_init);
module_exit(palmte_panel_drv_cleanup);
include/asm-arm/arch-omap/lcd_lph8923.h deleted 100644 → 0
View file @ e563dc81
#ifndef __LCD_LPH8923_H
#define __LCD_LPH8923_H
enum lcd_lph8923_test_num {
LCD_LPH8923_TEST_RGB_LINES,
};
enum lcd_lph8923_test_result {
LCD_LPH8923_TEST_SUCCESS,
LCD_LPH8923_TEST_INVALID,
LCD_LPH8923_TEST_FAILED,
};
#endif
include/asm-arm/arch-omap/lcd_mipid.h 0 → 100644
View file @ e5bb1ba6
#ifndef __LCD_MIPID_H
#define __LCD_MIPID_H
enum mipid_test_num {
MIPID_TEST_RGB_LINES,
};
enum mipid_test_result {
MIPID_TEST_SUCCESS,
MIPID_TEST_INVALID,
MIPID_TEST_FAILED,
};
#ifdef __KERNEL__
struct mipid_platform_data {
int nreset_gpio;
int data_lines;
void (*shutdown)(struct mipid_platform_data *pdata);
};
#endif
#endif
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