diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2017-09-15 22:13:57 +0300 |
---|---|---|
committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2017-09-28 00:54:06 +0300 |
commit | 793afcde6c645b37b72a922673fbf9d4ee619436 (patch) | |
tree | 4ce85ec695f38032fe4989bfb0340c2e3ee49c6d /board/renesas | |
parent | f5f6959444d07bfc71221a6ba18a2b3eca195e05 (diff) | |
download | u-boot-793afcde6c645b37b72a922673fbf9d4ee619436.tar.xz |
ARM: rmobile: Switch to DM PFC pinmux and GPIO driver
Enable the PFC pinmux and GPIO drivers and disable the SH GPIO combo
driver. This allows the drivers to obtain pinmux and GPIO configuration
from DT rather than hard-coding it in board files.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'board/renesas')
-rw-r--r-- | board/renesas/salvator-x/salvator-x.c | 2 | ||||
-rw-r--r-- | board/renesas/ulcb/ulcb.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index 78fc22a0e8..9d9de58370 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -82,12 +82,14 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000; +#ifdef CONFIG_SH_GPIO_PFC /* Init PFC controller */ #if defined(CONFIG_R8A7795) r8a7795_pinmux_init(); #elif defined(CONFIG_R8A7796) r8a7796_pinmux_init(); #endif +#endif #if defined(CONFIG_R8A7795) /* GSX: force power and clock supply */ diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 9b96645d11..3ee6990b57 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -81,12 +81,14 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000; +#ifdef CONFIG_SH_GPIO_PFC /* Init PFC controller */ #if defined(CONFIG_R8A7795) r8a7795_pinmux_init(); #elif defined(CONFIG_R8A7796) r8a7796_pinmux_init(); #endif +#endif /* USB1 pull-up */ setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); |