Commit 24186ccd authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman

staging: mt7621-gpio: assign gpio chip custom changes after bgpio_init

bgpio_init function set different data of the gpio chip, like the name.
We want specific name for each bank so to get that not overwritten
move all custom changes after the bgpio_init function call.
Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Reviewed-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf229037
...@@ -236,9 +236,6 @@ mediatek_gpio_bank_probe(struct platform_device *pdev, ...@@ -236,9 +236,6 @@ mediatek_gpio_bank_probe(struct platform_device *pdev,
spin_lock_init(&rg->lock); spin_lock_init(&rg->lock);
rg->chip.of_node = node; rg->chip.of_node = node;
rg->bank = bank; rg->bank = bank;
rg->chip.of_gpio_n_cells = 2;
rg->chip.of_xlate = mediatek_gpio_xlate;
rg->chip.label = mediatek_gpio_bank_name(rg->bank);
dat = gpio->gpio_membase + GPIO_REG_DATA + (rg->bank * GPIO_BANK_WIDE); dat = gpio->gpio_membase + GPIO_REG_DATA + (rg->bank * GPIO_BANK_WIDE);
set = gpio->gpio_membase + GPIO_REG_DSET + (rg->bank * GPIO_BANK_WIDE); set = gpio->gpio_membase + GPIO_REG_DSET + (rg->bank * GPIO_BANK_WIDE);
...@@ -252,6 +249,10 @@ mediatek_gpio_bank_probe(struct platform_device *pdev, ...@@ -252,6 +249,10 @@ mediatek_gpio_bank_probe(struct platform_device *pdev,
return ret; return ret;
} }
rg->chip.of_gpio_n_cells = 2;
rg->chip.of_xlate = mediatek_gpio_xlate;
rg->chip.label = mediatek_gpio_bank_name(rg->bank);
ret = devm_gpiochip_add_data(&pdev->dev, &rg->chip, gpio); ret = devm_gpiochip_add_data(&pdev->dev, &rg->chip, gpio);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Could not register gpio %d, ret=%d\n", dev_err(&pdev->dev, "Could not register gpio %d, ret=%d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment