Commit be2a7e2d authored by Rashmica Gupta's avatar Rashmica Gupta Committed by Linus Walleij
Browse files

gpio: aspeed: Use ngpio property from device tree if available 



Use the ngpio property from the device tree if it exists. If it doesn't
then fallback to the hardcoded value in the config.

This is in preparation for adding ast2600 support. The ast2600 SoC has
two GPIO controllers and so requires two instances of the GPIO driver.
We use the ngpio property to different between them as they have
different numbers of GPIOs.

Signed-off-by: default avatarRashmica Gupta <rashmica.g@gmail.com>
Link: https://lore.kernel.org/r/20190906062727.13521-1-rashmica.g@gmail.com


Reviewed-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3d64a5a7

drivers/gpio/gpio-aspeed.c

+11 −7
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ static void aspeed_init_irq_valid_mask(struct gpio_chip *gc, 
		for_each_clear_bit(offset, &input, 32) {

			unsigned int i = props->bank * 32 + offset;



			if (i >= gpio->config->nr_gpios)

			if (i >= gpio->chip.ngpio)

				break;



			clear_bit(i, valid_mask);
@@ -1010,10 +1010,10 @@ int aspeed_gpio_copro_grab_gpio(struct gpio_desc *desc, 
	unsigned long flags;



	if (!gpio->cf_copro_bankmap)

		gpio->cf_copro_bankmap = kzalloc(gpio->config->nr_gpios >> 3, GFP_KERNEL);

		gpio->cf_copro_bankmap = kzalloc(gpio->chip.ngpio >> 3, GFP_KERNEL);

	if (!gpio->cf_copro_bankmap)

		return -ENOMEM;

	if (offset < 0 || offset > gpio->config->nr_gpios)

	if (offset < 0 || offset > gpio->chip.ngpio)

		return -EINVAL;

	bindex = offset >> 3;
@@ -1058,7 +1058,7 @@ int aspeed_gpio_copro_release_gpio(struct gpio_desc *desc) 
	if (!gpio->cf_copro_bankmap)

		return -ENXIO;



	if (offset < 0 || offset > gpio->config->nr_gpios)

	if (offset < 0 || offset > gpio->chip.ngpio)

		return -EINVAL;

	bindex = offset >> 3;
@@ -1122,7 +1122,8 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) 
{

	const struct of_device_id *gpio_id;

	struct aspeed_gpio *gpio;

	int rc, i, banks;

	int rc, i, banks, err;

	u32 ngpio;



	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);

	if (!gpio)
@@ -1148,6 +1149,9 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) 
	gpio->config = gpio_id->data;



	gpio->chip.parent = &pdev->dev;

	err = of_property_read_u32(pdev->dev.of_node, "ngpios", &ngpio);

	gpio->chip.ngpio = (u16) ngpio;

	if (err)

		gpio->chip.ngpio = gpio->config->nr_gpios;

	gpio->chip.direction_input = aspeed_gpio_dir_in;

	gpio->chip.direction_output = aspeed_gpio_dir_out;
@@ -1161,7 +1165,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) 
	gpio->chip.base = -1;



	/* Allocate a cache of the output registers */

	banks = DIV_ROUND_UP(gpio->config->nr_gpios, 32);

	banks = DIV_ROUND_UP(gpio->chip.ngpio, 32);

	gpio->dcache = devm_kcalloc(&pdev->dev,

				    banks, sizeof(u32), GFP_KERNEL);

	if (!gpio->dcache)

CRA Git | Maintained and supported by SUSTech CRA and CCSE