aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2013-12-18 02:10:29 -0500
committerLinus Walleij <linus.walleij@linaro.org>2014-01-07 12:58:19 -0500
commita1a2bdec4772228274dfb3f9a41ac5234b93a5e9 (patch)
treec9f6fb14e8b8e712db7354f539b74d52aa63ccce
parentffd4bf1a9e8a88c4b2a47007b1a9e69be28599fe (diff)
gpio: xtensa: depend on HAVE_XTENSA_GPIO32
Prevent build failure when the selected variant does not support GPIO32. Acked-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/xtensa/Kconfig6
-rw-r--r--drivers/gpio/Kconfig1
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 8d24dcb7cdac..f8df0cc70cb6 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -64,6 +64,9 @@ config MMU
64config VARIANT_IRQ_SWITCH 64config VARIANT_IRQ_SWITCH
65 def_bool n 65 def_bool n
66 66
67config HAVE_XTENSA_GPIO32
68 def_bool n
69
67menu "Processor type and features" 70menu "Processor type and features"
68 71
69choice 72choice
@@ -73,16 +76,19 @@ choice
73config XTENSA_VARIANT_FSF 76config XTENSA_VARIANT_FSF
74 bool "fsf - default (not generic) configuration" 77 bool "fsf - default (not generic) configuration"
75 select MMU 78 select MMU
79 select HAVE_XTENSA_GPIO32
76 80
77config XTENSA_VARIANT_DC232B 81config XTENSA_VARIANT_DC232B
78 bool "dc232b - Diamond 232L Standard Core Rev.B (LE)" 82 bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"
79 select MMU 83 select MMU
84 select HAVE_XTENSA_GPIO32
80 help 85 help
81 This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE). 86 This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE).
82 87
83config XTENSA_VARIANT_DC233C 88config XTENSA_VARIANT_DC233C
84 bool "dc233c - Diamond 233L Standard Core Rev.C (LE)" 89 bool "dc233c - Diamond 233L Standard Core Rev.C (LE)"
85 select MMU 90 select MMU
91 select HAVE_XTENSA_GPIO32
86 help 92 help
87 This variant refers to Tensilica's Diamond 233L Standard core Rev.C (LE). 93 This variant refers to Tensilica's Diamond 233L Standard core Rev.C (LE).
88 94
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 1a07c4044839..858d489f6bae 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -300,6 +300,7 @@ config GPIO_XILINX
300config GPIO_XTENSA 300config GPIO_XTENSA
301 bool "Xtensa GPIO32 support" 301 bool "Xtensa GPIO32 support"
302 depends on XTENSA 302 depends on XTENSA
303 depends on HAVE_XTENSA_GPIO32
303 depends on !SMP 304 depends on !SMP
304 help 305 help
305 Say yes here to support the Xtensa internal GPIO32 IMPWIRE (input) 306 Say yes here to support the Xtensa internal GPIO32 IMPWIRE (input)