Message ID | 20210617053432.350486-4-bhupesh.sharma@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | pinctrl: qcom/pinctrl-spmi-gpio: Add support for pmic-gpio on SA8155p-adp | expand |
On Thu 17 Jun 00:34 CDT 2021, Bhupesh Sharma wrote: > Arrange the compatibles inside qcom pinctrl-spmi gpio driver > alphabetically. > Nice, thanks Bhupesh. Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > --- > drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 ++++++++++++------------ > 1 file changed, 16 insertions(+), 16 deletions(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c > index 00870da0c94e..89f6147efe58 100644 > --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c > +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c > @@ -1104,23 +1104,14 @@ static int pmic_gpio_remove(struct platform_device *pdev) > } > > static const struct of_device_id pmic_gpio_of_match[] = { > - { .compatible = "qcom,pm8005-gpio", .data = (void *) 4 }, > - { .compatible = "qcom,pm8916-gpio", .data = (void *) 4 }, > - { .compatible = "qcom,pm8941-gpio", .data = (void *) 36 }, > - /* pm8950 has 8 GPIOs with holes on 3 */ > - { .compatible = "qcom,pm8950-gpio", .data = (void *) 8 }, > - { .compatible = "qcom,pmi8950-gpio", .data = (void *) 2 }, > - { .compatible = "qcom,pm8994-gpio", .data = (void *) 22 }, > - { .compatible = "qcom,pmi8994-gpio", .data = (void *) 10 }, > - { .compatible = "qcom,pm8998-gpio", .data = (void *) 26 }, > - { .compatible = "qcom,pmi8998-gpio", .data = (void *) 14 }, > - { .compatible = "qcom,pma8084-gpio", .data = (void *) 22 }, > - /* pms405 has 12 GPIOs with holes on 1, 9, and 10 */ > - { .compatible = "qcom,pms405-gpio", .data = (void *) 12 }, > /* pm660 has 13 GPIOs with holes on 1, 5, 6, 7, 8 and 10 */ > { .compatible = "qcom,pm660-gpio", .data = (void *) 13 }, > /* pm660l has 12 GPIOs with holes on 1, 2, 10, 11 and 12 */ > { .compatible = "qcom,pm660l-gpio", .data = (void *) 12 }, > + { .compatible = "qcom,pm6150-gpio", .data = (void *) 10 }, > + { .compatible = "qcom,pm6150l-gpio", .data = (void *) 12 }, > + { .compatible = "qcom,pm8005-gpio", .data = (void *) 4 }, > + { .compatible = "qcom,pm8008-gpio", .data = (void *) 2 }, > /* pm8150 has 10 GPIOs with holes on 2, 5, 7 and 8 */ > { .compatible = "qcom,pm8150-gpio", .data = (void *) 10 }, > /* pm8150b has 12 GPIOs with holes on 3, r and 7 */ > @@ -1130,12 +1121,21 @@ static const struct of_device_id pmic_gpio_of_match[] = { > { .compatible = "qcom,pm8350-gpio", .data = (void *) 10 }, > { .compatible = "qcom,pm8350b-gpio", .data = (void *) 8 }, > { .compatible = "qcom,pm8350c-gpio", .data = (void *) 9 }, > + { .compatible = "qcom,pm8916-gpio", .data = (void *) 4 }, > + { .compatible = "qcom,pm8941-gpio", .data = (void *) 36 }, > + /* pm8950 has 8 GPIOs with holes on 3 */ > + { .compatible = "qcom,pm8950-gpio", .data = (void *) 8 }, > + { .compatible = "qcom,pm8994-gpio", .data = (void *) 22 }, > + { .compatible = "qcom,pm8998-gpio", .data = (void *) 26 }, > + { .compatible = "qcom,pma8084-gpio", .data = (void *) 22 }, > + { .compatible = "qcom,pmi8950-gpio", .data = (void *) 2 }, > + { .compatible = "qcom,pmi8994-gpio", .data = (void *) 10 }, > + { .compatible = "qcom,pmi8998-gpio", .data = (void *) 14 }, > { .compatible = "qcom,pmk8350-gpio", .data = (void *) 4 }, > { .compatible = "qcom,pmr735a-gpio", .data = (void *) 4 }, > { .compatible = "qcom,pmr735b-gpio", .data = (void *) 4 }, > - { .compatible = "qcom,pm6150-gpio", .data = (void *) 10 }, > - { .compatible = "qcom,pm6150l-gpio", .data = (void *) 12 }, > - { .compatible = "qcom,pm8008-gpio", .data = (void *) 2 }, > + /* pms405 has 12 GPIOs with holes on 1, 9, and 10 */ > + { .compatible = "qcom,pms405-gpio", .data = (void *) 12 }, > /* pmx55 has 11 GPIOs with holes on 3, 7, 10, 11 */ > { .compatible = "qcom,pmx55-gpio", .data = (void *) 11 }, > { }, > -- > 2.31.1 >
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c index 00870da0c94e..89f6147efe58 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c @@ -1104,23 +1104,14 @@ static int pmic_gpio_remove(struct platform_device *pdev) } static const struct of_device_id pmic_gpio_of_match[] = { - { .compatible = "qcom,pm8005-gpio", .data = (void *) 4 }, - { .compatible = "qcom,pm8916-gpio", .data = (void *) 4 }, - { .compatible = "qcom,pm8941-gpio", .data = (void *) 36 }, - /* pm8950 has 8 GPIOs with holes on 3 */ - { .compatible = "qcom,pm8950-gpio", .data = (void *) 8 }, - { .compatible = "qcom,pmi8950-gpio", .data = (void *) 2 }, - { .compatible = "qcom,pm8994-gpio", .data = (void *) 22 }, - { .compatible = "qcom,pmi8994-gpio", .data = (void *) 10 }, - { .compatible = "qcom,pm8998-gpio", .data = (void *) 26 }, - { .compatible = "qcom,pmi8998-gpio", .data = (void *) 14 }, - { .compatible = "qcom,pma8084-gpio", .data = (void *) 22 }, - /* pms405 has 12 GPIOs with holes on 1, 9, and 10 */ - { .compatible = "qcom,pms405-gpio", .data = (void *) 12 }, /* pm660 has 13 GPIOs with holes on 1, 5, 6, 7, 8 and 10 */ { .compatible = "qcom,pm660-gpio", .data = (void *) 13 }, /* pm660l has 12 GPIOs with holes on 1, 2, 10, 11 and 12 */ { .compatible = "qcom,pm660l-gpio", .data = (void *) 12 }, + { .compatible = "qcom,pm6150-gpio", .data = (void *) 10 }, + { .compatible = "qcom,pm6150l-gpio", .data = (void *) 12 }, + { .compatible = "qcom,pm8005-gpio", .data = (void *) 4 }, + { .compatible = "qcom,pm8008-gpio", .data = (void *) 2 }, /* pm8150 has 10 GPIOs with holes on 2, 5, 7 and 8 */ { .compatible = "qcom,pm8150-gpio", .data = (void *) 10 }, /* pm8150b has 12 GPIOs with holes on 3, r and 7 */ @@ -1130,12 +1121,21 @@ static const struct of_device_id pmic_gpio_of_match[] = { { .compatible = "qcom,pm8350-gpio", .data = (void *) 10 }, { .compatible = "qcom,pm8350b-gpio", .data = (void *) 8 }, { .compatible = "qcom,pm8350c-gpio", .data = (void *) 9 }, + { .compatible = "qcom,pm8916-gpio", .data = (void *) 4 }, + { .compatible = "qcom,pm8941-gpio", .data = (void *) 36 }, + /* pm8950 has 8 GPIOs with holes on 3 */ + { .compatible = "qcom,pm8950-gpio", .data = (void *) 8 }, + { .compatible = "qcom,pm8994-gpio", .data = (void *) 22 }, + { .compatible = "qcom,pm8998-gpio", .data = (void *) 26 }, + { .compatible = "qcom,pma8084-gpio", .data = (void *) 22 }, + { .compatible = "qcom,pmi8950-gpio", .data = (void *) 2 }, + { .compatible = "qcom,pmi8994-gpio", .data = (void *) 10 }, + { .compatible = "qcom,pmi8998-gpio", .data = (void *) 14 }, { .compatible = "qcom,pmk8350-gpio", .data = (void *) 4 }, { .compatible = "qcom,pmr735a-gpio", .data = (void *) 4 }, { .compatible = "qcom,pmr735b-gpio", .data = (void *) 4 }, - { .compatible = "qcom,pm6150-gpio", .data = (void *) 10 }, - { .compatible = "qcom,pm6150l-gpio", .data = (void *) 12 }, - { .compatible = "qcom,pm8008-gpio", .data = (void *) 2 }, + /* pms405 has 12 GPIOs with holes on 1, 9, and 10 */ + { .compatible = "qcom,pms405-gpio", .data = (void *) 12 }, /* pmx55 has 11 GPIOs with holes on 3, 7, 10, 11 */ { .compatible = "qcom,pmx55-gpio", .data = (void *) 11 }, { },
Arrange the compatibles inside qcom pinctrl-spmi gpio driver alphabetically. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> --- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) -- 2.31.1