Add Vol+ support for sc7280-idp
Subsystems (8)
v5 cover Add Vol+ support for sc7280-idp
David Collins (1):
pinctrl: qcom: spmi-gpio: correct parent irqspec translation
satya priya (1):
arm64: dts: sc7280: Add volume up support for sc7280-idp
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 31 ++++++++++++++++++++++++++ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 37 +++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 3 deletions(-)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v5 1/2 pinctrl: qcom: spmi-gpio: correct parent irqspec translation
From: David Collins <[email protected]>
pmic_gpio_child_to_parent_hwirq() and gpiochip_populate_parent_fwspec_fourcell() translate a pinctrl- spmi-gpio irqspec to an SPMI controller irqspec. When they do this, they use a fixed SPMI slave ID of 0 and a fixed GPIO peripheral offset of 0xC0 (corresponding to SPMI address 0xC000). This translation results in an incorrect irqspec for secondary PMICs that don't have a slave ID of 0 as well as for PMIC chips which have GPIO peripherals located at a base address other than 0xC000.
Correct this issue by passing the slave ID of the pinctrl-spmi- gpio device's parent in the SPMI controller irqspec and by calculating the peripheral ID base from the device tree 'reg' property of the pinctrl-spmi-gpio device.
---
Changes in V2:
- Added a fixes tag.
Changes in V3:
- Removed "fwspec->param[2] = 0" from pmic_gpio_populate_parent_fwspec, as it is already set to zero, and must be left that way.
Changes in V4:
- No changes.
Changes in V5:
- No changes.
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 37 +++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-)
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +34 -3
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. +* Copyright (c) 2012-2014, 2016-2021 The Linux Foundation. All rights reserved. */ #include <linux/gpio/driver.h>
@@ -14,6 +14,7 @@#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/slab.h> +#include <linux/spmi.h> #include <linux/types.h> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
@@ -171,6 +172,8 @@ struct pmic_gpio_state {struct pinctrl_dev *ctrl;struct gpio_chip chip;struct irq_chip irq; +u8 usid; +u8 pid_base; };static const struct pinconf_generic_params pmic_gpio_bindings[] = {
@@ -949,12 +952,36 @@ static int pmic_gpio_child_to_parent_hwirq(struct gpio_chip *chip,unsigned int *parent_hwirq, unsigned int *parent_type) { - *parent_hwirq = child_hwirq +0xc0 ; + struct pmic_gpio_state *state = gpiochip_get_data(chip); + + *parent_hwirq = child_hwirq + state->pid_base; *parent_type = child_type;return 0 ; } +static void *pmic_gpio_populate_parent_fwspec (struct gpio_chip *chip, +unsigned int parent_hwirq, +unsigned int parent_type) +{ +struct pmic_gpio_state *state =gpiochip_get_data (chip); +struct irq_fwspec *fwspec; + + fwspec =kzalloc (sizeof (*fwspec),GFP_KERNEL ); +if (!fwspec) +return NULL ; + + fwspec->fwnode = chip->irq.parent_domain->fwnode; + + fwspec->param_count =4 ; + fwspec->param[0 ] = state->usid; + fwspec->param[1 ] = parent_hwirq; +/* param[2] must be left as 0 */ + fwspec->param[3 ] = parent_type; + +return fwspec; +} +static int pmic_gpio_probe (struct platform_device *pdev) {struct irq_domain *parent_domain;
@@ -965,6 +992,7 @@ static int pmic_gpio_probe(struct platform_device *pdev)struct pmic_gpio_pad *pad, *pads;struct pmic_gpio_state *state;struct gpio_irq_chip *girq; +const struct spmi_device *parent_spmi_dev;int ret, npins, i;u32 reg;
@@ -984,6 +1012,9 @@ static int pmic_gpio_probe(struct platform_device *pdev) state->dev = &pdev->dev; state->map =dev_get_regmap (dev->parent,NULL ); + parent_spmi_dev =to_spmi_device (dev->parent); + state->usid = parent_spmi_dev->usid; + state->pid_base = reg >>8 ; pindesc =devm_kcalloc (dev, npins,sizeof (*pindesc),GFP_KERNEL );if (!pindesc)
@@ -1059,7 +1090,7 @@ static int pmic_gpio_probe(struct platform_device *pdev) girq->fwnode =of_node_to_fwnode (state->dev->of_node); girq->parent_domain = parent_domain; girq->child_to_parent_hwirq = pmic_gpio_child_to_parent_hwirq; - girq->populate_parent_alloc_arg = gpiochip_populate_parent_fwspec_fourcell; + girq->populate_parent_alloc_arg = pmic_gpio_populate_parent_fwspec; girq->child_offset_to_irq = pmic_gpio_child_offset_to_irq; girq->child_irq_domain_ops.translate = pmic_gpio_domain_translate;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH V5 1/2] pinctrl: qcom: spmi-gpio: correct parent irqspec translation
Quoted 17 lines · Satya Priya
From: David Collins <[email protected]>
pmic_gpio_child_to_parent_hwirq()andgpiochip_populate_parent_fwspec_fourcell()translate a pinctrl- spmi-gpio irqspec to an SPMI controller irqspec. When they do this, they use a fixed SPMI slave ID of 0 and a fixed GPIO peripheral offset of0xC0(corresponding to SPMI address0xC000). This translation results in an incorrect irqspec for secondary PMICs that don't have a slave ID of 0 as well as for PMIC chips which have GPIO peripherals located at a base address other than0xC000.Correct this issue by passing the slave ID of the pinctrl-spmi- gpio device's parent in the SPMI controller irqspec and by calculating the peripheral ID base from the device tree 'reg' property of the pinctrl-spmi-gpio device.
Quoted 4 lines
Signed-off-by David Collins <[email protected]>Signed-off-by satya priya <[email protected]>Fixes ca69e2d165eb ("qcom: spmi-gpio: add support for hierarchical IRQ chip")Reviewed-by Stephen Boyd <[email protected]>
Patch applied for fixes.
Is a similar patch needed fordrivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
?
Notice ssbi rather than sbmi...
Yours,
Linus Walleij
PATCH v5 2/2 arm64: dts: sc7280: Add volume up support for sc7280-idp
In reply to Satya PriyaFrom: satya priya <[email protected]>
Add pm7325 PMIC gpio support for vol+ on sc7280-idp.
---
Changes in V2:
- No changes.
Changes in V3:
- Sorted the nodes alphabetically.
Changes in V4:
- Updated the node names to replace underscores with hipens
Changes in V5:
- Moved the gpio-keys node under root node.
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +31 -0
@@ -12,6 +12,26 @@ #include "pm8350c.dtsi" #include "pmk8350.dtsi" +/ { + gpio-keys { + compatible = "gpio-keys"; + label = "gpio-keys"; + + pinctrl-names = "default"; + pinctrl-0 = <&key_vol_up_default>; + + volume-up { + label = "volume_up"; + gpios = <&pm7325_gpios 6 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = <KEY_VOLUMEUP>; + gpio-key,wakeup; + debounce-interval = <15>; + linux,can-disable; + }; + }; +}; + &apps_rsc { pm7325-regulators { compatible = "qcom,pm7325-rpmh-regulators";
@@ -284,6 +304,17 @@ /* PINCTRL - additions to nodes defined in sc7280.dtsi */ +&pm7325_gpios { + key_vol_up_default: key-vol-up-default { + pins = "gpio6"; + function = "normal"; + input-enable; + bias-pull-up; + power-source = <0>; + qcom,drive-strength = <3>; + }; +}; + &qup_uart5_default { tx { pins = "gpio46";
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH V5 2/2] arm64: dts: sc7280: Add volume up support for sc7280-idp
Quoting Satya Priya (2021-09-16 06:21:38)
Quoted 11 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +3
-0@@ -12,6 +12,26 @@ #include "pm8350c.dtsi" #include "pmk8350.dtsi" +/ { + gpio-keys { + compatible = "gpio-keys";
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi line 27
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +10
-0+ label = "gpio-keys"; + + pinctrl-names = "default"; + pinctrl-0 = <&key_vol_up_default>; + + volume-up { + label = "volume_up"; + gpios = <&pm7325_gpios 6 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = <KEY_VOLUMEUP>;
Is there an include for this define? Looks like <dt-bindings/input/input.h> should be added as well? Did you try compiling?
Quoted 32 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +18
-1+ gpio-key,wakeup; + debounce-interval = <15>; + linux,can-disable; + }; + }; +}; + &apps_rsc { pm7325-regulators { compatible = "qcom,pm7325-rpmh-regulators";@@ -284,6 +304,17 @@ /* PINCTRL - additions to nodes defined in sc7280.dtsi */ +&pm7325_gpios { + key_vol_up_default: key-vol-up-default { + pins = "gpio6"; + function = "normal"; + input-enable; + bias-pull-up; + power-source = <0>; + qcom,drive-strength = <3>; + }; +}; + &qup_uart5_default { tx { pins = "gpio46"; --QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH V5 2/2] arm64: dts: sc7280: Add volume up support for sc7280-idp
Quoted 18 lines · Stephen Boyd
Quoting Satya Priya (2021-09-16 06:21:38)
Quoted 17 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +9
-0@@ -12,6 +12,26 @@ #include "pm8350c.dtsi" #include "pmk8350.dtsi" +/ { + gpio-keys { + compatible = "gpio-keys"; + label = "gpio-keys"; + + pinctrl-names = "default"; + pinctrl-0 = <&key_vol_up_default>; + + volume-up {
Quoted 9 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi line 27
Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +4
-0+ label = "volume_up"; + gpios = <&pm7325_gpios 6 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = <KEY_VOLUMEUP>;Is there an include for this define? Looks like <
dt-bindings/input/input.h> should be added as well? Did you try compiling?
Yeah, it needs <dt-bindings/input/linux-event-codes.h> to be included. This header was included in pmk8350.dtsi which is added in this file.
Quoted 32 lines
Quoted 32 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +18
-1+ gpio-key,wakeup; + debounce-interval = <15>; + linux,can-disable; + }; + }; +}; + &apps_rsc { pm7325-regulators { compatible = "qcom,pm7325-rpmh-regulators";@@ -284,6 +304,17 @@ /* PINCTRL - additions to nodes defined in sc7280.dtsi */ +&pm7325_gpios { + key_vol_up_default: key-vol-up-default { + pins = "gpio6"; + function = "normal"; + input-enable; + bias-pull-up; + power-source = <0>; + qcom,drive-strength = <3>; + }; +}; + &qup_uart5_default { tx { pins = "gpio46"; --QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Stephen Boyd
Reviewed-byRe: [PATCH V5 2/2] arm64: dts: sc7280: Add volume up support for sc7280-idp
Quoting [email protected] (2021-09-16 21:08:11)
Quoted 30 lines · Stephen Boyd
Quoted 19 lines
Quoting Satya Priya (2021-09-16 06:21:38)
Quoted 18 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +9
-0@@ -12,6 +12,26 @@ #include "pm8350c.dtsi" #include "pmk8350.dtsi" +/ { + gpio-keys { + compatible = "gpio-keys"; + label = "gpio-keys"; + + pinctrl-names = "default"; + pinctrl-0 = <&key_vol_up_default>; + + volume-up {Quoted 9 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi line 27
Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +4
-0+ label = "volume_up"; + gpios = <&pm7325_gpios 6 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = <KEY_VOLUMEUP>;Is there an include for this define? Looks like <
dt-bindings/input/input.h> should be added as well? Did you try compiling?
Quoted 2 lines
Yeah, it needs <
dt-bindings/input/linux-event-codes.h> to be included. This header was included inpmk8350.dtsiwhich is added in this file.
Alright, got it. If you can include this header in this dts file it would be better so we don't rely on implicit includes from other files to get macros. With that change you can add my