diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2018-07-12 10:58:04 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2018-07-19 10:49:54 +0200 |
| commit | 0df9bea4340ae64ec82004852ab325e869c371b8 (patch) | |
| tree | 59b6f3ba40db05a5e5d1616f6daa609a032be5b8 /drivers | |
| parent | 1b4c2aa25bdfe327b3c496e7bfe3c98b0ad4de44 (diff) | |
| download | u-boot-0df9bea4340ae64ec82004852ab325e869c371b8.zip u-boot-0df9bea4340ae64ec82004852ab325e869c371b8.tar.gz u-boot-0df9bea4340ae64ec82004852ab325e869c371b8.tar.bz2 | |
gpio: zynq: Read of mach data in platdata with dev_get_driver_data
Remove bogus zynq_gpio_getplat_data() and read driver data directly.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/zynq_gpio.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c index 9a91554..26f69b1 100644 --- a/drivers/gpio/zynq_gpio.c +++ b/drivers/gpio/zynq_gpio.c @@ -15,8 +15,6 @@ #include <dm.h> #include <fdtdec.h> -DECLARE_GLOBAL_DATA_PTR; - /* Maximum banks */ #define ZYNQ_GPIO_MAX_BANK 4 @@ -334,36 +332,11 @@ static const struct udevice_id zynq_gpio_ids[] = { { } }; -static void zynq_gpio_getplat_data(struct udevice *dev) -{ - const struct udevice_id *of_match = zynq_gpio_ids; - int ret; - struct zynq_gpio_privdata *priv = dev_get_priv(dev); - - while (of_match->compatible) { - ret = fdt_node_offset_by_compatible(gd->fdt_blob, -1, - of_match->compatible); - if (ret >= 0) { - priv->p_data = - (struct zynq_platform_data *)of_match->data; - break; - } else { - of_match++; - continue; - } - } - - if (!priv->p_data) - printf("No Platform data found\n"); -} - static int zynq_gpio_probe(struct udevice *dev) { struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); - zynq_gpio_getplat_data(dev); - if (priv->p_data) uc_priv->gpio_count = priv->p_data->ngpio; @@ -376,6 +349,8 @@ static int zynq_gpio_ofdata_to_platdata(struct udevice *dev) priv->base = (phys_addr_t)dev_read_addr(dev); + priv->p_data = (struct zynq_platform_data *)dev_get_driver_data(dev); + return 0; } |