diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-12 08:30:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-12 08:30:38 -0400 |
| commit | 3c594d34c4addc962b2bd6ed2d16f3ce24ab1627 (patch) | |
| tree | 771baefba46fda48848257e6c5313e977ad07370 /arch/arm/mach-uniphier/init | |
| parent | 99615d812f1c5f954c8bbc1e0cdfcb15e5cbe675 (diff) | |
| parent | 4fb96c48c183128c00b21c7858bb05897a1b80de (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/init')
| -rw-r--r-- | arch/arm/mach-uniphier/init/init-ld11.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/init/init-ld20.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/init/init-ld11.c b/arch/arm/mach-uniphier/init/init-ld11.c index e324c94700..fdb2838503 100644 --- a/arch/arm/mach-uniphier/init/init-ld11.c +++ b/arch/arm/mach-uniphier/init/init-ld11.c @@ -15,7 +15,9 @@ int uniphier_ld11_init(const struct uniphier_board_data *bd) { uniphier_sbc_init_savepin(bd); uniphier_pxs2_sbc_init(bd); - uniphier_pin_init("system_bus_grp"); + /* pins for NAND and System Bus are multiplexed */ + if (spl_boot_device() != BOOT_DEVICE_NAND) + uniphier_pin_init("system_bus_grp"); support_card_reset(); diff --git a/arch/arm/mach-uniphier/init/init-ld20.c b/arch/arm/mach-uniphier/init/init-ld20.c index cb05421252..37b860a8b4 100644 --- a/arch/arm/mach-uniphier/init/init-ld20.c +++ b/arch/arm/mach-uniphier/init/init-ld20.c @@ -15,7 +15,9 @@ int uniphier_ld20_init(const struct uniphier_board_data *bd) { uniphier_sbc_init_savepin(bd); uniphier_pxs2_sbc_init(bd); - uniphier_pin_init("system_bus_grp"); + /* pins for NAND and System Bus are multiplexed */ + if (spl_boot_device() != BOOT_DEVICE_NAND) + uniphier_pin_init("system_bus_grp"); support_card_reset(); |