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

Commit 02f17ffd authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Bartlomiej Zolnierkiewicz
Browse files

video: fbdev: omapfb: lcd_ams_delta: use GPIO lookup table 



Now as Amstrad Delta board - the only user of this driver - provides
GPIO lookup tables, switch from GPIO numbers to GPIO descriptors and
use the table to locate required GPIO pins.

Declare static variables for storing GPIO descriptors and replace
gpio_ function calls with their gpiod_ equivalents. Move GPIO lookup
to the driver probe function so device initialization can be deferred
instead of aborted if a GPIO pin is not yet available.

Pin naming used by the driver should be followed while respective GPIO
lookup table is initialized by a board init code.

Signed-off-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Boris Brezillon <boris.brezillon@bootlin.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent e5017716

drivers/video/fbdev/omap/lcd_ams_delta.c

+22 −33
Original line number Diff line number Diff line
@@ -24,11 +24,10 @@ 
#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/delay.h>

#include <linux/gpio/consumer.h>

#include <linux/lcd.h>

#include <linux/gpio.h>



#include <mach/hardware.h>

#include <mach/board-ams-delta.h>



#include "omapfb.h"
@@ -41,6 +40,8 @@ 
/* LCD class device section */



static int ams_delta_lcd;

static struct gpio_desc *gpiod_vblen;

static struct gpio_desc *gpiod_ndisp;



static int ams_delta_lcd_set_power(struct lcd_device *dev, int power)

{
@@ -99,41 +100,17 @@ static struct lcd_ops ams_delta_lcd_ops = { 


/* omapfb panel section */



static const struct gpio _gpios[] = {

	{

		.gpio	= AMS_DELTA_GPIO_PIN_LCD_VBLEN,

		.flags	= GPIOF_OUT_INIT_LOW,

		.label	= "lcd_vblen",

	},

	{

		.gpio	= AMS_DELTA_GPIO_PIN_LCD_NDISP,

		.flags	= GPIOF_OUT_INIT_LOW,

		.label	= "lcd_ndisp",

	},

};



static int ams_delta_panel_init(struct lcd_panel *panel,

		struct omapfb_device *fbdev)

{

	return gpio_request_array(_gpios, ARRAY_SIZE(_gpios));

}



static void ams_delta_panel_cleanup(struct lcd_panel *panel)

{

	gpio_free_array(_gpios, ARRAY_SIZE(_gpios));

}



static int ams_delta_panel_enable(struct lcd_panel *panel)

{

	gpio_set_value(AMS_DELTA_GPIO_PIN_LCD_NDISP, 1);

	gpio_set_value(AMS_DELTA_GPIO_PIN_LCD_VBLEN, 1);

	gpiod_set_value(gpiod_ndisp, 1);

	gpiod_set_value(gpiod_vblen, 1);

	return 0;

}



static void ams_delta_panel_disable(struct lcd_panel *panel)

{

	gpio_set_value(AMS_DELTA_GPIO_PIN_LCD_VBLEN, 0);

	gpio_set_value(AMS_DELTA_GPIO_PIN_LCD_NDISP, 0);

	gpiod_set_value(gpiod_vblen, 0);

	gpiod_set_value(gpiod_ndisp, 0);

}



static struct lcd_panel ams_delta_panel = {
@@ -154,8 +131,6 @@ static struct lcd_panel ams_delta_panel = { 
	.pcd		= 0,

	.acb		= 37,



	.init		= ams_delta_panel_init,

	.cleanup	= ams_delta_panel_cleanup,

	.enable		= ams_delta_panel_enable,

	.disable	= ams_delta_panel_disable,

};
@@ -166,9 +141,23 @@ static struct lcd_panel ams_delta_panel = { 
static int ams_delta_panel_probe(struct platform_device *pdev)

{

	struct lcd_device *lcd_device = NULL;

#ifdef CONFIG_LCD_CLASS_DEVICE

	int ret;



	gpiod_vblen = devm_gpiod_get(&pdev->dev, "vblen", GPIOD_OUT_LOW);

	if (IS_ERR(gpiod_vblen)) {

		ret = PTR_ERR(gpiod_vblen);

		dev_err(&pdev->dev, "VBLEN GPIO request failed (%d)\n", ret);

		return ret;

	}



	gpiod_ndisp = devm_gpiod_get(&pdev->dev, "ndisp", GPIOD_OUT_LOW);

	if (IS_ERR(gpiod_ndisp)) {

		ret = PTR_ERR(gpiod_ndisp);

		dev_err(&pdev->dev, "NDISP GPIO request failed (%d)\n", ret);

		return ret;

	}



#ifdef CONFIG_LCD_CLASS_DEVICE

	lcd_device = lcd_device_register("omapfb", &pdev->dev, NULL,

						&ams_delta_lcd_ops);