V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

sunxi: gpio: convert bind() to use driver data 

Now that the DM core sets driver_data before calling bind(), this driver
can make use of driver_data to determine the set of child devices to
create, rather than manually re-implementing the matching logic in code.

Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Stephen Warren 2016-05-11 15:26:25 -06:00 committed by Simon Glass
parent daac3bfee5
commit 6f82fac2f2
1 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
drivers/gpio/sunxi_gpio.c
View File

@ -258,43 +258,30 @@ static int gpio_sunxi_probe(struct udevice *dev)
return 0; return 0;
} }
struct sunxi_gpio_soc_data {
int start;
int no_banks;
};
/** /**
* We have a top-level GPIO device with no actual GPIOs. It has a child * We have a top-level GPIO device with no actual GPIOs. It has a child
* device for each Sunxi bank. * device for each Sunxi bank.
*/ */
static int gpio_sunxi_bind(struct udevice *parent) static int gpio_sunxi_bind(struct udevice *parent)
{ {
struct sunxi_gpio_soc_data *soc_data =
(struct sunxi_gpio_soc_data *)dev_get_driver_data(parent);
struct sunxi_gpio_platdata *plat = parent->platdata; struct sunxi_gpio_platdata *plat = parent->platdata;
struct sunxi_gpio_reg *ctlr; struct sunxi_gpio_reg *ctlr;
int bank, no_banks, ret, start; int bank, ret;
/* If this is a child device, there is nothing to do here */ /* If this is a child device, there is nothing to do here */
if (plat) if (plat)
return 0; return 0;
if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset,
"allwinner,sun6i-a31-r-pinctrl") == 0) {
start = 'L' - 'A';
no_banks = 2; /* L & M */
} else if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset,
"allwinner,sun8i-a23-r-pinctrl") == 0 ||
fdt_node_check_compatible(gd->fdt_blob, parent->of_offset,
"allwinner,sun8i-a83t-r-pinctrl") == 0 ||
fdt_node_check_compatible(gd->fdt_blob, parent->of_offset,
"allwinner,sun8i-h3-r-pinctrl") == 0) {
start = 'L' - 'A';
no_banks = 1; /* L only */
} else if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset,
"allwinner,sun9i-a80-r-pinctrl") == 0) {
start = 'L' - 'A';
no_banks = 3; /* L, M & N */
} else {
start = 0;
no_banks = SUNXI_GPIO_BANKS;
}
ctlr = (struct sunxi_gpio_reg *)dev_get_addr(parent); ctlr = (struct sunxi_gpio_reg *)dev_get_addr(parent);
for (bank = 0; bank < no_banks; bank++) { for (bank = 0; bank < soc_data->no_banks; bank++) {
struct sunxi_gpio_platdata *plat; struct sunxi_gpio_platdata *plat;
struct udevice *dev; struct udevice *dev;
@ -302,7 +289,7 @@ static int gpio_sunxi_bind(struct udevice *parent)
if (!plat) if (!plat)
return -ENOMEM; return -ENOMEM;
plat->regs = &ctlr->gpio_bank[bank]; plat->regs = &ctlr->gpio_bank[bank];
plat->bank_name = gpio_bank_name(start + bank); plat->bank_name = gpio_bank_name(soc_data->start + bank);
plat->gpio_count = SUNXI_GPIOS_PER_BANK; plat->gpio_count = SUNXI_GPIOS_PER_BANK;
ret = device_bind(parent, parent->driver, ret = device_bind(parent, parent->driver,
@ -315,23 +302,46 @@ static int gpio_sunxi_bind(struct udevice *parent)
return 0; return 0;
} }
static const struct sunxi_gpio_soc_data soc_data_a_all = {
.start = 0,
.no_banks = SUNXI_GPIO_BANKS,
};
static const struct sunxi_gpio_soc_data soc_data_l_1 = {
.start = 'L' - 'A',
.no_banks = 1,
};
static const struct sunxi_gpio_soc_data soc_data_l_2 = {
.start = 'L' - 'A',
.no_banks = 2,
};
static const struct sunxi_gpio_soc_data soc_data_l_3 = {
.start = 'L' - 'A',
.no_banks = 3,
};
#define ID(_compat_, _soc_data_) \
{ .compatible = _compat_, .data = (ulong)&soc_data_##_soc_data_ }
static const struct udevice_id sunxi_gpio_ids[] = { static const struct udevice_id sunxi_gpio_ids[] = {
{ .compatible = "allwinner,sun4i-a10-pinctrl" }, ID("allwinner,sun4i-a10-pinctrl", a_all),
{ .compatible = "allwinner,sun5i-a10s-pinctrl" }, ID("allwinner,sun5i-a10s-pinctrl", a_all),
{ .compatible = "allwinner,sun5i-a13-pinctrl" }, ID("allwinner,sun5i-a13-pinctrl", a_all),
{ .compatible = "allwinner,sun6i-a31-pinctrl" }, ID("allwinner,sun6i-a31-pinctrl", a_all),
{ .compatible = "allwinner,sun6i-a31s-pinctrl" }, ID("allwinner,sun6i-a31s-pinctrl", a_all),
{ .compatible = "allwinner,sun7i-a20-pinctrl" }, ID("allwinner,sun7i-a20-pinctrl", a_all),
{ .compatible = "allwinner,sun8i-a23-pinctrl" }, ID("allwinner,sun8i-a23-pinctrl", a_all),
{ .compatible = "allwinner,sun8i-a33-pinctrl" }, ID("allwinner,sun8i-a33-pinctrl", a_all),
{ .compatible = "allwinner,sun8i-a83t-pinctrl", }, ID("allwinner,sun8i-a83t-pinctrl", a_all),
{ .compatible = "allwinner,sun8i-h3-pinctrl" }, ID("allwinner,sun8i-h3-pinctrl", a_all),
{ .compatible = "allwinner,sun9i-a80-pinctrl" }, ID("allwinner,sun9i-a80-pinctrl", a_all),
{ .compatible = "allwinner,sun6i-a31-r-pinctrl" }, ID("allwinner,sun6i-a31-r-pinctrl", l_2),
{ .compatible = "allwinner,sun8i-a23-r-pinctrl" }, ID("allwinner,sun8i-a23-r-pinctrl", l_1),
{ .compatible = "allwinner,sun8i-a83t-r-pinctrl" }, ID("allwinner,sun8i-a83t-r-pinctrl", l_1),
{ .compatible = "allwinner,sun8i-h3-r-pinctrl", }, ID("allwinner,sun8i-h3-r-pinctrl", l_1),
{ .compatible = "allwinner,sun9i-a80-r-pinctrl", }, ID("allwinner,sun9i-a80-r-pinctrl", l_3),
{ } { }
}; };