projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 259ab8f)
pinctrl/rockchip: add error handling for pull/drive register getters
authorSebastian Reichel <sebastian.reichel@collabora.com>
Fri, 22 Apr 2022 17:09:13 +0000 (19:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Feb 2023 07:27:09 +0000 (08:27 +0100)
[ Upstream commit 42573ab3b9f94fbeba8b84e142703ea551624f6d ]

Add error handling for the pull and driver register getters in preparation
for RK3588 support.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Heiko Stübner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20220422170920.401914-13-sebastian.reichel@collabora.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Stable-dep-of: 31b62a98de42 ("pinctrl: rockchip: fix reading pull type on rk3568")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pinctrl/pinctrl-rockchip.c patch | blob | history
drivers/pinctrl/pinctrl-rockchip.h patch | blob | history

diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index fcff8e7..4888840 100644 (file)
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -1039,9 +1039,9 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
 #define PX30_PULL_PINS_PER_REG         8
 #define PX30_PULL_BANK_STRIDE          16
 
-static void px30_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                      int pin_num, struct regmap **regmap,
-                                      int *reg, u8 *bit)
+static int px30_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                     int pin_num, struct regmap **regmap,
+                                     int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1061,6 +1061,8 @@ static void px30_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
        *reg += ((pin_num / PX30_PULL_PINS_PER_REG) * 4);
        *bit = (pin_num % PX30_PULL_PINS_PER_REG);
        *bit *= PX30_PULL_BITS_PER_PIN;
+
+       return 0;
 }
 
 #define PX30_DRV_PMU_OFFSET            0x20
@@ -1069,9 +1071,9 @@ static void px30_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
 #define PX30_DRV_PINS_PER_REG          8
 #define PX30_DRV_BANK_STRIDE           16
 
-static void px30_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
-                                     int pin_num, struct regmap **regmap,
-                                     int *reg, u8 *bit)
+static int px30_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+                                    int pin_num, struct regmap **regmap,
+                                    int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1091,6 +1093,8 @@ static void px30_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
        *reg += ((pin_num / PX30_DRV_PINS_PER_REG) * 4);
        *bit = (pin_num % PX30_DRV_PINS_PER_REG);
        *bit *= PX30_DRV_BITS_PER_PIN;
+
+       return 0;
 }
 
 #define PX30_SCHMITT_PMU_OFFSET                        0x38
@@ -1130,9 +1134,9 @@ static int px30_calc_schmitt_reg_and_bit(struct rockchip_pin_bank *bank,
 #define RV1108_PULL_BITS_PER_PIN       2
 #define RV1108_PULL_BANK_STRIDE                16
 
-static void rv1108_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                        int pin_num, struct regmap **regmap,
-                                        int *reg, u8 *bit)
+static int rv1108_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1151,6 +1155,8 @@ static void rv1108_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
        *reg += ((pin_num / RV1108_PULL_PINS_PER_REG) * 4);
        *bit = (pin_num % RV1108_PULL_PINS_PER_REG);
        *bit *= RV1108_PULL_BITS_PER_PIN;
+
+       return 0;
 }
 
 #define RV1108_DRV_PMU_OFFSET          0x20
@@ -1159,9 +1165,9 @@ static void rv1108_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
 #define RV1108_DRV_PINS_PER_REG                8
 #define RV1108_DRV_BANK_STRIDE         16
 
-static void rv1108_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
-                                       int pin_num, struct regmap **regmap,
-                                       int *reg, u8 *bit)
+static int rv1108_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+                                      int pin_num, struct regmap **regmap,
+                                      int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1181,6 +1187,8 @@ static void rv1108_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
        *reg += ((pin_num / RV1108_DRV_PINS_PER_REG) * 4);
        *bit = pin_num % RV1108_DRV_PINS_PER_REG;
        *bit *= RV1108_DRV_BITS_PER_PIN;
+
+       return 0;
 }
 
 #define RV1108_SCHMITT_PMU_OFFSET              0x30
@@ -1237,9 +1245,9 @@ static int rk3308_calc_schmitt_reg_and_bit(struct rockchip_pin_bank *bank,
 #define RK2928_PULL_PINS_PER_REG       16
 #define RK2928_PULL_BANK_STRIDE                8
 
-static void rk2928_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk2928_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1249,13 +1257,15 @@ static void rk2928_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
        *reg += (pin_num / RK2928_PULL_PINS_PER_REG) * 4;
 
        *bit = pin_num % RK2928_PULL_PINS_PER_REG;
+
+       return 0;
 };
 
 #define RK3128_PULL_OFFSET     0x118
 
-static void rk3128_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                        int pin_num, struct regmap **regmap,
-                                        int *reg, u8 *bit)
+static int rk3128_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1265,6 +1275,8 @@ static void rk3128_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
        *reg += ((pin_num / RK2928_PULL_PINS_PER_REG) * 4);
 
        *bit = pin_num % RK2928_PULL_PINS_PER_REG;
