| Message ID | 20230309154949.658380-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 163bfb0cb1f6fbf961cf912cbde57399ea1ae0e8 |
| Headers | show |
| Series | [1/4] pinctrl: qcom: lpass-lpi: set output value before enabling output | expand |
On 9.03.2023 16:49, Krzysztof Kozlowski wrote: > As per Hardware Programming Guide, when configuring pin as output, > set the pin value before setting output-enable (OE). Similar approach > is in main SoC TLMM pin controller. > > Cc: <stable@vger.kernel.org> > Fixes: 6e261d1090d6 ("pinctrl: qcom: Add sm8250 lpass lpi pinctrl driver") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c > index 87920257bb73..27fc8b671954 100644 > --- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c > +++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c > @@ -221,6 +221,15 @@ static int lpi_config_set(struct pinctrl_dev *pctldev, unsigned int group, > } > } > > + /* > + * As per Hardware Programming Guide, when configuring pin as output, > + * set the pin value before setting output-enable (OE). > + */ > + if (output_enabled) { > + val = u32_encode_bits(value ? 1 : 0, LPI_GPIO_VALUE_OUT_MASK); > + lpi_gpio_write(pctrl, group, LPI_GPIO_VALUE_REG, val); > + } > + > val = lpi_gpio_read(pctrl, group, LPI_GPIO_CFG_REG); > > u32p_replace_bits(&val, pullup, LPI_GPIO_PULL_MASK); > @@ -230,11 +239,6 @@ static int lpi_config_set(struct pinctrl_dev *pctldev, unsigned int group, > > lpi_gpio_write(pctrl, group, LPI_GPIO_CFG_REG, val); > > - if (output_enabled) { > - val = u32_encode_bits(value ? 1 : 0, LPI_GPIO_VALUE_OUT_MASK); > - lpi_gpio_write(pctrl, group, LPI_GPIO_VALUE_REG, val); > - } > - > return 0; > } >
On 9.03.2023 16:49, Krzysztof Kozlowski wrote: > The set_mux callback in SoC TLMM driver (pinctrl-msm.c) uses "group", > not "group_num" for the number of the pin group. Other places of > lpass-lpi also use "group", so let's be consistent for code readability. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c > index 27fc8b671954..bd32556d75a5 100644 > --- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c > +++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c > @@ -84,10 +84,10 @@ static int lpi_gpio_get_function_groups(struct pinctrl_dev *pctldev, > } > > static int lpi_gpio_set_mux(struct pinctrl_dev *pctldev, unsigned int function, > - unsigned int group_num) > + unsigned int group) > { > struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); > - const struct lpi_pingroup *g = &pctrl->data->groups[group_num]; > + const struct lpi_pingroup *g = &pctrl->data->groups[group]; > u32 val; > int i, pin = g->pin; >
diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c index 87920257bb73..27fc8b671954 100644 --- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c +++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c @@ -221,6 +221,15 @@ static int lpi_config_set(struct pinctrl_dev *pctldev, unsigned int group, } } + /* + * As per Hardware Programming Guide, when configuring pin as output, + * set the pin value before setting output-enable (OE). + */ + if (output_enabled) { + val = u32_encode_bits(value ? 1 : 0, LPI_GPIO_VALUE_OUT_MASK); + lpi_gpio_write(pctrl, group, LPI_GPIO_VALUE_REG, val); + } + val = lpi_gpio_read(pctrl, group, LPI_GPIO_CFG_REG); u32p_replace_bits(&val, pullup, LPI_GPIO_PULL_MASK); @@ -230,11 +239,6 @@ static int lpi_config_set(struct pinctrl_dev *pctldev, unsigned int group, lpi_gpio_write(pctrl, group, LPI_GPIO_CFG_REG, val); - if (output_enabled) { - val = u32_encode_bits(value ? 1 : 0, LPI_GPIO_VALUE_OUT_MASK); - lpi_gpio_write(pctrl, group, LPI_GPIO_VALUE_REG, val); - } - return 0; }
As per Hardware Programming Guide, when configuring pin as output, set the pin value before setting output-enable (OE). Similar approach is in main SoC TLMM pin controller. Cc: <stable@vger.kernel.org> Fixes: 6e261d1090d6 ("pinctrl: qcom: Add sm8250 lpass lpi pinctrl driver") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)