Skip to content

Commit

Permalink
OMAPDSS: nec-nl8048 panel: handle gpios in panel driver
Browse files Browse the repository at this point in the history
The nec-nl8048hl11-01 panel driver leaves gpio configurations to the
platform_enable and disable calls in the platform's board file. These should
happen in the panel driver itself.

Create a platform data struct for the panel, this contains the gpio numbers
used by the panel driver, this struct will be passed to the panel driver as
platform data. The driver will request and configure these gpios rather than
leaving it to platform callbacks in board files.

This will help in removing the need for the panel drivers to have platform
related callbacks.

Signed-off-by: Archit Taneja <archit@ti.com>
  • Loading branch information
Archit Taneja authored and Tomi Valkeinen committed Apr 3, 2013
1 parent 3c45d05 commit 57bc6c5
Showing 1 changed file with 34 additions and 11 deletions.
45 changes: 34 additions & 11 deletions drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
#include <linux/delay.h>
#include <linux/spi/spi.h>
#include <linux/fb.h>
#include <linux/gpio.h>

#include <video/omapdss.h>
#include <video/omap-panel-data.h>

#define LCD_XRES 800
#define LCD_YRES 480
Expand All @@ -31,9 +33,6 @@
*/
#define LCD_PIXEL_CLOCK 23800

struct nec_8048_data {
};

static const struct {
unsigned char addr;
unsigned char dat;
Expand Down Expand Up @@ -82,30 +81,46 @@ static struct omap_video_timings nec_8048_panel_timings = {
.sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
};

static inline struct panel_nec_nl8048_data
*get_panel_data(const struct omap_dss_device *dssdev)
{
return (struct panel_nec_nl8048_data *) dssdev->data;
}

static int nec_8048_panel_probe(struct omap_dss_device *dssdev)
{
struct nec_8048_data *necd;
struct panel_nec_nl8048_data *pd = get_panel_data(dssdev);
int r;

if (!pd)
return -EINVAL;

dssdev->panel.timings = nec_8048_panel_timings;

necd = kzalloc(sizeof(*necd), GFP_KERNEL);
if (!necd)
return -ENOMEM;
if (gpio_is_valid(pd->qvga_gpio)) {
r = devm_gpio_request_one(&dssdev->dev, pd->qvga_gpio,
GPIOF_OUT_INIT_HIGH, "lcd QVGA");
if (r)
return r;
}

dev_set_drvdata(&dssdev->dev, necd);
if (gpio_is_valid(pd->res_gpio)) {
r = devm_gpio_request_one(&dssdev->dev, pd->res_gpio,
GPIOF_OUT_INIT_LOW, "lcd RES");
if (r)
return r;
}

return 0;
}

static void nec_8048_panel_remove(struct omap_dss_device *dssdev)
{
struct nec_8048_data *necd = dev_get_drvdata(&dssdev->dev);

kfree(necd);
}

static int nec_8048_panel_power_on(struct omap_dss_device *dssdev)
{
struct panel_nec_nl8048_data *pd = get_panel_data(dssdev);
int r;

if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
Expand All @@ -124,6 +139,9 @@ static int nec_8048_panel_power_on(struct omap_dss_device *dssdev)
goto err1;
}

if (gpio_is_valid(pd->res_gpio))
gpio_set_value_cansleep(pd->res_gpio, 1);

return 0;
err1:
omapdss_dpi_display_disable(dssdev);
Expand All @@ -133,9 +151,14 @@ static int nec_8048_panel_power_on(struct omap_dss_device *dssdev)

static void nec_8048_panel_power_off(struct omap_dss_device *dssdev)
{
struct panel_nec_nl8048_data *pd = get_panel_data(dssdev);

if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
return;

if (gpio_is_valid(pd->res_gpio))
gpio_set_value_cansleep(pd->res_gpio, 0);

if (dssdev->platform_disable)
dssdev->platform_disable(dssdev);

Expand Down

0 comments on commit 57bc6c5

Please sign in to comment.