* [PATCH v2 0/3] Support rk3328 pinctrl @ 2017-02-10 10:23 ` David Wu 0 siblings, 0 replies; 15+ messages in thread From: David Wu @ 2017-02-10 10:23 UTC (permalink / raw) To: heiko-4mtYJXux2i+zQB+pC5nmwQ, linus.walleij-QSEj5FYQhm4dnm+yROfE0A Cc: huangtao-TNX95d0MmH7DzftRWevZcw, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, david.wu, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-gpio-u79uwXL29TY76Z2rM5mHXA From: "david.wu" <david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org> The rk3328 soc pinctrl iomux is different from other socs. The one is that it needs the pinctrl driver supports 3bit width iomux supported. The other one is that three special pins need to be recalculated, because they are out of the rlues. So add the three patches to support rk3328 pinctrl. david.wu (3): pinctrl: rockchip: Add 3bit width mux support pinctrl: rockchip: Add mux recalculation support pinctrl: rockchip: Add rk3328 pinctrl support .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- drivers/pinctrl/pinctrl-rockchip.c | 127 +++++++++++++++++++-- 2 files changed, 122 insertions(+), 9 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 0/3] Support rk3328 pinctrl @ 2017-02-10 10:23 ` David Wu 0 siblings, 0 replies; 15+ messages in thread From: David Wu @ 2017-02-10 10:23 UTC (permalink / raw) To: heiko, linus.walleij Cc: huangtao, linux-rockchip, linux-gpio, linux-kernel, david.wu From: "david.wu" <david.wu@rock-chips.com> The rk3328 soc pinctrl iomux is different from other socs. The one is that it needs the pinctrl driver supports 3bit width iomux supported. The other one is that three special pins need to be recalculated, because they are out of the rlues. So add the three patches to support rk3328 pinctrl. david.wu (3): pinctrl: rockchip: Add 3bit width mux support pinctrl: rockchip: Add mux recalculation support pinctrl: rockchip: Add rk3328 pinctrl support .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- drivers/pinctrl/pinctrl-rockchip.c | 127 +++++++++++++++++++-- 2 files changed, 122 insertions(+), 9 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 1/3] pinctrl: rockchip: Add 3bit width mux support 2017-02-10 10:23 ` David Wu (?) @ 2017-02-10 10:23 ` David Wu 2017-02-10 11:10 ` Heiko Stuebner 2017-02-22 15:00 ` Linus Walleij -1 siblings, 2 replies; 15+ messages in thread From: David Wu @ 2017-02-10 10:23 UTC (permalink / raw) To: heiko, linus.walleij Cc: huangtao, linux-rockchip, linux-gpio, linux-kernel, david.wu From: "david.wu" <david.wu@rock-chips.com> This patch supports 3bit width iomux type. Signed-off-by: david.wu <david.wu@rock-chips.com> --- change in v2: - add the "% 8" in the 3bit width iomux calculating drivers/pinctrl/pinctrl-rockchip.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 08765f5..96fdb86 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -75,6 +75,7 @@ enum rockchip_pinctrl_type { #define IOMUX_WIDTH_4BIT BIT(1) #define IOMUX_SOURCE_PMU BIT(2) #define IOMUX_UNROUTED BIT(3) +#define IOMUX_WIDTH_3BIT BIT(4) /** * @type: iomux variant using IOMUX_* constants @@ -538,14 +539,20 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) ? info->regmap_pmu : info->regmap_base; /* get basic quadrupel of mux registers and the correct reg inside */ - mask = (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) ? 0xf : 0x3; reg = bank->iomux[iomux_num].offset; if (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) { if ((pin % 8) >= 4) reg += 0x4; bit = (pin % 4) * 4; + mask = 0xf; + } else if (bank->iomux[iomux_num].type & IOMUX_WIDTH_3BIT) { + if ((pin % 8) >= 5) + reg += 0x4; + bit = (pin % 8 % 5) * 3; + mask = 0x7; } else { bit = (pin % 8) * 2; + mask = 0x3; } ret = regmap_read(regmap, reg, &val); @@ -603,14 +610,20 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) ? info->regmap_pmu : info->regmap_base; /* get basic quadrupel of mux registers and the correct reg inside */ - mask = (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) ? 0xf : 0x3; reg = bank->iomux[iomux_num].offset; if (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) { if ((pin % 8) >= 4) reg += 0x4; bit = (pin % 4) * 4; + mask = 0xf; + } else if (bank->iomux[iomux_num].type & IOMUX_WIDTH_3BIT) { + if ((pin % 8) >= 5) + reg += 0x4; + bit = (pin % 8 % 5) * 3; + mask = 0x7; } else { bit = (pin % 8) * 2; + mask = 0x3; } spin_lock_irqsave(&bank->slock, flags); @@ -2359,7 +2372,8 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( * Increase offset according to iomux width. * 4bit iomux'es are spread over two registers. */ - inc = (iom->type & IOMUX_WIDTH_4BIT) ? 8 : 4; + inc = (iom->type & (IOMUX_WIDTH_4BIT | + IOMUX_WIDTH_3BIT)) ? 8 : 4; if (iom->type & IOMUX_SOURCE_PMU) pmu_offs += inc; else -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/3] pinctrl: rockchip: Add 3bit width mux support 2017-02-10 10:23 ` [PATCH v2 1/3] pinctrl: rockchip: Add 3bit width mux support David Wu @ 2017-02-10 11:10 ` Heiko Stuebner 2017-02-22 15:00 ` Linus Walleij 1 sibling, 0 replies; 15+ messages in thread From: Heiko Stuebner @ 2017-02-10 11:10 UTC (permalink / raw) To: David Wu Cc: linus.walleij, huangtao, linux-rockchip, linux-gpio, linux-kernel Am Freitag, 10. Februar 2017, 18:23:47 CET schrieb David Wu: > From: "david.wu" <david.wu@rock-chips.com> > > This patch supports 3bit width iomux type. > > Signed-off-by: david.wu <david.wu@rock-chips.com> change looks good and calculations do checkout out, so Reviewed-by: Heiko Stuebner <heiko@sntech.de> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/3] pinctrl: rockchip: Add 3bit width mux support 2017-02-10 10:23 ` [PATCH v2 1/3] pinctrl: rockchip: Add 3bit width mux support David Wu 2017-02-10 11:10 ` Heiko Stuebner @ 2017-02-22 15:00 ` Linus Walleij 1 sibling, 0 replies; 15+ messages in thread From: Linus Walleij @ 2017-02-22 15:00 UTC (permalink / raw) To: David Wu Cc: Heiko Stübner, Tao Huang, open list:ARM/Rockchip SoC..., linux-gpio, linux-kernel On Fri, Feb 10, 2017 at 11:23 AM, David Wu <david.wu@rock-chips.com> wrote: > From: "david.wu" <david.wu@rock-chips.com> > > This patch supports 3bit width iomux type. > > Signed-off-by: david.wu <david.wu@rock-chips.com> > --- > change in v2: > - add the "% 8" in the 3bit width iomux calculating Patch applied for v4.12 with Heiko's review tag. Will appear in my tree after the merge window. Same applies to any other patch I apply now except fixes. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 15+ messages in thread
[parent not found: <1486722229-5451-1-git-send-email-david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org>]
* [PATCH v2 2/3] pinctrl: rockchip: Add mux recalculation support 2017-02-10 10:23 ` David Wu @ 2017-02-10 10:23 ` David Wu -1 siblings, 0 replies; 15+ messages in thread From: David Wu @ 2017-02-10 10:23 UTC (permalink / raw) To: heiko-4mtYJXux2i+zQB+pC5nmwQ, linus.walleij-QSEj5FYQhm4dnm+yROfE0A Cc: huangtao-TNX95d0MmH7DzftRWevZcw, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, david.wu, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-gpio-u79uwXL29TY76Z2rM5mHXA From: "david.wu" <david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Some pins are special at a bank so that add IOMUX_RECALCED type to indicate which iomux source of the bank need to be recalculated. If the mux recalculateed callback and IOMUX_RECALCED type were set, recalculate the pins' iomux by using mux recalculated data struct. Signed-off-by: david.wu <david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org> --- change in v2: - reorder the entries of the recalced data struct drivers/pinctrl/pinctrl-rockchip.c | 41 ++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 96fdb86..191a2f9 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -76,6 +76,7 @@ enum rockchip_pinctrl_type { #define IOMUX_SOURCE_PMU BIT(2) #define IOMUX_UNROUTED BIT(3) #define IOMUX_WIDTH_3BIT BIT(4) +#define IOMUX_RECALCED BIT(5) /** * @type: iomux variant using IOMUX_* constants @@ -305,6 +306,8 @@ struct rockchip_pin_ctrl { void (*drv_calc_reg)(struct rockchip_pin_bank *bank, int pin_num, struct regmap **regmap, int *reg, u8 *bit); + void (*iomux_recalc)(u8 bank_num, int pin, int *reg, + u8 *bit, int *mask); }; struct rockchip_pin_config { @@ -356,6 +359,22 @@ struct rockchip_pinctrl { unsigned int nfunctions; }; +/** + * struct rockchip_mux_recalced_data: represent a pin iomux data. + * @num: bank number. + * @pin: pin number. + * @bit: index at register. + * @reg: register offset. + * @mask: mask bit + */ +struct rockchip_mux_recalced_data { + u8 num; + u8 pin; + u8 reg; + u8 bit; + u8 mask; +}; + static struct regmap_config rockchip_regmap_config = { .reg_bits = 32, .val_bits = 32, @@ -518,10 +537,11 @@ static void rockchip_dt_free_map(struct pinctrl_dev *pctldev, static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) { struct rockchip_pinctrl *info = bank->drvdata; + struct rockchip_pin_ctrl *ctrl = info->ctrl; int iomux_num = (pin / 8); struct regmap *regmap; unsigned int val; - int reg, ret, mask; + int reg, ret, mask, mux_type; u8 bit; if (iomux_num > 3) @@ -539,13 +559,14 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) ? info->regmap_pmu : info->regmap_base; /* get basic quadrupel of mux registers and the correct reg inside */ + mux_type = bank->iomux[iomux_num].type; reg = bank->iomux[iomux_num].offset; - if (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) { + if (mux_type & IOMUX_WIDTH_4BIT) { if ((pin % 8) >= 4) reg += 0x4; bit = (pin % 4) * 4; mask = 0xf; - } else if (bank->iomux[iomux_num].type & IOMUX_WIDTH_3BIT) { + } else if (mux_type & IOMUX_WIDTH_3BIT) { if ((pin % 8) >= 5) reg += 0x4; bit = (pin % 8 % 5) * 3; @@ -555,6 +576,9 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) mask = 0x3; } + if (ctrl->iomux_recalc && (mux_type & IOMUX_RECALCED)) + ctrl->iomux_recalc(bank->bank_num, pin, ®, &bit, &mask); + ret = regmap_read(regmap, reg, &val); if (ret) return ret; @@ -578,9 +602,10 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) { struct rockchip_pinctrl *info = bank->drvdata; + struct rockchip_pin_ctrl *ctrl = info->ctrl; int iomux_num = (pin / 8); struct regmap *regmap; - int reg, ret, mask; + int reg, ret, mask, mux_type; unsigned long flags; u8 bit; u32 data, rmask; @@ -610,13 +635,14 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) ? info->regmap_pmu : info->regmap_base; /* get basic quadrupel of mux registers and the correct reg inside */ + mux_type = bank->iomux[iomux_num].type; reg = bank->iomux[iomux_num].offset; - if (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) { + if (mux_type & IOMUX_WIDTH_4BIT) { if ((pin % 8) >= 4) reg += 0x4; bit = (pin % 4) * 4; mask = 0xf; - } else if (bank->iomux[iomux_num].type & IOMUX_WIDTH_3BIT) { + } else if (mux_type & IOMUX_WIDTH_3BIT) { if ((pin % 8) >= 5) reg += 0x4; bit = (pin % 8 % 5) * 3; @@ -626,6 +652,9 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) mask = 0x3; } + if (ctrl->iomux_recalc && (mux_type & IOMUX_RECALCED)) + ctrl->iomux_recalc(bank->bank_num, pin, ®, &bit, &mask); + spin_lock_irqsave(&bank->slock, flags); data = (mask << (bit + 16)); -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 2/3] pinctrl: rockchip: Add mux recalculation support @ 2017-02-10 10:23 ` David Wu 0 siblings, 0 replies; 15+ messages in thread From: David Wu @ 2017-02-10 10:23 UTC (permalink / raw) To: heiko, linus.walleij Cc: huangtao, linux-rockchip, linux-gpio, linux-kernel, david.wu From: "david.wu" <david.wu@rock-chips.com> Some pins are special at a bank so that add IOMUX_RECALCED type to indicate which iomux source of the bank need to be recalculated. If the mux recalculateed callback and IOMUX_RECALCED type were set, recalculate the pins' iomux by using mux recalculated data struct. Signed-off-by: david.wu <david.wu@rock-chips.com> --- change in v2: - reorder the entries of the recalced data struct drivers/pinctrl/pinctrl-rockchip.c | 41 ++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 96fdb86..191a2f9 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -76,6 +76,7 @@ enum rockchip_pinctrl_type { #define IOMUX_SOURCE_PMU BIT(2) #define IOMUX_UNROUTED BIT(3) #define IOMUX_WIDTH_3BIT BIT(4) +#define IOMUX_RECALCED BIT(5) /** * @type: iomux variant using IOMUX_* constants @@ -305,6 +306,8 @@ struct rockchip_pin_ctrl { void (*drv_calc_reg)(struct rockchip_pin_bank *bank, int pin_num, struct regmap **regmap, int *reg, u8 *bit); + void (*iomux_recalc)(u8 bank_num, int pin, int *reg, + u8 *bit, int *mask); }; struct rockchip_pin_config { @@ -356,6 +359,22 @@ struct rockchip_pinctrl { unsigned int nfunctions; }; +/** + * struct rockchip_mux_recalced_data: represent a pin iomux data. + * @num: bank number. + * @pin: pin number. + * @bit: index at register. + * @reg: register offset. + * @mask: mask bit + */ +struct rockchip_mux_recalced_data { + u8 num; + u8 pin; + u8 reg; + u8 bit; + u8 mask; +}; + static struct regmap_config rockchip_regmap_config = { .reg_bits = 32, .val_bits = 32, @@ -518,10 +537,11 @@ static void rockchip_dt_free_map(struct pinctrl_dev *pctldev, static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) { struct rockchip_pinctrl *info = bank->drvdata; + struct rockchip_pin_ctrl *ctrl = info->ctrl; int iomux_num = (pin / 8); struct regmap *regmap; unsigned int val; - int reg, ret, mask; + int reg, ret, mask, mux_type; u8 bit; if (iomux_num > 3) @@ -539,13 +559,14 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) ? info->regmap_pmu : info->regmap_base; /* get basic quadrupel of mux registers and the correct reg inside */ + mux_type = bank->iomux[iomux_num].type; reg = bank->iomux[iomux_num].offset; - if (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) { + if (mux_type & IOMUX_WIDTH_4BIT) { if ((pin % 8) >= 4) reg += 0x4; bit = (pin % 4) * 4; mask = 0xf; - } else if (bank->iomux[iomux_num].type & IOMUX_WIDTH_3BIT) { + } else if (mux_type & IOMUX_WIDTH_3BIT) { if ((pin % 8) >= 5) reg += 0x4; bit = (pin % 8 % 5) * 3; @@ -555,6 +576,9 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) mask = 0x3; } + if (ctrl->iomux_recalc && (mux_type & IOMUX_RECALCED)) + ctrl->iomux_recalc(bank->bank_num, pin, ®, &bit, &mask); + ret = regmap_read(regmap, reg, &val); if (ret) return ret; @@ -578,9 +602,10 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) { struct rockchip_pinctrl *info = bank->drvdata; + struct rockchip_pin_ctrl *ctrl = info->ctrl; int iomux_num = (pin / 8); struct regmap *regmap; - int reg, ret, mask; + int reg, ret, mask, mux_type; unsigned long flags; u8 bit; u32 data, rmask; @@ -610,13 +635,14 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) ? info->regmap_pmu : info->regmap_base; /* get basic quadrupel of mux registers and the correct reg inside */ + mux_type = bank->iomux[iomux_num].type; reg = bank->iomux[iomux_num].offset; - if (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) { + if (mux_type & IOMUX_WIDTH_4BIT) { if ((pin % 8) >= 4) reg += 0x4; bit = (pin % 4) * 4; mask = 0xf; - } else if (bank->iomux[iomux_num].type & IOMUX_WIDTH_3BIT) { + } else if (mux_type & IOMUX_WIDTH_3BIT) { if ((pin % 8) >= 5) reg += 0x4; bit = (pin % 8 % 5) * 3; @@ -626,6 +652,9 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) mask = 0x3; } + if (ctrl->iomux_recalc && (mux_type & IOMUX_RECALCED)) + ctrl->iomux_recalc(bank->bank_num, pin, ®, &bit, &mask); + spin_lock_irqsave(&bank->slock, flags); data = (mask << (bit + 16)); -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
[parent not found: <1486722229-5451-3-git-send-email-david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org>]
* Re: [PATCH v2 2/3] pinctrl: rockchip: Add mux recalculation support 2017-02-10 10:23 ` David Wu @ 2017-02-10 11:53 ` Heiko Stuebner -1 siblings, 0 replies; 15+ messages in thread From: Heiko Stuebner @ 2017-02-10 11:53 UTC (permalink / raw) To: David Wu Cc: huangtao-TNX95d0MmH7DzftRWevZcw, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linus.walleij-QSEj5FYQhm4dnm+yROfE0A, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-gpio-u79uwXL29TY76Z2rM5mHXA Am Freitag, 10. Februar 2017, 18:23:48 CET schrieb David Wu: > From: "david.wu" <david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org> > > Some pins are special at a bank so that add > IOMUX_RECALCED type to indicate which iomux source > of the bank need to be recalculated. If the mux > recalculateed callback and IOMUX_RECALCED type > were set, recalculate the pins' iomux by using > mux recalculated data struct. > > Signed-off-by: david.wu <david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Reviewed-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] pinctrl: rockchip: Add mux recalculation support @ 2017-02-10 11:53 ` Heiko Stuebner 0 siblings, 0 replies; 15+ messages in thread From: Heiko Stuebner @ 2017-02-10 11:53 UTC (permalink / raw) To: David Wu Cc: linus.walleij, huangtao, linux-rockchip, linux-gpio, linux-kernel Am Freitag, 10. Februar 2017, 18:23:48 CET schrieb David Wu: > From: "david.wu" <david.wu@rock-chips.com> > > Some pins are special at a bank so that add > IOMUX_RECALCED type to indicate which iomux source > of the bank need to be recalculated. If the mux > recalculateed callback and IOMUX_RECALCED type > were set, recalculate the pins' iomux by using > mux recalculated data struct. > > Signed-off-by: david.wu <david.wu@rock-chips.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] pinctrl: rockchip: Add mux recalculation support 2017-02-10 10:23 ` David Wu (?) (?) @ 2017-02-22 15:02 ` Linus Walleij -1 siblings, 0 replies; 15+ messages in thread From: Linus Walleij @ 2017-02-22 15:02 UTC (permalink / raw) To: David Wu Cc: Heiko Stübner, Tao Huang, open list:ARM/Rockchip SoC..., linux-gpio, linux-kernel On Fri, Feb 10, 2017 at 11:23 AM, David Wu <david.wu@rock-chips.com> wrote: > From: "david.wu" <david.wu@rock-chips.com> > > Some pins are special at a bank so that add > IOMUX_RECALCED type to indicate which iomux source > of the bank need to be recalculated. If the mux > recalculateed callback and IOMUX_RECALCED type > were set, recalculate the pins' iomux by using > mux recalculated data struct. > > Signed-off-by: david.wu <david.wu@rock-chips.com> > --- > change in v2: > - reorder the entries of the recalced data struct Patch applied. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 3/3] pinctrl: rockchip: Add rk3328 pinctrl support 2017-02-10 10:23 ` David Wu @ 2017-02-10 10:23 ` David Wu -1 siblings, 0 replies; 15+ messages in thread From: David Wu @ 2017-02-10 10:23 UTC (permalink / raw) To: heiko-4mtYJXux2i+zQB+pC5nmwQ, linus.walleij-QSEj5FYQhm4dnm+yROfE0A Cc: huangtao-TNX95d0MmH7DzftRWevZcw, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, david.wu, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-gpio-u79uwXL29TY76Z2rM5mHXA From: "david.wu" <david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Note, the iomux of following pins are special, need to be recalculated specially. - gpio2_b4 - gpio2_b7 - gpio2_c7 Signed-off-by: david.wu <david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org> --- change in v2: - only 3 pins need to be recalculated .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- drivers/pinctrl/pinctrl-rockchip.c | 70 ++++++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt index 4722bc6..403b5a2 100644 --- a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt @@ -22,8 +22,8 @@ Required properties for iomux controller: - compatible: one of "rockchip,rk1108-pinctrl", "rockchip,rk2928-pinctrl" "rockchip,rk3066a-pinctrl", "rockchip,rk3066b-pinctrl" "rockchip,rk3188-pinctrl", "rockchip,rk3228-pinctrl" - "rockchip,rk3288-pinctrl", "rockchip,rk3368-pinctrl" - "rockchip,rk3399-pinctrl" + "rockchip,rk3288-pinctrl", "rockchip,rk3328-pinctrl" + "rockchip,rk3368-pinctrl", "rockchip,rk3399-pinctrl" - rockchip,grf: phandle referencing a syscon providing the "general register files" diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 191a2f9..a20ce9f 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -534,6 +534,49 @@ static void rockchip_dt_free_map(struct pinctrl_dev *pctldev, * Hardware access */ +static const struct rockchip_mux_recalced_data rk3328_mux_recalced_data[] = { + { + .num = 2, + .pin = 12, + .reg = 0x24, + .bit = 8, + .mask = 0x3 + }, { + .num = 2, + .pin = 15, + .reg = 0x28, + .bit = 0, + .mask = 0x7 + }, { + .num = 2, + .pin = 23, + .reg = 0x30, + .bit = 14, + .mask = 0x3 + }, +}; + +static void rk3328_recalc_mux(u8 bank_num, int pin, int *reg, + u8 *bit, int *mask) +{ + const struct rockchip_mux_recalced_data *data = NULL; + int i; + + for (i = 0; i < ARRAY_SIZE(rk3328_mux_recalced_data); i++) + if (rk3328_mux_recalced_data[i].num == bank_num && + rk3328_mux_recalced_data[i].pin == pin) { + data = &rk3328_mux_recalced_data[i]; + break; + } + + if (!data) + return; + + *reg = data->reg; + *mask = data->mask; + *bit = data->bit; +} + static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) { struct rockchip_pinctrl *info = bank->drvdata; @@ -2722,6 +2765,31 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) .drv_calc_reg = rk3288_calc_drv_reg_and_bit, }; +static struct rockchip_pin_bank rk3328_pin_banks[] = { + PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", 0, 0, 0, 0), + PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", 0, 0, 0, 0), + PIN_BANK_IOMUX_FLAGS(2, 32, "gpio2", 0, + IOMUX_WIDTH_3BIT | IOMUX_RECALCED, + IOMUX_WIDTH_3BIT | IOMUX_RECALCED, + 0), + PIN_BANK_IOMUX_FLAGS(3, 32, "gpio3", + IOMUX_WIDTH_3BIT, + IOMUX_WIDTH_3BIT | IOMUX_RECALCED, + 0, + 0), +}; + +static struct rockchip_pin_ctrl rk3328_pin_ctrl = { + .pin_banks = rk3328_pin_banks, + .nr_banks = ARRAY_SIZE(rk3328_pin_banks), + .label = "RK3328-GPIO", + .type = RK3288, + .grf_mux_offset = 0x0, + .pull_calc_reg = rk3228_calc_pull_reg_and_bit, + .drv_calc_reg = rk3228_calc_drv_reg_and_bit, + .iomux_recalc = rk3328_recalc_mux, +}; + static struct rockchip_pin_bank rk3368_pin_banks[] = { PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", IOMUX_SOURCE_PMU, IOMUX_SOURCE_PMU, @@ -2827,6 +2895,8 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) .data = (void *)&rk3228_pin_ctrl }, { .compatible = "rockchip,rk3288-pinctrl", .data = (void *)&rk3288_pin_ctrl }, + { .compatible = "rockchip,rk3328-pinctrl", + .data = (void *)&rk3328_pin_ctrl }, { .compatible = "rockchip,rk3368-pinctrl", .data = (void *)&rk3368_pin_ctrl }, { .compatible = "rockchip,rk3399-pinctrl", -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 3/3] pinctrl: rockchip: Add rk3328 pinctrl support @ 2017-02-10 10:23 ` David Wu 0 siblings, 0 replies; 15+ messages in thread From: David Wu @ 2017-02-10 10:23 UTC (permalink / raw) To: heiko, linus.walleij Cc: huangtao, linux-rockchip, linux-gpio, linux-kernel, david.wu From: "david.wu" <david.wu@rock-chips.com> Note, the iomux of following pins are special, need to be recalculated specially. - gpio2_b4 - gpio2_b7 - gpio2_c7 Signed-off-by: david.wu <david.wu@rock-chips.com> --- change in v2: - only 3 pins need to be recalculated .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- drivers/pinctrl/pinctrl-rockchip.c | 70 ++++++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt index 4722bc6..403b5a2 100644 --- a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt @@ -22,8 +22,8 @@ Required properties for iomux controller: - compatible: one of "rockchip,rk1108-pinctrl", "rockchip,rk2928-pinctrl" "rockchip,rk3066a-pinctrl", "rockchip,rk3066b-pinctrl" "rockchip,rk3188-pinctrl", "rockchip,rk3228-pinctrl" - "rockchip,rk3288-pinctrl", "rockchip,rk3368-pinctrl" - "rockchip,rk3399-pinctrl" + "rockchip,rk3288-pinctrl", "rockchip,rk3328-pinctrl" + "rockchip,rk3368-pinctrl", "rockchip,rk3399-pinctrl" - rockchip,grf: phandle referencing a syscon providing the "general register files" diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 191a2f9..a20ce9f 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -534,6 +534,49 @@ static void rockchip_dt_free_map(struct pinctrl_dev *pctldev, * Hardware access */ +static const struct rockchip_mux_recalced_data rk3328_mux_recalced_data[] = { + { + .num = 2, + .pin = 12, + .reg = 0x24, + .bit = 8, + .mask = 0x3 + }, { + .num = 2, + .pin = 15, + .reg = 0x28, + .bit = 0, + .mask = 0x7 + }, { + .num = 2, + .pin = 23, + .reg = 0x30, + .bit = 14, + .mask = 0x3 + }, +}; + +static void rk3328_recalc_mux(u8 bank_num, int pin, int *reg, + u8 *bit, int *mask) +{ + const struct rockchip_mux_recalced_data *data = NULL; + int i; + + for (i = 0; i < ARRAY_SIZE(rk3328_mux_recalced_data); i++) + if (rk3328_mux_recalced_data[i].num == bank_num && + rk3328_mux_recalced_data[i].pin == pin) { + data = &rk3328_mux_recalced_data[i]; + break; + } + + if (!data) + return; + + *reg = data->reg; + *mask = data->mask; + *bit = data->bit; +} + static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) { struct rockchip_pinctrl *info = bank->drvdata; @@ -2722,6 +2765,31 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) .drv_calc_reg = rk3288_calc_drv_reg_and_bit, }; +static struct rockchip_pin_bank rk3328_pin_banks[] = { + PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", 0, 0, 0, 0), + PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", 0, 0, 0, 0), + PIN_BANK_IOMUX_FLAGS(2, 32, "gpio2", 0, + IOMUX_WIDTH_3BIT | IOMUX_RECALCED, + IOMUX_WIDTH_3BIT | IOMUX_RECALCED, + 0), + PIN_BANK_IOMUX_FLAGS(3, 32, "gpio3", + IOMUX_WIDTH_3BIT, + IOMUX_WIDTH_3BIT | IOMUX_RECALCED, + 0, + 0), +}; + +static struct rockchip_pin_ctrl rk3328_pin_ctrl = { + .pin_banks = rk3328_pin_banks, + .nr_banks = ARRAY_SIZE(rk3328_pin_banks), + .label = "RK3328-GPIO", + .type = RK3288, + .grf_mux_offset = 0x0, + .pull_calc_reg = rk3228_calc_pull_reg_and_bit, + .drv_calc_reg = rk3228_calc_drv_reg_and_bit, + .iomux_recalc = rk3328_recalc_mux, +}; + static struct rockchip_pin_bank rk3368_pin_banks[] = { PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", IOMUX_SOURCE_PMU, IOMUX_SOURCE_PMU, @@ -2827,6 +2895,8 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) .data = (void *)&rk3228_pin_ctrl }, { .compatible = "rockchip,rk3288-pinctrl", .data = (void *)&rk3288_pin_ctrl }, + { .compatible = "rockchip,rk3328-pinctrl", + .data = (void *)&rk3328_pin_ctrl }, { .compatible = "rockchip,rk3368-pinctrl", .data = (void *)&rk3368_pin_ctrl }, { .compatible = "rockchip,rk3399-pinctrl", -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
[parent not found: <1486722229-5451-4-git-send-email-david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org>]
* Re: [PATCH v2 3/3] pinctrl: rockchip: Add rk3328 pinctrl support 2017-02-10 10:23 ` David Wu @ 2017-02-10 11:55 ` Heiko Stuebner -1 siblings, 0 replies; 15+ messages in thread From: Heiko Stuebner @ 2017-02-10 11:55 UTC (permalink / raw) To: David Wu Cc: huangtao-TNX95d0MmH7DzftRWevZcw, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linus.walleij-QSEj5FYQhm4dnm+yROfE0A, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-gpio-u79uwXL29TY76Z2rM5mHXA Am Freitag, 10. Februar 2017, 18:23:49 CET schrieb David Wu: > From: "david.wu" <david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org> > > Note, the iomux of following pins are special, need to > be recalculated specially. > - gpio2_b4 > - gpio2_b7 > - gpio2_c7 > > Signed-off-by: david.wu <david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Reviewed-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 3/3] pinctrl: rockchip: Add rk3328 pinctrl support @ 2017-02-10 11:55 ` Heiko Stuebner 0 siblings, 0 replies; 15+ messages in thread From: Heiko Stuebner @ 2017-02-10 11:55 UTC (permalink / raw) To: David Wu Cc: linus.walleij, huangtao, linux-rockchip, linux-gpio, linux-kernel Am Freitag, 10. Februar 2017, 18:23:49 CET schrieb David Wu: > From: "david.wu" <david.wu@rock-chips.com> > > Note, the iomux of following pins are special, need to > be recalculated specially. > - gpio2_b4 > - gpio2_b7 > - gpio2_c7 > > Signed-off-by: david.wu <david.wu@rock-chips.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 3/3] pinctrl: rockchip: Add rk3328 pinctrl support 2017-02-10 10:23 ` David Wu (?) (?) @ 2017-02-22 15:03 ` Linus Walleij -1 siblings, 0 replies; 15+ messages in thread From: Linus Walleij @ 2017-02-22 15:03 UTC (permalink / raw) To: David Wu Cc: Heiko Stübner, Tao Huang, open list:ARM/Rockchip SoC..., linux-gpio, linux-kernel On Fri, Feb 10, 2017 at 11:23 AM, David Wu <david.wu@rock-chips.com> wrote: > From: "david.wu" <david.wu@rock-chips.com> > > Note, the iomux of following pins are special, need to > be recalculated specially. > - gpio2_b4 > - gpio2_b7 > - gpio2_c7 > > Signed-off-by: david.wu <david.wu@rock-chips.com> > --- > change in v2: > - only 3 pins need to be recalculated Patch applied for v4.12. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-02-22 15:03 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-10 10:23 [PATCH v2 0/3] Support rk3328 pinctrl David Wu
2017-02-10 10:23 ` David Wu
2017-02-10 10:23 ` [PATCH v2 1/3] pinctrl: rockchip: Add 3bit width mux support David Wu
2017-02-10 11:10 ` Heiko Stuebner
2017-02-22 15:00 ` Linus Walleij
[not found] ` <1486722229-5451-1-git-send-email-david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2017-02-10 10:23 ` [PATCH v2 2/3] pinctrl: rockchip: Add mux recalculation support David Wu
2017-02-10 10:23 ` David Wu
[not found] ` <1486722229-5451-3-git-send-email-david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2017-02-10 11:53 ` Heiko Stuebner
2017-02-10 11:53 ` Heiko Stuebner
2017-02-22 15:02 ` Linus Walleij
2017-02-10 10:23 ` [PATCH v2 3/3] pinctrl: rockchip: Add rk3328 pinctrl support David Wu
2017-02-10 10:23 ` David Wu
[not found] ` <1486722229-5451-4-git-send-email-david.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2017-02-10 11:55 ` Heiko Stuebner
2017-02-10 11:55 ` Heiko Stuebner
2017-02-22 15:03 ` Linus Walleij
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.