Skip to contentSkip to conversation

pinctrl: qcom: qdf2xxx: add names to the gpios

PATCH New Timur Tabi 3 participants 4 messages Mar 6, 2017 – Mar 16, 2017

Subsystems (5)
lore
Share & tools
lore

Timur Tabi

author
#0 lore raw

PATCH 1/1 pinctrl: qcom: qdf2xxx: add names to the gpios

The sysfs and debugfs entries for pin control drivers work better when the individual pins are given real names, even if they are all just "gpio0", "gpio1", etc.

---
 drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/pinctrl/qcom/pinctrl-qdf2xxx.c +12 -2
index f448534..bb3ce5c 100644
@@ -35,10 +35,14 @@
 /* A reasonable limit to the number of GPIOS */
 #define MAX_GPIOS	256
 
+/* maximum size of each gpio name (enough room for "gpioXXX" + null) */
+#define NAME_SIZE	8
+
 static int qdf2xxx_pinctrl_probe(struct platform_device *pdev)
 {
 	struct pinctrl_pin_desc *pins;
 	struct msm_pingroup *groups;
+	char (*names)[NAME_SIZE];
 	unsigned int i;
 	u32 num_gpios;
 	int ret;
@@ -59,15 +63,21 @@ static int qdf2xxx_pinctrl_probe(struct platform_device *pdev)
 		sizeof(struct pinctrl_pin_desc), GFP_KERNEL);
 	groups = devm_kcalloc(&pdev->dev, num_gpios,
 		sizeof(struct msm_pingroup), GFP_KERNEL);
+	names = devm_kcalloc(&pdev->dev, num_gpios, NAME_SIZE, GFP_KERNEL);
 
-	if (!pins || !groups)
+	if (!pins || !groups || !names)
 		return -ENOMEM;
 
 	for (i = 0; i < num_gpios; i++) {
+		snprintf(names[i], NAME_SIZE, "gpio%u", i);
+
 		pins[i].number = i;
+		pins[i].name = names[i];
 
-		groups[i].npins = 1,
+		groups[i].npins = 1;
+		groups[i].name = names[i];
 		groups[i].pins = &pins[i].number;
+
 		groups[i].ctl_reg = 0x10000 * i;
 		groups[i].io_reg = 0x04 + 0x10000 * i;
 		groups[i].intr_cfg_reg = 0x08 + 0x10000 * i;
Signature · 3 lines
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc.  Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
#1 lore raw

PATCH 1/1 pinctrl: qcom: qdf2xxx: add names to the gpios

Quoted 5 lines · Timur Tabi

The sysfs and debugfs entries for pin control drivers work better when the individual pins are given real names, even if they are all just "gpio0", "gpio1", etc.

Patch tentatively applied (looks right to me), unless Bj?rn has concerns.

Is this a problem in other qcom pinctrl drivers?

Yours,
Linus Walleij

author
#2 lore raw

PATCH 1/1 pinctrl: qcom: qdf2xxx: add names to the gpios

Quoted 3 lines · Linus Walleij

Patch tentatively applied (looks right to me), unless Bj?rn has concerns.

Is this a problem in other qcom pinctrl drivers?

Not any of the ones that use pinctrl-msm, because they all use the static arrays, whereas my driver (because it's for ACPI), creates a dynamic array.

Signature · 3 lines
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the
Code Aurora Forum, hosted by The Linux Foundation.
#3 lore raw

PATCH 1/1 pinctrl: qcom: qdf2xxx: add names to the gpios

In reply to Timur Tabi
Quoted 4 lines · Timur Tabi

The sysfs and debugfs entries for pin control drivers work better when the individual pins are given real names, even if they are all just "gpio0", "gpio1", etc.

Yeah, you do want "name" for those to play nice.

Regards,
Bjorn