|
@@ -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)
|