| Message ID | 1425058685-12956-2-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 05c5f265c6f72750d2a60f75ff3cfefe47379210 |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Geert, Thank you for the patch. On Friday 27 February 2015 18:38:02 Geert Uytterhoeven wrote: > After the last user of the in_pd/in_pu bias parameters of the _PCRH() > macro was removed in commit 80da8e02d22caaef ("sh-pfc: r8a7740: Add bias > (pull-up/down) pinconf support"), bias parameters are supposed to be > configured using the generic pinctl mechanism, which calls the > .set_bias() method. > > However, the PORTCR() macro still represents the control register as > consisting of two 4-bit fields. Hence the bias configuration in the > uppermost 2 bits is always overwritten with zeroes when a pin is > configured for GPIO, disabling any previously configured bias. > > Use the variable config register macro instead, to represent the > register as having 4 fields, and to make sure only the input/output > control and function fields are touched. > > This affects R-Mobile APE6 (r8a73a4), R-Mobile A1 (r8a7740), SH-Mobile > AP4 (sh7372), and SH-Mobile AG5 (sh73a0). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > Tested on r8a73a4/ape6evm, which requires a pull-up bias for the > GPIO switches. > --- > drivers/pinctrl/sh-pfc/sh_pfc.h | 25 +++++++++++++------------ > 1 file changed, 13 insertions(+), 12 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h > b/drivers/pinctrl/sh-pfc/sh_pfc.h index c83728626906c16c..ed5cf4192fa1a2d0 > 100644 > --- a/drivers/pinctrl/sh-pfc/sh_pfc.h > +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h > @@ -302,20 +302,21 @@ struct sh_pfc_soc_info { > /* > * PORTnCR macro > */ > -#define _PCRH(in, in_pd, in_pu, out) \ > - 0, (out), (in), 0, \ > - 0, 0, 0, 0, \ > - 0, 0, (in_pd), 0, \ > - 0, 0, (in_pu), 0 > - > #define PORTCR(nr, reg) \ > { \ > - PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \ > - _PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \ > - PORT##nr##_FN0, PORT##nr##_FN1, \ > - PORT##nr##_FN2, PORT##nr##_FN3, \ > - PORT##nr##_FN4, PORT##nr##_FN5, \ > - PORT##nr##_FN6, PORT##nr##_FN7 } \ > + PINMUX_CFG_REG_VAR("PORT" nr "CR", reg, 8, 2, 2, 1, 3) {\ > + /* PULMD[1:0], handled by .set_bias() */ \ > + 0, 0, 0, 0, \ > + /* IE and OE */ \ > + 0, PORT##nr##_OUT, PORT##nr##_IN, 0, \ > + /* SEC, not supported */ \ > + 0, 0, \ > + /* PTMD[2:0] */ \ > + PORT##nr##_FN0, PORT##nr##_FN1, \ > + PORT##nr##_FN2, PORT##nr##_FN3, \ > + PORT##nr##_FN4, PORT##nr##_FN5, \ > + PORT##nr##_FN6, PORT##nr##_FN7 \ > + } \ > } > > #endif /* __SH_PFC_H */
On Fri, Feb 27, 2015 at 6:38 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > After the last user of the in_pd/in_pu bias parameters of the _PCRH() > macro was removed in commit 80da8e02d22caaef ("sh-pfc: r8a7740: Add bias > (pull-up/down) pinconf support"), bias parameters are supposed to be > configured using the generic pinctl mechanism, which calls the > .set_bias() method. > > However, the PORTCR() macro still represents the control register as > consisting of two 4-bit fields. Hence the bias configuration in the > uppermost 2 bits is always overwritten with zeroes when a pin is > configured for GPIO, disabling any previously configured bias. > > Use the variable config register macro instead, to represent the > register as having 4 fields, and to make sure only the input/output > control and function fields are touched. > > This affects R-Mobile APE6 (r8a73a4), R-Mobile A1 (r8a7740), SH-Mobile > AP4 (sh7372), and SH-Mobile AG5 (sh73a0). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Patch applied with Laurent's ACK. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h index c83728626906c16c..ed5cf4192fa1a2d0 100644 --- a/drivers/pinctrl/sh-pfc/sh_pfc.h +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h @@ -302,20 +302,21 @@ struct sh_pfc_soc_info { /* * PORTnCR macro */ -#define _PCRH(in, in_pd, in_pu, out) \ - 0, (out), (in), 0, \ - 0, 0, 0, 0, \ - 0, 0, (in_pd), 0, \ - 0, 0, (in_pu), 0 - #define PORTCR(nr, reg) \ { \ - PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \ - _PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \ - PORT##nr##_FN0, PORT##nr##_FN1, \ - PORT##nr##_FN2, PORT##nr##_FN3, \ - PORT##nr##_FN4, PORT##nr##_FN5, \ - PORT##nr##_FN6, PORT##nr##_FN7 } \ + PINMUX_CFG_REG_VAR("PORT" nr "CR", reg, 8, 2, 2, 1, 3) {\ + /* PULMD[1:0], handled by .set_bias() */ \ + 0, 0, 0, 0, \ + /* IE and OE */ \ + 0, PORT##nr##_OUT, PORT##nr##_IN, 0, \ + /* SEC, not supported */ \ + 0, 0, \ + /* PTMD[2:0] */ \ + PORT##nr##_FN0, PORT##nr##_FN1, \ + PORT##nr##_FN2, PORT##nr##_FN3, \ + PORT##nr##_FN4, PORT##nr##_FN5, \ + PORT##nr##_FN6, PORT##nr##_FN7 \ + } \ } #endif /* __SH_PFC_H */
After the last user of the in_pd/in_pu bias parameters of the _PCRH() macro was removed in commit 80da8e02d22caaef ("sh-pfc: r8a7740: Add bias (pull-up/down) pinconf support"), bias parameters are supposed to be configured using the generic pinctl mechanism, which calls the .set_bias() method. However, the PORTCR() macro still represents the control register as consisting of two 4-bit fields. Hence the bias configuration in the uppermost 2 bits is always overwritten with zeroes when a pin is configured for GPIO, disabling any previously configured bias. Use the variable config register macro instead, to represent the register as having 4 fields, and to make sure only the input/output control and function fields are touched. This affects R-Mobile APE6 (r8a73a4), R-Mobile A1 (r8a7740), SH-Mobile AP4 (sh7372), and SH-Mobile AG5 (sh73a0). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Tested on r8a73a4/ape6evm, which requires a pull-up bias for the GPIO switches. --- drivers/pinctrl/sh-pfc/sh_pfc.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)