This converts the following to Kconfig: CONFIG_SH_GPIO_PFC CONFIG_TMU_TIMER
Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-rmobile/Kconfig.32 | 4 ++++ drivers/gpio/Kconfig | 5 +++++ include/configs/rcar-gen2-common.h | 5 ----- 3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index a07eff71dfe7..31badc5a47dd 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -8,6 +8,7 @@ config RCAR_GEN2 bool "Renesas RCar Gen2" select PHY select PHY_RCAR_GEN2 + select TMU_TIMER
config R8A7740 bool "Renesas SoC R8A7740" @@ -121,6 +122,9 @@ config TARGET_STOUT
endchoice
+config TMU_TIMER + bool + config SYS_SOC default "rmobile"
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 1e4b50ef72b5..365615a53f7e 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -596,6 +596,11 @@ config ZYNQMP_GPIO_MODEPIN are accessed using xilinx firmware. In modepin register, [3:0] bits set direction, [7:4] bits read IO, [11:8] bits set/clear IO.
+config SH_GPIO_PFC + bool "Pinmuxed GPIO support for SuperH" + depends on RCAR_GEN2 && !PINCTRL_PFC + default y + config SL28CPLD_GPIO bool "Kontron sl28cpld GPIO driver" depends on DM_GPIO && SL28CPLD diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index a86180ead576..291c2a43d4d9 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -10,10 +10,6 @@
#include <asm/arch/rmobile.h>
-#ifndef CONFIG_PINCTRL_PFC -#define CONFIG_SH_GPIO_PFC -#endif - /* console */ #define CFG_SYS_BAUDRATE_TABLE { 38400, 115200 }
@@ -21,7 +17,6 @@ #define CFG_SYS_SDRAM_SIZE (RCAR_GEN2_UBOOT_SDRAM_SIZE)
/* Timer */ -#define CONFIG_TMU_TIMER #define CFG_SYS_TIMER_COUNTER (TMU_BASE + 0xc) /* TCNT0 */ #define CFG_SYS_TIMER_RATE (get_board_sys_clk() / 8)