* Nishanth Menon <nm@xxxxxx> [140822 07:03]:
> DRA7 pinctrl definitions now differ from traditional 16 bit OMAP pin
> ctrl definitions, in that all 32 bits are used to describe a single pin
>
> Also the location of wakeupenable and event bits have changed.
>
> Signed-off-by: Nishanth Menon <nm@xxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
> .../bindings/pinctrl/ti,omap-pinctrl.txt | 1 +
> drivers/pinctrl/pinctrl-single.c | 7 +++++++
> 2 files changed, 8 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt
> index 156d964..d45386d 100644
> --- a/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt
> @@ -5,5 +5,6 @@ Required properties:
> "ti,omap3-padconf" - OMAP3 compatible pinctrl
> "ti,omap4-padconf" - OMAP4 compatible pinctrl
> "ti,omap5-padconf" - OMAP5 compatible pinctrl
> + "ti,dra7-padconf" - DRA7 compatible pinctrl
>
> See Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt for further details.
> diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
> index 95dd9cf..598d600 100644
> --- a/drivers/pinctrl/pinctrl-single.c
> +++ b/drivers/pinctrl/pinctrl-single.c
> @@ -1981,6 +1981,12 @@ static const struct pcs_soc_data pinctrl_single_omap_wkup = {
> .irq_status_mask = (1 << 15), /* OMAP_WAKEUP_EVENT */
> };
>
> +static const struct pcs_soc_data pinctrl_single_dra7 = {
> + .flags = PCS_QUIRK_SHARED_IRQ,
> + .irq_enable_mask = (1 << 24), /* WAKEUPENABLE */
> + .irq_status_mask = (1 << 25), /* WAKEUPEVENT */
> +};
> +
> static const struct pcs_soc_data pinctrl_single = {
> };
>
> @@ -1992,6 +1998,7 @@ static struct of_device_id pcs_of_match[] = {
> { .compatible = "ti,omap3-padconf", .data = &pinctrl_single_omap_wkup },
> { .compatible = "ti,omap4-padconf", .data = &pinctrl_single_omap_wkup },
> { .compatible = "ti,omap5-padconf", .data = &pinctrl_single_omap_wkup },
> + { .compatible = "ti,dra7-padconf", .data = &pinctrl_single_dra7 },
> { .compatible = "pinctrl-single", .data = &pinctrl_single },
> { .compatible = "pinconf-single", .data = &pinconf_single },
> { },
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
