hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

video: fbdev: atmel_lcdfb: convert to use GPIO descriptors 

Use GPIO descriptors instead of relying on the old method.

Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
This commit is contained in:
Ludovic Desroches 2018-03-12 17:06:52 +01:00 committed by Bartlomiej Zolnierkiewicz
parent 5908986ef3
commit a81265222e
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/video/fbdev/atmel_lcdfb.c
View File

@ -18,10 +18,10 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/backlight.h> #include <linux/backlight.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/gpio/consumer.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_gpio.h>
#include <video/of_display_timing.h> #include <video/of_display_timing.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <video/videomode.h> #include <video/videomode.h>
@ -61,8 +61,7 @@ struct atmel_lcdfb_info {
}; };
struct atmel_lcdfb_power_ctrl_gpio { struct atmel_lcdfb_power_ctrl_gpio {
int gpio; struct gpio_desc *gpiod;
int active_low;
struct list_head list; struct list_head list;
}; };
@ -1018,7 +1017,7 @@ static void atmel_lcdfb_power_control_gpio(struct atmel_lcdfb_pdata *pdata, int
struct atmel_lcdfb_power_ctrl_gpio *og; struct atmel_lcdfb_power_ctrl_gpio *og;
list_for_each_entry(og, &pdata->pwr_gpios, list) list_for_each_entry(og, &pdata->pwr_gpios, list)
gpio_set_value(og->gpio, on); gpiod_set_value(og->gpiod, on);
} }
static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
@ -1031,11 +1030,11 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
struct device_node *display_np; struct device_node *display_np;
struct device_node *timings_np; struct device_node *timings_np;
struct display_timings *timings; struct display_timings *timings;
enum of_gpio_flags flags;
struct atmel_lcdfb_power_ctrl_gpio *og; struct atmel_lcdfb_power_ctrl_gpio *og;
bool is_gpio_power = false; bool is_gpio_power = false;
struct gpio_desc *gpiod;
int ret = -ENOENT; int ret = -ENOENT;
int i, gpio; int i;
sinfo->config = (struct atmel_lcdfb_config*) sinfo->config = (struct atmel_lcdfb_config*)
of_match_device(atmel_lcdfb_dt_ids, dev)->data; of_match_device(atmel_lcdfb_dt_ids, dev)->data;
@ -1072,28 +1071,22 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
INIT_LIST_HEAD(&pdata->pwr_gpios); INIT_LIST_HEAD(&pdata->pwr_gpios);
ret = -ENOMEM; ret = -ENOMEM;
for (i = 0; i < of_gpio_named_count(display_np, "atmel,power-control-gpio"); i++) { for (i = 0; i < gpiod_count(dev, "atmel,power-control"); i++) {
gpio = of_get_named_gpio_flags(display_np, "atmel,power-control-gpio", gpiod = devm_gpiod_get_index(dev, "atmel,power-control",
i, &flags); i, GPIOD_ASIS);
if (gpio < 0) if (IS_ERR(gpiod))
continue; continue;
og = devm_kzalloc(dev, sizeof(*og), GFP_KERNEL); og = devm_kzalloc(dev, sizeof(*og), GFP_KERNEL);
if (!og) if (!og)
goto put_display_node; goto put_display_node;
og->gpio = gpio; og->gpiod = gpiod;
og->active_low = flags & OF_GPIO_ACTIVE_LOW;
is_gpio_power = true; is_gpio_power = true;
ret = devm_gpio_request(dev, gpio, "lcd-power-control-gpio");
if (ret) {
dev_err(dev, "request gpio %d failed\n", gpio);
goto put_display_node;
}
ret = gpio_direction_output(gpio, og->active_low); ret = gpiod_direction_output(gpiod, gpiod_is_active_low(gpiod));
if (ret) { if (ret) {
dev_err(dev, "set direction output gpio %d failed\n", gpio); dev_err(dev, "set direction output gpio atmel,power-control[%d] failed\n", i);
goto put_display_node; goto put_display_node;
} }
list_add(&og->list, &pdata->pwr_gpios); list_add(&og->list, &pdata->pwr_gpios);