From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v4 2/9] pinctrl: single: support gpio request and free
Date: Wed, 7 Nov 2012 14:27:39 -0800 [thread overview]
Message-ID: <20121107222738.GR6801@atomide.com> (raw)
In-Reply-To: <1352301582-12244-3-git-send-email-haojian.zhuang@gmail.com>
* Haojian Zhuang <haojian.zhuang@gmail•com> [121107 07:21]:
> Marvell's PXA/MMP silicon also match the behavior of pinctrl-single.
> Each pin binds to one register. A lot of pins could be configured
> as gpio.
>
> Now add these properties in below.
> <gpio range phandle>:
> include "pinctrl-single,gpio" & "pinctrl,gpio-func" properties.
>
> pinctrl-single,gpio: <gpio base, npins in range, register offset>
>
> pinctrl-single,gpio-func: <gpio function value in mux>
>
> pinctrl-single,gpio-ranges: phandle list of gpio range array
This one looks OK to me now:
Acked-by: Tony Lindgren <tony@atomide•com>
> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail•com>
> ---
> drivers/pinctrl/pinctrl-single.c | 100 +++++++++++++++++++++++++++++++++++++-
> 1 file changed, 98 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
> index 726a729..a7c5fdd 100644
> --- a/drivers/pinctrl/pinctrl-single.c
> +++ b/drivers/pinctrl/pinctrl-single.c
> @@ -30,6 +30,7 @@
> #define PCS_MUX_BITS_NAME "pinctrl-single,bits"
> #define PCS_REG_NAME_LEN ((sizeof(unsigned long) * 2) + 1)
> #define PCS_OFF_DISABLED ~0U
> +#define PCS_MAX_GPIO_VALUES 3
>
> /**
> * struct pcs_pingroup - pingroups for a function
> @@ -77,6 +78,18 @@ struct pcs_function {
> };
>
> /**
> + * struct pcs_gpio_range - pinctrl gpio range
> + * @range: subrange of the GPIO number space
> + * @gpio_func: gpio function value in the pinmux register
> + * @func_en: need to handle gpio function in the pinmux register
> + */
> +struct pcs_gpio_range {
> + struct pinctrl_gpio_range range;
> + int gpio_func;
> + unsigned func_en:1;
> +};
> +
> +/**
> * struct pcs_data - wrapper for data needed by pinctrl framework
> * @pa: pindesc array
> * @cur: index to current element
> @@ -123,8 +136,10 @@ struct pcs_name {
> * @ftree: function index radix tree
> * @pingroups: list of pingroups
> * @functions: list of functions
> + * @ranges: list of gpio ranges
> * @ngroups: number of pingroups
> * @nfuncs: number of functions
> + * @nranges: number of gpio ranges
> * @desc: pin controller descriptor
> * @read: register read function to use
> * @write: register write function to use
> @@ -148,8 +163,10 @@ struct pcs_device {
> struct radix_tree_root ftree;
> struct list_head pingroups;
> struct list_head functions;
> + struct list_head ranges;
> unsigned ngroups;
> unsigned nfuncs;
> + unsigned nranges;
> struct pinctrl_desc desc;
> unsigned (*read)(void __iomem *reg);
> void (*write)(unsigned val, void __iomem *reg);
> @@ -403,9 +420,27 @@ static void pcs_disable(struct pinctrl_dev *pctldev, unsigned fselector,
> }
>
> static int pcs_request_gpio(struct pinctrl_dev *pctldev,
> - struct pinctrl_gpio_range *range, unsigned offset)
> + struct pinctrl_gpio_range *range, unsigned pin)
> {
> - return -ENOTSUPP;
> + struct pcs_device *pcs = pinctrl_dev_get_drvdata(pctldev);
> + struct pcs_gpio_range *gpio = NULL;
> + int end, mux_bytes;
> + unsigned data;
> +
> + gpio = container_of(range, struct pcs_gpio_range, range);
> + if (!gpio->func_en)
> + return -ENOTSUPP;
> + end = range->pin_base + range->npins - 1;
> + if (pin < range->pin_base || pin > end) {
> + dev_err(pctldev->dev, "pin %d isn't in the range of "
> + "%d to %d\n", pin, range->pin_base, end);
> + return -EINVAL;
> + }
> + mux_bytes = pcs->width / BITS_PER_BYTE;
> + data = pcs->read(pcs->base + pin * mux_bytes) & ~pcs->fmask;
> + data |= gpio->gpio_func;
> + pcs->write(data, pcs->base + pin * mux_bytes);
> + return 0;
> }
>
> static struct pinmux_ops pcs_pinmux_ops = {
> @@ -879,6 +914,62 @@ static void pcs_free_resources(struct pcs_device *pcs)
>
> static struct of_device_id pcs_of_match[];
>
> +static int __devinit pcs_add_gpio_range(struct device_node *node,
> + struct pcs_device *pcs)
> +{
> + struct pcs_gpio_range *gpio;
> + struct device_node *np;
> + const __be32 *list;
> + const char list_name[] = "pinctrl-single,gpio-ranges";
> + const char name[] = "pinctrl-single";
> + u32 gpiores[PCS_MAX_GPIO_VALUES];
> + int ret, size, i, mux_bytes = 0;
> +
> + list = of_get_property(node, list_name, &size);
> + if (!list)
> + return 0;
> + size = size / sizeof(*list);
> + for (i = 0; i < size; i++) {
> + np = of_parse_phandle(node, list_name, i);
> + memset(gpiores, 0, sizeof(u32) * PCS_MAX_GPIO_VALUES);
> + ret = of_property_read_u32_array(np, "pinctrl-single,gpio",
> + gpiores, PCS_MAX_GPIO_VALUES);
> + if (ret < 0)
> + return -ENOENT;
> + gpio = devm_kzalloc(pcs->dev, sizeof(*gpio), GFP_KERNEL);
> + if (!gpio) {
> + dev_err(pcs->dev, "failed to allocate pcs gpio\n");
> + return -ENOMEM;
> + }
> + gpio->range.id = i;
> + gpio->range.base = gpiores[0];
> + gpio->range.npins = gpiores[1];
> + gpio->range.name = devm_kzalloc(pcs->dev, sizeof(name),
> + GFP_KERNEL);
> + if (!gpio->range.name) {
> + dev_err(pcs->dev, "failed to allocate range name\n");
> + return -ENOMEM;
> + }
> + memcpy(&gpio->range.name, name, sizeof(name));
> + mux_bytes = pcs->width / BITS_PER_BYTE;
> + gpio->range.pin_base = gpiores[2] / mux_bytes;
> + memset(gpiores, 0, sizeof(u32) * PCS_MAX_GPIO_VALUES);
> + ret = of_property_read_u32(np, "pinctrl-single,gpio-func",
> + &gpio->gpio_func);
> + if (ret < 0)
> + return -ENOENT;
> + gpio->func_en = 1;
> +
> + mutex_lock(&pcs->mutex);
> + list_add_tail(&gpio->range.node, &pcs->ranges);
> + pcs->nranges++;
> + mutex_unlock(&pcs->mutex);
> +
> + pinctrl_add_gpio_range(pcs->pctl, &gpio->range);
> + }
> + return 0;
> +}
> +
> static int __devinit pcs_probe(struct platform_device *pdev)
> {
> struct device_node *np = pdev->dev.of_node;
> @@ -900,6 +991,7 @@ static int __devinit pcs_probe(struct platform_device *pdev)
> mutex_init(&pcs->mutex);
> INIT_LIST_HEAD(&pcs->pingroups);
> INIT_LIST_HEAD(&pcs->functions);
> + INIT_LIST_HEAD(&pcs->ranges);
>
> PCS_GET_PROP_U32("pinctrl-single,register-width", &pcs->width,
> "register width not specified\n");
> @@ -975,6 +1067,10 @@ static int __devinit pcs_probe(struct platform_device *pdev)
> goto free;
> }
>
> + ret = pcs_add_gpio_range(np, pcs);
> + if (ret < 0)
> + goto free;
> +
> dev_info(pcs->dev, "%i pins at pa %p size %u\n",
> pcs->desc.npins, pcs->base, pcs->size);
>
> --
> 1.7.10.4
>
next prev parent reply other threads:[~2012-11-07 22:27 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-07 15:19 [PATCH v4 0/9] use pinctrl-single in arch mmp Haojian Zhuang
2012-11-07 15:19 ` [PATCH v4 1/9] ARM: mmp: select pinctrl driver Haojian Zhuang
2012-11-08 1:38 ` Tony Lindgren
2012-11-10 14:53 ` Haojian Zhuang
2012-11-13 13:37 ` Linus Walleij
2012-11-07 15:19 ` [PATCH v4 2/9] pinctrl: single: support gpio request and free Haojian Zhuang
2012-11-07 22:27 ` Tony Lindgren [this message]
2012-11-13 13:07 ` Linus Walleij
2012-11-13 17:34 ` Tony Lindgren
2012-11-14 1:44 ` Haojian Zhuang
2012-11-07 15:19 ` [PATCH v4 3/9] pinctrl: single: support pinconf generic Haojian Zhuang
2012-11-08 0:25 ` Tony Lindgren
2012-11-08 22:55 ` Tony Lindgren
2012-11-08 23:13 ` Tony Lindgren
2012-11-09 21:53 ` Tony Lindgren
2012-11-07 15:19 ` [PATCH v4 4/9] ARM: dts: support pinctrl single in pxa910 Haojian Zhuang
2012-11-09 22:48 ` Tony Lindgren
2012-11-10 5:37 ` Haojian Zhuang
2012-11-10 20:04 ` Tony Lindgren
2012-11-07 15:19 ` [PATCH v4 5/9] document: devicetree: bind pinconf with pin-single Haojian Zhuang
2012-11-08 1:37 ` Tony Lindgren
2012-11-12 20:37 ` Stephen Warren
2012-11-15 8:27 ` Haojian Zhuang
2012-11-15 8:30 ` Haojian Zhuang
2012-11-07 15:19 ` [PATCH v4 6/9] tty: pxa: configure pin Haojian Zhuang
2012-11-07 15:19 ` [PATCH v4 7/9] i2c: pxa: use devm_kzalloc Haojian Zhuang
2012-11-07 15:19 ` [PATCH v4 8/9] i2c: pxa: configure pinmux Haojian Zhuang
2012-11-07 15:19 ` [PATCH v4 9/9] pinctrl: single: dump pinmux register value Haojian Zhuang
2012-11-08 1:25 ` Tony Lindgren
2012-11-13 13:08 ` Linus Walleij
2012-11-13 17:34 ` Tony Lindgren
2012-11-14 1:45 ` Haojian Zhuang
2012-11-15 14:11 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121107222738.GR6801@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox