pinctrl: meson: get rid of pin_base

pin_base was used with the manually set pin offset in meson pinctrl. This
is no longer the case, pin_base is 0 on every meson pinctrl controllers
and should go away.

Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index 6d52842d3ee50e4e8251c47377bf1382d395079e..8e0d6e4a31b4cb66301080068ebdf87982a86c61 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -820,7 +820,6 @@ static struct meson_bank meson_gxbb_aobus_banks[] = {
 
 struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
        .name           = "periphs-banks",
-       .pin_base       = 0,
        .pins           = meson_gxbb_periphs_pins,
        .groups         = meson_gxbb_periphs_groups,
        .funcs          = meson_gxbb_periphs_functions,
@@ -833,7 +832,6 @@ struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
 
 struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
        .name           = "aobus-banks",
-       .pin_base       = 0,
        .pins           = meson_gxbb_aobus_pins,
        .groups         = meson_gxbb_aobus_groups,
        .funcs          = meson_gxbb_aobus_functions,

diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index 32e35ba9c04efae2cdb1764a4c3d7816c0c7cea6..0d90ddab6dddb25d6f476d1aea89ed40dd0a0b93 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -807,7 +807,6 @@ static struct meson_bank meson_gxl_aobus_banks[] = {
 
 struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
        .name           = "periphs-banks",
-       .pin_base       = 0,
        .pins           = meson_gxl_periphs_pins,
        .groups         = meson_gxl_periphs_groups,
        .funcs          = meson_gxl_periphs_functions,
@@ -820,7 +819,6 @@ struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
 
 struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
        .name           = "aobus-banks",
-       .pin_base       = 0,
        .pins           = meson_gxl_aobus_pins,
        .groups         = meson_gxl_aobus_groups,
        .funcs          = meson_gxl_aobus_functions,

diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index b52b3b791f784dc2fdedb4295efa785dea849238..71bccb7acbf84241c11ebfd6b53e7c2779394b5e 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -413,16 +413,15 @@ static const struct pinconf_ops meson_pinconf_ops = {
 static int meson_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 {
        struct meson_pinctrl *pc = gpiochip_get_data(chip);
-       unsigned int reg, bit, pin;
+       unsigned int reg, bit;
        struct meson_bank *bank;
        int ret;
 
-       pin = pc->data->pin_base + gpio;
-       ret = meson_get_bank(pc, pin, &bank);
+       ret = meson_get_bank(pc, gpio, &bank);
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_DIR, &reg, &bit);
+       meson_calc_reg_and_bit(bank, gpio, REG_DIR, &reg, &bit);
 
        return regmap_update_bits(pc->reg_gpio, reg, BIT(bit), BIT(bit));
 }
@@ -431,21 +430,20 @@ static int meson_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
                                       int value)
 {
        struct meson_pinctrl *pc = gpiochip_get_data(chip);
-       unsigned int reg, bit, pin;
+       unsigned int reg, bit;
        struct meson_bank *bank;
        int ret;
 
-       pin = pc->data->pin_base + gpio;
-       ret = meson_get_bank(pc, pin, &bank);
+       ret = meson_get_bank(pc, gpio, &bank);
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_DIR, &reg, &bit);
+       meson_calc_reg_and_bit(bank, gpio, REG_DIR, &reg, &bit);
        ret = regmap_update_bits(pc->reg_gpio, reg, BIT(bit), 0);
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_OUT, &reg, &bit);
+       meson_calc_reg_and_bit(bank, gpio, REG_OUT, &reg, &bit);
        return regmap_update_bits(pc->reg_gpio, reg, BIT(bit),
                                  value ? BIT(bit) : 0);
 }
@@ -453,16 +451,15 @@ static int meson_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
 static void meson_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
 {
        struct meson_pinctrl *pc = gpiochip_get_data(chip);
-       unsigned int reg, bit, pin;
+       unsigned int reg, bit;
        struct meson_bank *bank;
        int ret;
 
-       pin = pc->data->pin_base + gpio;
-       ret = meson_get_bank(pc, pin, &bank);
+       ret = meson_get_bank(pc, gpio, &bank);
        if (ret)
                return;
 
-       meson_calc_reg_and_bit(bank, pin, REG_OUT, &reg, &bit);
+       meson_calc_reg_and_bit(bank, gpio, REG_OUT, &reg, &bit);
        regmap_update_bits(pc->reg_gpio, reg, BIT(bit),
                           value ? BIT(bit) : 0);
 }
@@ -470,16 +467,15 @@ static void meson_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
 static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
 {
        struct meson_pinctrl *pc = gpiochip_get_data(chip);
-       unsigned int reg, bit, val, pin;
+       unsigned int reg, bit, val;
        struct meson_bank *bank;
        int ret;
 
-       pin = pc->data->pin_base + gpio;
-       ret = meson_get_bank(pc, pin, &bank);
+       ret = meson_get_bank(pc, gpio, &bank);
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_IN, &reg, &bit);
+       meson_calc_reg_and_bit(bank, gpio, REG_IN, &reg, &bit);
        regmap_read(pc->reg_gpio, reg, &val);
 
        return !!(val & BIT(bit));

diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c
index 7344f8577467deab8f2d609d71b828d690f33238..fbf8ecd1c2b6801e586e57346dd7254f0d371307 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson8.c
+++ b/drivers/pinctrl/meson/pinctrl-meson8.c
@@ -1046,7 +1046,6 @@ static struct meson_bank meson8_aobus_banks[] = {
 
 struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
        .name           = "cbus-banks",
-       .pin_base       = 0,
        .pins           = meson8_cbus_pins,
        .groups         = meson8_cbus_groups,
        .funcs          = meson8_cbus_functions,
@@ -1059,7 +1058,6 @@ struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
 
 struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
        .name           = "ao-bank",
-       .pin_base       = 0,
        .pins           = meson8_aobus_pins,
        .groups         = meson8_aobus_groups,
        .funcs          = meson8_aobus_functions,

diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
index c3c247bfbc6086402a4f72b7fe6eed1a84dd64c2..7af296db48c8d56af79616f0d6feae8ca57be5d3 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson8b.c
+++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
@@ -906,7 +906,6 @@ static struct meson_bank meson8b_aobus_banks[] = {
 
 struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
        .name           = "cbus-banks",
-       .pin_base       = 0,
        .pins           = meson8b_cbus_pins,
        .groups         = meson8b_cbus_groups,
        .funcs          = meson8b_cbus_functions,
@@ -919,7 +918,6 @@ struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
 
 struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
        .name           = "aobus-banks",
-       .pin_base       = 0,
        .pins           = meson8b_aobus_pins,
        .groups         = meson8b_aobus_groups,
        .funcs          = meson8b_aobus_functions,