| From eaaeeafc7d4a7cfac8344adc0701fb7e2a524fe2 Mon Sep 17 00:00:00 2001 |
| From: Bjorn Andersson <bjorn.andersson@linaro.org> |
| Date: Mon, 28 Jun 2021 17:38:51 -0700 |
| Subject: [PATCH] FROMGIT: pinctrl: qcom: spmi-gpio: Add pmc8180 & pmc8180c |
| |
| The SC8180x platform comes with PMC8180 and PMC8180c, add support for |
| the GPIO controller in these PMICs. |
| |
| Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> |
| Acked-by: Rob Herring <robh@kernel.org> |
| Link: https://lore.kernel.org/r/20210629003851.1787673-1-bjorn.andersson@linaro.org |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit 182700f258531c75846cb0f070e847e8b4c457b2 |
| https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git for-next) |
| |
| BUG=b:186387242 |
| TEST=emerge-herobrine chromeos-kernel-5_10 |
| |
| Signed-off-by: Stephen Boyd <swboyd@chromium.org> |
| Change-Id: I659e81f77c394d43e8ddb5d86895bad8ec036419 |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3089111 |
| Reviewed-by: Sean Paul <seanpaul@chromium.org> |
| Reviewed-by: Matthias Kaehlcke <mka@chromium.org> |
| --- |
| Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 4 ++++ |
| drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 ++ |
| 2 files changed, 6 insertions(+) |
| |
| diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt |
| --- a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt |
| +++ b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt |
| @@ -19,6 +19,8 @@ PMIC's from Qualcomm. |
| "qcom,pm8994-gpio" |
| "qcom,pm8998-gpio" |
| "qcom,pma8084-gpio" |
| + "qcom,pmc8180-gpio" |
| + "qcom,pmc8180c-gpio" |
| "qcom,pmi8950-gpio" |
| "qcom,pmi8994-gpio" |
| "qcom,pmi8998-gpio" |
| @@ -110,6 +112,8 @@ to specify in a pin configuration subnode: |
| gpio1-gpio22 for pm8994 |
| gpio1-gpio26 for pm8998 |
| gpio1-gpio22 for pma8084 |
| + gpio1-gpio10 for pmc8180 |
| + gpio1-gpio12 for pmc8180c |
| gpio1-gpio2 for pmi8950 |
| gpio1-gpio10 for pmi8994 |
| gpio1-gpio12 for pms405 (holes on gpio1, gpio9 and gpio10) |
| diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c |
| --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c |
| +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c |
| @@ -1123,10 +1123,12 @@ static const struct of_device_id pmic_gpio_of_match[] = { |
| { .compatible = "qcom,pm660l-gpio", .data = (void *) 12 }, |
| /* pm8150 has 10 GPIOs with holes on 2, 5, 7 and 8 */ |
| { .compatible = "qcom,pm8150-gpio", .data = (void *) 10 }, |
| + { .compatible = "qcom,pmc8180-gpio", .data = (void *) 10 }, |
| /* pm8150b has 12 GPIOs with holes on 3, r and 7 */ |
| { .compatible = "qcom,pm8150b-gpio", .data = (void *) 12 }, |
| /* pm8150l has 12 GPIOs with holes on 7 */ |
| { .compatible = "qcom,pm8150l-gpio", .data = (void *) 12 }, |
| + { .compatible = "qcom,pmc8180c-gpio", .data = (void *) 12 }, |
| { .compatible = "qcom,pm8350-gpio", .data = (void *) 10 }, |
| { .compatible = "qcom,pm8350b-gpio", .data = (void *) 8 }, |
| { .compatible = "qcom,pm8350c-gpio", .data = (void *) 9 }, |
| -- |
| 2.33.0.rc1.237.g0d66db33f3-goog |
| |