+
+       return 0;
 }
 
 #define RK3188_PULL_OFFSET             0x164
@@ -1273,9 +1285,9 @@ static void rk3128_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
 #define RK3188_PULL_BANK_STRIDE                16
 #define RK3188_PULL_PMU_OFFSET         0x64
 
-static void rk3188_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk3188_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1305,12 +1317,14 @@ static void rk3188_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
                *bit = 7 - (pin_num % RK3188_PULL_PINS_PER_REG);
                *bit *= RK3188_PULL_BITS_PER_PIN;
        }
+
+       return 0;
 }
 
 #define RK3288_PULL_OFFSET             0x140
-static void rk3288_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk3288_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1334,6 +1348,8 @@ static void rk3288_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
                *bit = (pin_num % RK3188_PULL_PINS_PER_REG);
                *bit *= RK3188_PULL_BITS_PER_PIN;
        }
+
+       return 0;
 }
 
 #define RK3288_DRV_PMU_OFFSET          0x70
@@ -1342,9 +1358,9 @@ static void rk3288_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
 #define RK3288_DRV_PINS_PER_REG                8
 #define RK3288_DRV_BANK_STRIDE         16
 
-static void rk3288_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk3288_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+                                      int pin_num, struct regmap **regmap,
+                                      int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1368,13 +1384,15 @@ static void rk3288_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
                *bit = (pin_num % RK3288_DRV_PINS_PER_REG);
                *bit *= RK3288_DRV_BITS_PER_PIN;
        }
+
+       return 0;
 }
 
 #define RK3228_PULL_OFFSET             0x100
 
-static void rk3228_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk3228_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1385,13 +1403,15 @@ static void rk3228_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
 
        *bit = (pin_num % RK3188_PULL_PINS_PER_REG);
        *bit *= RK3188_PULL_BITS_PER_PIN;
+
+       return 0;
 }
 
 #define RK3228_DRV_GRF_OFFSET          0x200
 
-static void rk3228_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk3228_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+                                      int pin_num, struct regmap **regmap,
+                                      int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1402,13 +1422,15 @@ static void rk3228_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
 
        *bit = (pin_num % RK3288_DRV_PINS_PER_REG);
        *bit *= RK3288_DRV_BITS_PER_PIN;
+
+       return 0;
 }
 
 #define RK3308_PULL_OFFSET             0xa0
 
-static void rk3308_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk3308_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1419,13 +1441,15 @@ static void rk3308_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
 
        *bit = (pin_num % RK3188_PULL_PINS_PER_REG);
        *bit *= RK3188_PULL_BITS_PER_PIN;
+
+       return 0;
 }
 
 #define RK3308_DRV_GRF_OFFSET          0x100
 
-static void rk3308_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk3308_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+                                      int pin_num, struct regmap **regmap,
+                                      int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1436,14 +1460,16 @@ static void rk3308_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
 
        *bit = (pin_num % RK3288_DRV_PINS_PER_REG);
        *bit *= RK3288_DRV_BITS_PER_PIN;
+
+       return 0;
 }
 
 #define RK3368_PULL_GRF_OFFSET         0x100
 #define RK3368_PULL_PMU_OFFSET         0x10
 
-static void rk3368_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk3368_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1467,14 +1493,16 @@ static void rk3368_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
                *bit = (pin_num % RK3188_PULL_PINS_PER_REG);
                *bit *= RK3188_PULL_BITS_PER_PIN;
        }
+
+       return 0;
 }
 
 #define RK3368_DRV_PMU_OFFSET          0x20
 #define RK3368_DRV_GRF_OFFSET          0x200
 
-static void rk3368_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit)
+static int rk3368_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+                                      int pin_num, struct regmap **regmap,
+                                      int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1498,15 +1526,17 @@ static void rk3368_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
                *bit = (pin_num % RK3288_DRV_PINS_PER_REG);
                *bit *= RK3288_DRV_BITS_PER_PIN;
        }
+
+       return 0;
 }
 
 #define RK3399_PULL_GRF_OFFSET         0xe040
 #define RK3399_PULL_PMU_OFFSET         0x40
 #define RK3399_DRV_3BITS_PER_PIN       3
 
-static void rk3399_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                        int pin_num, struct regmap **regmap,
-                                        int *reg, u8 *bit)
+static int rk3399_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1532,11 +1562,13 @@ static void rk3399_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
                *bit = (pin_num % RK3188_PULL_PINS_PER_REG);
                *bit *= RK3188_PULL_BITS_PER_PIN;
        }
+
+       return 0;
 }
 
-static void rk3399_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
-                                       int pin_num, struct regmap **regmap,
-                                       int *reg, u8 *bit)
+static int rk3399_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+                                      int pin_num, struct regmap **regmap,
+                                      int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
        int drv_num = (pin_num / 8);
