Commit 42573ab3 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Linus Walleij
Browse files

pinctrl/rockchip: add error handling for pull/drive register getters 



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

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: default avatarHeiko Stübner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20220422170920.401914-13-sebastian.reichel@collabora.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 71bc7cf3

drivers/pinctrl/pinctrl-rockchip.c

+107 −61
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ 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,

static int px30_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

				      int pin_num, struct regmap **regmap,

				      int *reg, u8 *bit)

{
@@ -1008,6 +1008,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
@@ -1016,7 +1018,7 @@ 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,

static int px30_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,

				     int pin_num, struct regmap **regmap,

				     int *reg, u8 *bit)

{
@@ -1038,6 +1040,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
@@ -1077,7 +1081,7 @@ 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,

static int rv1108_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1098,6 +1102,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
@@ -1106,7 +1112,7 @@ 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,

static int rv1108_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,

				       int pin_num, struct regmap **regmap,

				       int *reg, u8 *bit)

{
@@ -1128,6 +1134,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
@@ -1184,7 +1192,7 @@ 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,

static int rk2928_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1196,11 +1204,13 @@ 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,

static int rk3128_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1212,6 +1222,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
@@ -1220,7 +1232,7 @@ 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,

static int rk3188_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1252,10 +1264,12 @@ 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,

static int rk3288_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1281,6 +1295,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
@@ -1289,7 +1305,7 @@ 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,

static int rk3288_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,

				       int pin_num, struct regmap **regmap,

				       int *reg, u8 *bit)

{
@@ -1315,11 +1331,13 @@ 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,

static int rk3228_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1332,11 +1350,13 @@ 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,

static int rk3228_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,

				       int pin_num, struct regmap **regmap,

				       int *reg, u8 *bit)

{
@@ -1349,11 +1369,13 @@ 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,

static int rk3308_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1366,11 +1388,13 @@ 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,

static int rk3308_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,

				       int pin_num, struct regmap **regmap,

				       int *reg, u8 *bit)

{
@@ -1383,12 +1407,14 @@ 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,

static int rk3368_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1414,12 +1440,14 @@ 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,

static int rk3368_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,

				       int pin_num, struct regmap **regmap,

				       int *reg, u8 *bit)

{
@@ -1445,13 +1473,15 @@ 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,

static int rk3399_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1479,9 +1509,11 @@ 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,

static int rk3399_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,

				       int pin_num, struct regmap **regmap,

				       int *reg, u8 *bit)

{
@@ -1500,6 +1532,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
@@ -1508,7 +1542,7 @@ 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,

static int rk3568_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,

					int pin_num, struct regmap **regmap,

					int *reg, u8 *bit)

{
@@ -1531,6 +1565,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
@@ -1539,7 +1575,7 @@ 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,

static int rk3568_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,

				       int pin_num, struct regmap **regmap,

				       int *reg, u8 *bit)

{
@@ -1562,6 +1598,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] = {
@@ -1584,7 +1622,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:
@@ -1664,7 +1704,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;
@@ -1777,7 +1819,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)
@@ -1824,7 +1868,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:

drivers/pinctrl/pinctrl-rockchip.h

+2 −2
Original line number Diff line number Diff line
@@ -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,