tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sh: mach-highlander and mach-rsk require gpiolib.

Fix up the build for mach-highlander and mach-rsk. These operated on the
assumption that GENERIC_GPIO support with an optional GPIOLIB was
possible. This used to be true, but has not been the case since commit-id
d56cc8bc661ac1ceded8d45ba2d53bb134fee17d ("sh: use gpiolib"), where the
GENERIC_GPIO implementation was rewritten to use GPIOLIB directly.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Paul Mundt ae5e6d05 57e97cb8

+3 -10
-7
arch/sh/Kconfig
··· 126 126 config ARCH_NO_VIRT_TO_BUS 127 127 def_bool y 128 128 129 - config ARCH_WANT_OPTIONAL_GPIOLIB 130 - def_bool y 131 - depends on !ARCH_REQUIRE_GPIOLIB 132 - 133 - config ARCH_REQUIRE_GPIOLIB 134 - def_bool n 135 - 136 129 config IO_TRAPPED 137 130 bool 138 131
+1 -1
arch/sh/boards/Kconfig
··· 240 240 config SH_MAGIC_PANEL_R2 241 241 bool "Magic Panel R2" 242 242 depends on CPU_SUBTYPE_SH7720 243 - select GENERIC_GPIO 243 + select ARCH_REQUIRE_GPIOLIB 244 244 help 245 245 Select Magic Panel R2 if configuring for Magic Panel R2. 246 246
+1 -1
arch/sh/boards/mach-highlander/Kconfig
··· 18 18 config SH_R7785RP 19 19 bool "R7785RP board support" 20 20 depends on CPU_SUBTYPE_SH7785 21 - select GENERIC_GPIO 21 + select ARCH_REQUIRE_GPIOLIB 22 22 23 23 endchoice 24 24
+1 -1
arch/sh/boards/mach-rsk/Kconfig
··· 10 10 11 11 config SH_RSK7203 12 12 bool "RSK7203" 13 - select GENERIC_GPIO 13 + select ARCH_REQUIRE_GPIOLIB 14 14 depends on CPU_SUBTYPE_SH7203 15 15 16 16 endchoice