> From: Vipul Kumar Samar <vipulkumar.sa...@st.com>
>
> This patch allows the STMPE GPIO driver to be successfully probed and
> initialised when Device Tree support is enabled. Bindings are mentioned in
> Documentation too.
>
> Signed-off-by: Vipul Kumar Samar <vipulkumar.sa...@st.com>
> Signed-off-by: Viresh Kumar <viresh.ku...@linaro.org>
> ---
> V1->Resend:
> ----------
> - Don't move asignment of stmpe_gpio->chip.base to if (pdata) block.
>
> Documentation/devicetree/bindings/gpio/gpio-stmpe.txt | 18 ++++++++++++++++++
> drivers/gpio/gpio-stmpe.c | 10 ++++++++--
> drivers/mfd/stmpe.c | 2 ++
> 3 files changed, 28 insertions(+), 2 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/gpio/gpio-stmpe.txt
>
> diff --git a/Documentation/devicetree/bindings/gpio/gpio-stmpe.txt
> b/Documentation/devicetree/bindings/gpio/gpio-stmpe.txt
> new file mode 100644
> index 0000000..7f010e0
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/gpio/gpio-stmpe.txt
> @@ -0,0 +1,18 @@
> +STMPE gpio
> +----------
> +
> +Required properties:
> + - compatible: "st,stmpe-gpio"
> +
> +Optional properties:
> + - norequest-mask: bitmask specifying which GPIOs should _not_ be requestable
You have 'norequest-mask' here and 'st,norequest-mask' in the example.
> + due to different usage (e.g. touch, keypad)
> +
> +Node name must be stmpe_gpio and should be child node of stmpe node to which
> it
> +belongs.
> +
> +Example:
> + stmpe_gpio {
> + compatible = "st,stmpe-gpio";
> + st,norequest-mask = <0x20>; //gpio 5 can't be used
> + };
> diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c
> index dce3472..522c90e 100644
> --- a/drivers/gpio/gpio-stmpe.c
> +++ b/drivers/gpio/gpio-stmpe.c
> @@ -12,6 +12,7 @@
> #include <linux/gpio.h>
> #include <linux/irq.h>
> #include <linux/interrupt.h>
> +#include <linux/of.h>
> #include <linux/mfd/stmpe.h>
>
> /*
> @@ -304,6 +305,7 @@ static void stmpe_gpio_irq_remove(struct stmpe_gpio
> *stmpe_gpio)
> static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
> {
> struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
> + struct device_node *np = pdev->dev.of_node;
> struct stmpe_gpio_platform_data *pdata;
> struct stmpe_gpio *stmpe_gpio;
> int ret;
> @@ -321,13 +323,17 @@ static int __devinit stmpe_gpio_probe(struct
> platform_device *pdev)
>
> stmpe_gpio->dev = &pdev->dev;
> stmpe_gpio->stmpe = stmpe;
> - stmpe_gpio->norequest_mask = pdata ? pdata->norequest_mask : 0;
> -
> stmpe_gpio->chip = template_chip;
> stmpe_gpio->chip.ngpio = stmpe->num_gpios;
> stmpe_gpio->chip.dev = &pdev->dev;
> stmpe_gpio->chip.base = pdata ? pdata->gpio_base : -1;
>
> + if (pdata)
> + stmpe_gpio->norequest_mask = pdata->norequest_mask;
> + else if (np)
> + of_property_read_u32(np, "st,norequest-mask",
> + &stmpe_gpio->norequest_mask);
> +
> if (irq >= 0)
> stmpe_gpio->irq_base = stmpe->irq_base + STMPE_INT_GPIO(0);
> else
> diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
> index fd64efc..3e3ca9c 100644
> --- a/drivers/mfd/stmpe.c
> +++ b/drivers/mfd/stmpe.c
> @@ -298,12 +298,14 @@ static struct resource stmpe_gpio_resources[] = {
>
> static struct mfd_cell stmpe_gpio_cell = {
> .name = "stmpe-gpio",
> + .of_compatible = "st,stmpe-gpio",
> .resources = stmpe_gpio_resources,
> .num_resources = ARRAY_SIZE(stmpe_gpio_resources),
> };
>
> static struct mfd_cell stmpe_gpio_cell_noirq = {
> .name = "stmpe-gpio",
> + .of_compatible = "st,stmpe-gpio",
> /* gpio cell resources consist of an irq only so no resources here */
> };
>
> --
> 1.7.12.rc2.18.g61b472e
If 'st,norequest-mask' is truly required to be in the DT (I don't
really understand it well enough to comment), and you fix up the
inconsistency in the Documentation, you can apply my:
Acked-by: Lee Jones <lee.jo...@linaro.org>
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