@@ -1553,6 +1585,8 @@ static void rk3399_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
                *bit = (pin_num % 8) * 3;
        else
                *bit = (pin_num % 8) * 2;
+
+       return 0;
 }
 
 #define RK3568_PULL_PMU_OFFSET         0x20
@@ -1561,9 +1595,9 @@ static void rk3399_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
 #define RK3568_PULL_PINS_PER_REG       8
 #define RK3568_PULL_BANK_STRIDE                0x10
 
-static void rk3568_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
-                                        int pin_num, struct regmap **regmap,
-                                        int *reg, u8 *bit)
+static int rk3568_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+                                       int pin_num, struct regmap **regmap,
+                                       int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1584,6 +1618,8 @@ static void rk3568_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
                *bit = (pin_num % RK3568_PULL_PINS_PER_REG);
                *bit *= RK3568_PULL_BITS_PER_PIN;
        }
+
+       return 0;
 }
 
 #define RK3568_DRV_PMU_OFFSET          0x70
@@ -1592,9 +1628,9 @@ static void rk3568_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
 #define RK3568_DRV_PINS_PER_REG                2
 #define RK3568_DRV_BANK_STRIDE         0x40
 
-static void rk3568_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
-                                       int pin_num, struct regmap **regmap,
-                                       int *reg, u8 *bit)
+static int rk3568_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+                                      int pin_num, struct regmap **regmap,
+                                      int *reg, u8 *bit)
 {
        struct rockchip_pinctrl *info = bank->drvdata;
 
@@ -1615,6 +1651,8 @@ static void rk3568_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
                *bit = (pin_num % RK3568_DRV_PINS_PER_REG);
                *bit *= RK3568_DRV_BITS_PER_PIN;
        }
+
+       return 0;
 }
 
 static int rockchip_perpin_drv_list[DRV_TYPE_MAX][8] = {
@@ -1637,7 +1675,9 @@ static int rockchip_get_drive_perpin(struct rockchip_pin_bank *bank,
        u8 bit;
        int drv_type = bank->drv[pin_num / 8].drv_type;
 
-       ctrl->drv_calc_reg(bank, pin_num, &regmap, &reg, &bit);
+       ret = ctrl->drv_calc_reg(bank, pin_num, &regmap, &reg, &bit);
+       if (ret)
+               return ret;
 
        switch (drv_type) {
        case DRV_TYPE_IO_1V8_3V0_AUTO:
@@ -1717,7 +1757,9 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank,
        dev_dbg(dev, "setting drive of GPIO%d-%d to %d\n",
                bank->bank_num, pin_num, strength);
 
-       ctrl->drv_calc_reg(bank, pin_num, &regmap, &reg, &bit);
+       ret = ctrl->drv_calc_reg(bank, pin_num, &regmap, &reg, &bit);
+       if (ret)
+               return ret;
        if (ctrl->type == RK3568) {
                rmask_bits = RK3568_DRV_BITS_PER_PIN;
                ret = (1 << (strength + 1)) - 1;
@@ -1830,7 +1872,9 @@ static int rockchip_get_pull(struct rockchip_pin_bank *bank, int pin_num)
        if (ctrl->type == RK3066B)
                return PIN_CONFIG_BIAS_DISABLE;
 
-       ctrl->pull_calc_reg(bank, pin_num, &regmap, &reg, &bit);
+       ret = ctrl->pull_calc_reg(bank, pin_num, &regmap, &reg, &bit);
+       if (ret)
+               return ret;
 
        ret = regmap_read(regmap, reg, &data);
        if (ret)
@@ -1877,7 +1921,9 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
        if (ctrl->type == RK3066B)
                return pull ? -EINVAL : 0;
 
-       ctrl->pull_calc_reg(bank, pin_num, &regmap, &reg, &bit);
+       ret = ctrl->pull_calc_reg(bank, pin_num, &regmap, &reg, &bit);
+       if (ret)
+               return ret;
 
        switch (ctrl->type) {
        case RK2928:
diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h
index 98a01a6..59116e1 100644 (file)
--- a/drivers/pinctrl/pinctrl-rockchip.h
+++ b/drivers/pinctrl/pinctrl-rockchip.h
@@ -230,10 +230,10 @@ struct rockchip_pin_ctrl {
        struct rockchip_mux_route_data *iomux_routes;
        u32                             niomux_routes;
 
-       void    (*pull_calc_reg)(struct rockchip_pin_bank *bank,
+       int     (*pull_calc_reg)(struct rockchip_pin_bank *bank,
                                    int pin_num, struct regmap **regmap,
                                    int *reg, u8 *bit);
-       void    (*drv_calc_reg)(struct rockchip_pin_bank *bank,
+       int     (*drv_calc_reg)(struct rockchip_pin_bank *bank,
                                    int pin_num, struct regmap **regmap,
                                    int *reg, u8 *bit);
        int     (*schmitt_calc_reg)(struct rockchip_pin_bank *bank,
Domain: System / Kernel;