diff options
-rw-r--r-- | Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt | 1 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-single.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt index b7a9831e185e..88c80273da91 100644 --- a/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt | |||
@@ -8,5 +8,6 @@ Required properties: | |||
8 | "ti,omap4-padconf" - OMAP4 compatible pinctrl | 8 | "ti,omap4-padconf" - OMAP4 compatible pinctrl |
9 | "ti,omap5-padconf" - OMAP5 compatible pinctrl | 9 | "ti,omap5-padconf" - OMAP5 compatible pinctrl |
10 | "ti,dra7-padconf" - DRA7 compatible pinctrl | 10 | "ti,dra7-padconf" - DRA7 compatible pinctrl |
11 | "ti,am437-padconf" - AM437x compatible pinctrl | ||
11 | 12 | ||
12 | See Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt for further details. | 13 | 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 598d600ac7e4..784de13facf3 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c | |||
@@ -1987,6 +1987,12 @@ static const struct pcs_soc_data pinctrl_single_dra7 = { | |||
1987 | .irq_status_mask = (1 << 25), /* WAKEUPEVENT */ | 1987 | .irq_status_mask = (1 << 25), /* WAKEUPEVENT */ |
1988 | }; | 1988 | }; |
1989 | 1989 | ||
1990 | static const struct pcs_soc_data pinctrl_single_am437x = { | ||
1991 | .flags = PCS_QUIRK_SHARED_IRQ, | ||
1992 | .irq_enable_mask = (1 << 29), /* OMAP_WAKEUP_EN */ | ||
1993 | .irq_status_mask = (1 << 30), /* OMAP_WAKEUP_EVENT */ | ||
1994 | }; | ||
1995 | |||
1990 | static const struct pcs_soc_data pinctrl_single = { | 1996 | static const struct pcs_soc_data pinctrl_single = { |
1991 | }; | 1997 | }; |
1992 | 1998 | ||
@@ -1999,6 +2005,7 @@ static struct of_device_id pcs_of_match[] = { | |||
1999 | { .compatible = "ti,omap4-padconf", .data = &pinctrl_single_omap_wkup }, | 2005 | { .compatible = "ti,omap4-padconf", .data = &pinctrl_single_omap_wkup }, |
2000 | { .compatible = "ti,omap5-padconf", .data = &pinctrl_single_omap_wkup }, | 2006 | { .compatible = "ti,omap5-padconf", .data = &pinctrl_single_omap_wkup }, |
2001 | { .compatible = "ti,dra7-padconf", .data = &pinctrl_single_dra7 }, | 2007 | { .compatible = "ti,dra7-padconf", .data = &pinctrl_single_dra7 }, |
2008 | { .compatible = "ti,am437-padconf", .data = &pinctrl_single_am437x }, | ||
2002 | { .compatible = "pinctrl-single", .data = &pinctrl_single }, | 2009 | { .compatible = "pinctrl-single", .data = &pinctrl_single }, |
2003 | { .compatible = "pinconf-single", .data = &pinconf_single }, | 2010 | { .compatible = "pinconf-single", .data = &pinconf_single }, |
2004 | { }, | 2011 | { }, |