pinctrl: single: Add DRA7 pinctrl compatibility
authorNishanth Menon <nm@ti.com>
Fri, 22 Aug 2014 14:01:01 +0000 (09:01 -0500)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 29 Aug 2014 07:27:44 +0000 (09:27 +0200)
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@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt
drivers/pinctrl/pinctrl-single.c

index b3b57fc5b73c10c39665d4e2995282894492d993..b7a9831e185e3764b0b5ef1e53d36d79e9acbf20 100644 (file)
@@ -7,5 +7,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.
index 95dd9cf55cb36ab2d5af88b21a437b89adba8656..598d600ac7e498061f5b2122f1fac3b80d14a2af 100644 (file)
@@ -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 },
        { },