LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: zynq: Used platdata structure for storing static data instead of priv 

This patch used platdata structure instead of priv for storing static
information read from DT.

Signed-off-by: Vipul Kumar <vipul.kumar@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Vipul Kumar 2018-07-20 14:36:49 +05:30 committed by Michal Simek
parent 8a32077ea6
commit 0f07257345
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
drivers/gpio/zynq_gpio.c
View File

@ -93,7 +93,7 @@
/* GPIO upper 16 bit mask */ /* GPIO upper 16 bit mask */
#define ZYNQ_GPIO_UPPER_MASK 0xFFFF0000 #define ZYNQ_GPIO_UPPER_MASK 0xFFFF0000
struct zynq_gpio_privdata { struct zynq_gpio_platdata {
phys_addr_t base; phys_addr_t base;
const struct zynq_platform_data *p_data; const struct zynq_platform_data *p_data;
}; };
@ -162,20 +162,20 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num,
unsigned int *bank_pin_num, unsigned int *bank_pin_num,
struct udevice *dev) struct udevice *dev)
{ {
struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
u32 bank; u32 bank;
for (bank = 0; bank < priv->p_data->max_bank; bank++) { for (bank = 0; bank < platdata->p_data->max_bank; bank++) {
if ((pin_num >= priv->p_data->bank_min[bank]) && if (pin_num >= platdata->p_data->bank_min[bank] &&
(pin_num <= priv->p_data->bank_max[bank])) { pin_num <= platdata->p_data->bank_max[bank]) {
*bank_num = bank; *bank_num = bank;
*bank_pin_num = pin_num - *bank_pin_num = pin_num -
priv->p_data->bank_min[bank]; platdata->p_data->bank_min[bank];
return; return;
} }
} }
if (bank >= priv->p_data->max_bank) { if (bank >= platdata->p_data->max_bank) {
printf("Invalid bank and pin num\n"); printf("Invalid bank and pin num\n");
*bank_num = 0; *bank_num = 0;
*bank_pin_num = 0; *bank_pin_num = 0;
@ -184,9 +184,9 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num,
static int gpio_is_valid(unsigned gpio, struct udevice *dev) static int gpio_is_valid(unsigned gpio, struct udevice *dev)
{ {
struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
return gpio < priv->p_data->ngpio; return gpio < platdata->p_data->ngpio;
} }
static int check_gpio(unsigned gpio, struct udevice *dev) static int check_gpio(unsigned gpio, struct udevice *dev)
@ -202,14 +202,14 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio)
{ {
u32 data; u32 data;
unsigned int bank_num, bank_pin_num; unsigned int bank_num, bank_pin_num;
struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
if (check_gpio(gpio, dev) < 0) if (check_gpio(gpio, dev) < 0)
return -1; return -1;
zynq_gpio_get_bank_pin(gpio, &bank_num, &bank_pin_num, dev); zynq_gpio_get_bank_pin(gpio, &bank_num, &bank_pin_num, dev);
data = readl(priv->base + data = readl(platdata->base +
ZYNQ_GPIO_DATA_RO_OFFSET(bank_num)); ZYNQ_GPIO_DATA_RO_OFFSET(bank_num));
return (data >> bank_pin_num) & 1; return (data >> bank_pin_num) & 1;
@ -218,7 +218,7 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio)
static int zynq_gpio_set_value(struct udevice *dev, unsigned gpio, int value) static int zynq_gpio_set_value(struct udevice *dev, unsigned gpio, int value)
{ {
unsigned int reg_offset, bank_num, bank_pin_num; unsigned int reg_offset, bank_num, bank_pin_num;
struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
if (check_gpio(gpio, dev) < 0) if (check_gpio(gpio, dev) < 0)
return -1; return -1;
@ -241,7 +241,7 @@ static int zynq_gpio_set_value(struct udevice *dev, unsigned gpio, int value)
value = ~(1 << (bank_pin_num + ZYNQ_GPIO_MID_PIN_NUM)) & value = ~(1 << (bank_pin_num + ZYNQ_GPIO_MID_PIN_NUM)) &
((value << bank_pin_num) | ZYNQ_GPIO_UPPER_MASK); ((value << bank_pin_num) | ZYNQ_GPIO_UPPER_MASK);
writel(value, priv->base + reg_offset); writel(value, platdata->base + reg_offset);
return 0; return 0;
} }
@ -250,7 +250,7 @@ static int zynq_gpio_direction_input(struct udevice *dev, unsigned gpio)
{ {
u32 reg; u32 reg;
unsigned int bank_num, bank_pin_num; unsigned int bank_num, bank_pin_num;
struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
if (check_gpio(gpio, dev) < 0) if (check_gpio(gpio, dev) < 0)
return -1; return -1;
@ -262,9 +262,9 @@ static int zynq_gpio_direction_input(struct udevice *dev, unsigned gpio)
return -1; return -1;
/* clear the bit in direction mode reg to set the pin as input */ /* clear the bit in direction mode reg to set the pin as input */
reg = readl(priv->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); reg = readl(platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num));
reg &= ~BIT(bank_pin_num); reg &= ~BIT(bank_pin_num);
writel(reg, priv->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); writel(reg, platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num));
return 0; return 0;
} }
@ -274,7 +274,7 @@ static int zynq_gpio_direction_output(struct udevice *dev, unsigned gpio,
{ {
u32 reg; u32 reg;
unsigned int bank_num, bank_pin_num; unsigned int bank_num, bank_pin_num;
struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
if (check_gpio(gpio, dev) < 0) if (check_gpio(gpio, dev) < 0)
return -1; return -1;
@ -282,14 +282,14 @@ static int zynq_gpio_direction_output(struct udevice *dev, unsigned gpio,
zynq_gpio_get_bank_pin(gpio, &bank_num, &bank_pin_num, dev); zynq_gpio_get_bank_pin(gpio, &bank_num, &bank_pin_num, dev);
/* set the GPIO pin as output */ /* set the GPIO pin as output */
reg = readl(priv->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); reg = readl(platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num));
reg |= BIT(bank_pin_num); reg |= BIT(bank_pin_num);
writel(reg, priv->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); writel(reg, platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num));
/* configure the output enable reg for the pin */ /* configure the output enable reg for the pin */
reg = readl(priv->base + ZYNQ_GPIO_OUTEN_OFFSET(bank_num)); reg = readl(platdata->base + ZYNQ_GPIO_OUTEN_OFFSET(bank_num));
reg |= BIT(bank_pin_num); reg |= BIT(bank_pin_num);
writel(reg, priv->base + ZYNQ_GPIO_OUTEN_OFFSET(bank_num)); writel(reg, platdata->base + ZYNQ_GPIO_OUTEN_OFFSET(bank_num));
/* set the state of the pin */ /* set the state of the pin */
gpio_set_value(gpio, value); gpio_set_value(gpio, value);
@ -300,7 +300,7 @@ static int zynq_gpio_get_function(struct udevice *dev, unsigned offset)
{ {
u32 reg; u32 reg;
unsigned int bank_num, bank_pin_num; unsigned int bank_num, bank_pin_num;
struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
if (check_gpio(offset, dev) < 0) if (check_gpio(offset, dev) < 0)
return -1; return -1;
@ -308,7 +308,7 @@ static int zynq_gpio_get_function(struct udevice *dev, unsigned offset)
zynq_gpio_get_bank_pin(offset, &bank_num, &bank_pin_num, dev); zynq_gpio_get_bank_pin(offset, &bank_num, &bank_pin_num, dev);
/* set the GPIO pin as output */ /* set the GPIO pin as output */
reg = readl(priv->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); reg = readl(platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num));
reg &= BIT(bank_pin_num); reg &= BIT(bank_pin_num);
if (reg) if (reg)
return GPIOF_OUTPUT; return GPIOF_OUTPUT;
@ -334,24 +334,25 @@ static const struct udevice_id zynq_gpio_ids[] = {
static int zynq_gpio_probe(struct udevice *dev) static int zynq_gpio_probe(struct udevice *dev)
{ {
struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
uc_priv->bank_name = dev->name; uc_priv->bank_name = dev->name;
if (priv->p_data) if (platdata->p_data)
uc_priv->gpio_count = priv->p_data->ngpio; uc_priv->gpio_count = platdata->p_data->ngpio;
return 0; return 0;
} }
static int zynq_gpio_ofdata_to_platdata(struct udevice *dev) static int zynq_gpio_ofdata_to_platdata(struct udevice *dev)
{ {
struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
priv->base = (phys_addr_t)dev_read_addr(dev); platdata->base = (phys_addr_t)dev_read_addr(dev);
priv->p_data = (struct zynq_platform_data *)dev_get_driver_data(dev); platdata->p_data =
(struct zynq_platform_data *)dev_get_driver_data(dev);
return 0; return 0;
} }
@ -363,5 +364,5 @@ U_BOOT_DRIVER(gpio_zynq) = {
.of_match = zynq_gpio_ids, .of_match = zynq_gpio_ids,
.ofdata_to_platdata = zynq_gpio_ofdata_to_platdata, .ofdata_to_platdata = zynq_gpio_ofdata_to_platdata,
.probe = zynq_gpio_probe, .probe = zynq_gpio_probe,
.priv_auto_alloc_size = sizeof(struct zynq_gpio_privdata), .platdata_auto_alloc_size = sizeof(struct zynq_gpio_platdata),
}; };