| Message ID | 20210617053432.350486-1-bhupesh.sharma@linaro.org |
|---|---|
| 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-pmic gpio device tree > bindings alphabetically. > > While at it, also make some minor cosmetic changes to allow > future compatible addition to the bindings simpler. > I think we're rather close to getting the YAML binding sorted out, but this patch does look good and doesn't hurt. 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> > --- > .../bindings/pinctrl/qcom,pmic-gpio.txt | 58 +++++++++---------- > 1 file changed, 29 insertions(+), 29 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt > index f6a9760558a6..10f049e21264 100644 > --- a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt > +++ b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt > @@ -7,10 +7,20 @@ PMIC's from Qualcomm. > Usage: required > Value type: <string> > Definition: must be one of: > + "qcom,pm660-gpio" > + "qcom,pm660l-gpio" > + "qcom,pm6150-gpio" > + "qcom,pm6150l-gpio" > "qcom,pm8005-gpio" > + "qcom,pm8008-gpio" > "qcom,pm8018-gpio" > "qcom,pm8038-gpio" > "qcom,pm8058-gpio" > + "qcom,pm8150-gpio" > + "qcom,pm8150b-gpio" > + "qcom,pm8350-gpio" > + "qcom,pm8350b-gpio" > + "qcom,pm8350c-gpio" > "qcom,pm8916-gpio" > "qcom,pm8917-gpio" > "qcom,pm8921-gpio" > @@ -22,20 +32,10 @@ PMIC's from Qualcomm. > "qcom,pmi8950-gpio" > "qcom,pmi8994-gpio" > "qcom,pmi8998-gpio" > - "qcom,pms405-gpio" > - "qcom,pm660-gpio" > - "qcom,pm660l-gpio" > - "qcom,pm8150-gpio" > - "qcom,pm8150b-gpio" > - "qcom,pm8350-gpio" > - "qcom,pm8350b-gpio" > - "qcom,pm8350c-gpio" > "qcom,pmk8350-gpio" > "qcom,pmr735a-gpio" > "qcom,pmr735b-gpio" > - "qcom,pm6150-gpio" > - "qcom,pm6150l-gpio" > - "qcom,pm8008-gpio" > + "qcom,pms405-gpio" > "qcom,pmx55-gpio" > > And must contain either "qcom,spmi-gpio" or "qcom,ssbi-gpio" > @@ -97,34 +97,34 @@ to specify in a pin configuration subnode: > Value type: <string-array> > Definition: List of gpio pins affected by the properties specified in > this subnode. Valid pins are: > - gpio1-gpio4 for pm8005 > - gpio1-gpio6 for pm8018 > + gpio1-gpio10 for pm6150 > + gpio1-gpio12 for pm6150l > + gpio1-gpio4 for pm8005 > + gpio1-gpio2 for pm8008 > + gpio1-gpio6 for pm8018 > gpio1-gpio12 for pm8038 > gpio1-gpio40 for pm8058 > - gpio1-gpio4 for pm8916 > + gpio1-gpio10 for pm8150 (holes on gpio2, gpio5, gpio7 > + and gpio8) > + gpio1-gpio12 for pm8150b (holes on gpio3, gpio4, gpio7) > + gpio1-gpio12 for pm8150l (hole on gpio7) > + gpio1-gpio10 for pm8350 > + gpio1-gpio8 for pm8350b > + gpio1-gpio9 for pm8350c > + gpio1-gpio4 for pm8916 > gpio1-gpio38 for pm8917 > gpio1-gpio44 for pm8921 > gpio1-gpio36 for pm8941 > - gpio1-gpio8 for pm8950 (hole on gpio3) > + gpio1-gpio8 for pm8950 (hole on gpio3) > gpio1-gpio22 for pm8994 > gpio1-gpio26 for pm8998 > gpio1-gpio22 for pma8084 > - gpio1-gpio2 for pmi8950 > + gpio1-gpio2 for pmi8950 > gpio1-gpio10 for pmi8994 > + gpio1-gpio4 for pmk8350 > + gpio1-gpio4 for pmr735a > + gpio1-gpio4 for pmr735b > gpio1-gpio12 for pms405 (holes on gpio1, gpio9 and gpio10) > - gpio1-gpio10 for pm8150 (holes on gpio2, gpio5, gpio7 > - and gpio8) > - gpio1-gpio12 for pm8150b (holes on gpio3, gpio4, gpio7) > - gpio1-gpio12 for pm8150l (hole on gpio7) > - gpio1-gpio10 for pm8350 > - gpio1-gpio8 for pm8350b > - gpio1-gpio9 for pm8350c > - gpio1-gpio4 for pmk8350 > - gpio1-gpio4 for pmr735a > - gpio1-gpio4 for pmr735b > - gpio1-gpio10 for pm6150 > - gpio1-gpio12 for pm6150l > - gpio1-gpio2 for pm8008 > gpio1-gpio11 for pmx55 (holes on gpio3, gpio7, gpio10 > and gpio11) > > -- > 2.31.1 >
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 >
On Thu, Jun 17, 2021 at 7:34 AM Bhupesh Sharma <bhupesh.sharma@linaro.org> wrote: > Arrange the compatibles inside qcom-pmic gpio device tree > bindings alphabetically. > > While at it, also make some minor cosmetic changes to allow > future compatible addition to the bindings simpler. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> These patches do not apply on the current devel branch in the pin control tree: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=devel Please rebase and resend! Yours, Linus Walleij
Hi Linus, On Sat, 26 Jun 2021 at 05:21, Linus Walleij <linus.walleij@linaro.org> wrote: > > On Thu, Jun 17, 2021 at 7:34 AM Bhupesh Sharma > <bhupesh.sharma@linaro.org> wrote: > > > Arrange the compatibles inside qcom-pmic gpio device tree > > bindings alphabetically. > > > > While at it, also make some minor cosmetic changes to allow > > future compatible addition to the bindings simpler. > > > > Cc: Linus Walleij <linus.walleij@linaro.org> > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > > These patches do not apply on the current devel branch in the pin control > tree: > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=devel > > Please rebase and resend! Sure, Let me rebase and resend the pinctrl patchset. Thanks, Bhupesh
Hello Linus, On Sat, 26 Jun 2021 at 23:59, Bhupesh Sharma <bhupesh.sharma@linaro.org> wrote: > > Hi Linus, > > On Sat, 26 Jun 2021 at 05:21, Linus Walleij <linus.walleij@linaro.org> wrote: > > > > On Thu, Jun 17, 2021 at 7:34 AM Bhupesh Sharma > > <bhupesh.sharma@linaro.org> wrote: > > > > > Arrange the compatibles inside qcom-pmic gpio device tree > > > bindings alphabetically. > > > > > > While at it, also make some minor cosmetic changes to allow > > > future compatible addition to the bindings simpler. > > > > > > Cc: Linus Walleij <linus.walleij@linaro.org> > > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > > > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > > > > These patches do not apply on the current devel branch in the pin control > > tree: > > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=devel > > > > Please rebase and resend! > > Sure, Let me rebase and resend the pinctrl patchset. v4 (rebased on pinctrl/devel) has been sent out and can be viewed here: [1] [1]. https://lore.kernel.org/linux-gpio/20210629123407.82561-1-bhupesh.sharma@linaro.org/T/#m6595060a61e29d956b1a8ddc7a7a684f1f3b7641 Thanks, Bhupesh
Changes since v2: ----------------- - v2 series can be found here: https://lore.kernel.org/linux-arm-msm/20210615074543.26700-1-bhupesh.sharma@linaro.org/T/#m8303d27d561b30133992da88198abb78ea833e21 - Addressed review comments from Bjorn and Mark. - As per suggestion from Bjorn, separated the patches in different patchsets (specific to each subsystem) to ease review and patch application. Changes since v1: ----------------- - v1 series can be found here: https://lore.kernel.org/linux-arm-msm/20210607113840.15435-1-bhupesh.sharma@linaro.org/T/#mc524fe82798d4c4fb75dd0333318955e0406ad18 - Addressed review comments from Bjorn and Vinod received on the v1 series. This series adds the pmic-gpio support code for SA8155p-adp board which is based on Qualcomm snapdragon sa8155p SoC which in turn is simiar to the sm8150 SoC. This board supports a new PMIC -> PMM8155AU. While at it, also make some cosmetic changes to the qcom pinctrl-spmi-gpio driver and dt-bindings to make sure the compatibles are in alphabetical order. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Bhupesh Sharma (4): dt-bindings: pinctrl: qcom,pmic-gpio: Arrange compatibles alphabetically dt-bindings: pinctrl: qcom,pmic-gpio: Add compatible for SA8155p-adp pinctrl: qcom/pinctrl-spmi-gpio: Arrange compatibles alphabetically pinctrl: qcom/pinctrl-spmi-gpio: Add compatible for pmic-gpio on SA8155p-adp .../bindings/pinctrl/qcom,pmic-gpio.txt | 60 ++++++++++--------- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 33 +++++----- 2 files changed, 48 insertions(+), 45 deletions(-)