From 007ee27190fda35997310009db5f335b413d2843 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 24 Feb 2012 06:53:04 +0100 Subject: [PATCH] --- yaml --- r: 294082 b: refs/heads/master c: 1cf94c45ca31c0ad563e72b095782346cba26b6c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinmux.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cc646829908f..3438ad96e168 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2304b4737f492b6ee9b714d8129e153af0bef989 +refs/heads/master: 1cf94c45ca31c0ad563e72b095782346cba26b6c diff --git a/trunk/drivers/pinctrl/pinmux.c b/trunk/drivers/pinctrl/pinmux.c index 98b89d6cffb0..2a405618b448 100644 --- a/trunk/drivers/pinctrl/pinmux.c +++ b/trunk/drivers/pinctrl/pinmux.c @@ -626,8 +626,8 @@ static int pinmux_pins_show(struct seq_file *s, void *what) /* The pin number can be retrived from the pin controller descriptor */ for (i = 0; i < pctldev->desc->npins; i++) { - struct pin_desc *desc; + bool is_hog = false; pin = pctldev->desc->pins[i].number; desc = pin_desc_get(pctldev, pin); @@ -635,9 +635,14 @@ static int pinmux_pins_show(struct seq_file *s, void *what) if (desc == NULL) continue; - seq_printf(s, "pin %d (%s): %s\n", pin, + if (desc->owner && + !strcmp(desc->owner, pinctrl_dev_get_name(pctldev))) + is_hog = true; + + seq_printf(s, "pin %d (%s): %s%s\n", pin, desc->name ? desc->name : "unnamed", - desc->owner ? desc->owner : "UNCLAIMED"); + desc->owner ? desc->owner : "UNCLAIMED", + is_hog ? " (HOG)" : ""); } return 0;