Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d9b171c authored by Sean Wang's avatar Sean Wang Committed by Linus Walleij
Browse files

pinctrl: mediatek: adjust error code and message when some register not supported is found 



It's usual and not an error for there's some register not supported by a
certain SoC or a pin so that in the case we have to adjust the message to
print and the error code to get rid of unnecessary false alarm.

Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2bc47dfe

drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c

+18 −17
Original line number Diff line number Diff line
@@ -61,12 +61,21 @@ void mtk_rmw(struct mtk_pinctrl *pctl, u8 i, u32 reg, u32 mask, u32 set) 


static int mtk_hw_pin_field_lookup(struct mtk_pinctrl *hw,

				   const struct mtk_pin_desc *desc,

				   const struct mtk_pin_reg_calc *rc,

				   struct mtk_pin_field *pfd)

				   int field, struct mtk_pin_field *pfd)

{

	const struct mtk_pin_field_calc *c, *e;

	const struct mtk_pin_reg_calc *rc;

	u32 bits;



	if (hw->soc->reg_cal && hw->soc->reg_cal[field].range) {

		rc = &hw->soc->reg_cal[field];

	} else {

		dev_dbg(hw->dev,

			"Not support field %d for pin %d (%s)\n",

			field, desc->number, desc->name);

		return -ENOTSUPP;

	}



	c = rc->range;

	e = c + rc->nranges;
@@ -77,14 +86,15 @@ static int mtk_hw_pin_field_lookup(struct mtk_pinctrl *hw, 
	}



	if (c >= e) {

		dev_err(hw->dev, "Out of range for pin = %d (%s)\n",

			desc->number, desc->name);

		return -EINVAL;

		dev_dbg(hw->dev, "Not support field %d for pin = %d (%s)\n",

			field, desc->number, desc->name);

		return -ENOTSUPP;

	}



	if (c->i_base > hw->nbase - 1) {

		dev_err(hw->dev, "Invalid base is found for pin = %d (%s)\n",

			desc->number, desc->name);

		dev_err(hw->dev,

			"Invalid base for field %d for pin = %d (%s)\n",

			field, desc->number, desc->name);

		return -EINVAL;

	}
@@ -116,21 +126,12 @@ static int mtk_hw_pin_field_get(struct mtk_pinctrl *hw, 
				const struct mtk_pin_desc *desc,

				int field, struct mtk_pin_field *pfd)

{

	const struct mtk_pin_reg_calc *rc;



	if (field < 0 || field >= PINCTRL_PIN_REG_MAX) {

		dev_err(hw->dev, "Invalid Field %d\n", field);

		return -EINVAL;

	}



	if (hw->soc->reg_cal && hw->soc->reg_cal[field].range) {

		rc = &hw->soc->reg_cal[field];

	} else {

		dev_err(hw->dev, "Undefined range for field %d\n", field);

		return -EINVAL;

	}



	return mtk_hw_pin_field_lookup(hw, desc, rc, pfd);

	return mtk_hw_pin_field_lookup(hw, desc, field, pfd);

}



static void mtk_hw_bits_part(struct mtk_pin_field *pf, int *h, int *l)