From a24abc2faf5a4d101ec86da95247b0909789439f Mon Sep 17 00:00:00 2001 From: Jianqun Xu Date: Tue, 17 Nov 2020 18:21:58 +0800 Subject: [PATCH] pinctrl: rockchip: remove bank valid about gpio Change-Id: If8c8de4eae0bac109e3c81136530cf0c1887fc65 Signed-off-by: Jianqun Xu --- drivers/pinctrl/pinctrl-rockchip.c | 19 ------------------- drivers/pinctrl/pinctrl-rockchip.h | 2 -- 2 files changed, 21 deletions(-) diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 5fb91e987a4e..7817c96b390a 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -3421,9 +3421,6 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, return rc; break; case PIN_CONFIG_OUTPUT: - if (!bank->valid) - return -ENOTSUPP; - rc = rockchip_get_mux(bank, pin - bank->pin_base); if (rc != 0) { dev_err(info->dev, "pin-%d has been mux to func%d\n", pin, rc); @@ -3504,9 +3501,6 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin, arg = rc; break; case PIN_CONFIG_OUTPUT: - if (!bank->valid) - return -ENOTSUPP; - rc = rockchip_get_mux(bank, pin - bank->pin_base); if (rc != 0) { dev_err(info->dev, "pin-%d has been mux to func%d\n", pin, rc); @@ -3749,19 +3743,6 @@ static int rockchip_pinctrl_register(struct platform_device *pdev, return PTR_ERR(info->pctl_dev); } - for (bank = 0; bank < info->ctrl->nr_banks; ++bank) { - pin_bank = &info->ctrl->pin_banks[bank]; - if (!pin_bank->valid) - continue; - pin_bank->grange.name = pin_bank->name; - pin_bank->grange.id = bank; - pin_bank->grange.pin_base = pin_bank->pin_base; - pin_bank->grange.base = pin_bank->gpio_chip.base; - pin_bank->grange.npins = pin_bank->gpio_chip.ngpio; - pin_bank->grange.gc = &pin_bank->gpio_chip; - pinctrl_add_gpio_range(info->pctl_dev, &pin_bank->grange); - } - return 0; } diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h index 6e91b5a57cd5..b085aa290fcf 100644 --- a/drivers/pinctrl/pinctrl-rockchip.h +++ b/drivers/pinctrl/pinctrl-rockchip.h @@ -115,7 +115,6 @@ struct rockchip_drv { * @iomux: array describing the 4 iomux sources of the bank * @drv: array describing the 4 drive strength sources of the bank * @pull_type: array describing the 4 pull type sources of the bank - * @valid: is all necessary information present * @of_node: dt node of this bank * @drvdata: common pinctrl basedata * @domain: irqdomain of the gpio bank @@ -140,7 +139,6 @@ struct rockchip_pin_bank { struct rockchip_iomux iomux[4]; struct rockchip_drv drv[4]; enum rockchip_pin_pull_type pull_type[4]; - bool valid; struct device_node *of_node; struct rockchip_pinctrl *drvdata; struct irq_domain *domain;