lkml.org 
[lkml]   [2020]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/3] pinctrl: qcom: Allow SoCs to specify a GPIO function that's not 0
    Date
    There's currently a comment in the code saying function 0 is GPIO.
    Instead of hardcoding it, let's add a member where an SoC can specify
    it. No known SoCs use a number other than 0, but this just makes the
    code clearer. NOTE: no SoC code needs to be updated since we can rely
    on zero-initialization.

    Signed-off-by: Douglas Anderson <dianders@chromium.org>
    ---

    (no changes since v1)

    drivers/pinctrl/qcom/pinctrl-msm.c | 4 ++--
    drivers/pinctrl/qcom/pinctrl-msm.h | 2 ++
    2 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
    index 77a25bdf0da7..588df91274e2 100644
    --- a/drivers/pinctrl/qcom/pinctrl-msm.c
    +++ b/drivers/pinctrl/qcom/pinctrl-msm.c
    @@ -210,8 +210,8 @@ static int msm_pinmux_request_gpio(struct pinctrl_dev *pctldev,
    if (!g->nfuncs)
    return 0;

    - /* For now assume function 0 is GPIO because it always is */
    - return msm_pinmux_set_mux(pctldev, g->funcs[0], offset);
    + return msm_pinmux_set_mux(pctldev,
    + g->funcs[pctrl->soc->gpio_func], offset);
    }

    static const struct pinmux_ops msm_pinmux_ops = {
    diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h
    index 333f99243c43..e31a5167c91e 100644
    --- a/drivers/pinctrl/qcom/pinctrl-msm.h
    +++ b/drivers/pinctrl/qcom/pinctrl-msm.h
    @@ -118,6 +118,7 @@ struct msm_gpio_wakeirq_map {
    * @wakeirq_dual_edge_errata: If true then GPIOs using the wakeirq_map need
    * to be aware that their parent can't handle dual
    * edge interrupts.
    + * @gpio_func: Which function number is GPIO (usually 0).
    */
    struct msm_pinctrl_soc_data {
    const struct pinctrl_pin_desc *pins;
    @@ -134,6 +135,7 @@ struct msm_pinctrl_soc_data {
    const struct msm_gpio_wakeirq_map *wakeirq_map;
    unsigned int nwakeirq_map;
    bool wakeirq_dual_edge_errata;
    + unsigned int gpio_func;
    };

    extern const struct dev_pm_ops msm_pinctrl_dev_pm_ops;
    --
    2.29.2.454.gaff20da3a2-goog
    \
     
     \ /
      Last update: 2020-11-24 18:49    [W:5.378 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site