diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-02 16:18:43 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-02 16:18:43 (GMT) |
| commit | 9a1f4bae0bded0ce354dd4b098d4b4a3b81d4d9a (patch) | |
| tree | 69e41f1752a89ef97da3e002f1a00475a31dc3aa /arch/arm/mach-uniphier/init.h | |
| parent | 821c89d38cb6832f162b5b20ec86f07610407c25 (diff) | |
| parent | bef4b024e9839ea7afe689b050fc95118eeb0b01 (diff) | |
| download | u-boot-9a1f4bae0bded0ce354dd4b098d4b4a3b81d4d9a.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/init.h')
| -rw-r--r-- | arch/arm/mach-uniphier/init.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h index f5b3fa8..ab0a68d 100644 --- a/arch/arm/mach-uniphier/init.h +++ b/arch/arm/mach-uniphier/init.h @@ -37,7 +37,6 @@ int uniphier_ld20_init(const struct uniphier_board_data *bd); #if defined(CONFIG_MICRO_SUPPORT_CARD) int uniphier_sbc_init_admulti(const struct uniphier_board_data *bd); int uniphier_sbc_init_savepin(const struct uniphier_board_data *bd); -int uniphier_sld3_sbc_init(const struct uniphier_board_data *bd); int uniphier_ld4_sbc_init(const struct uniphier_board_data *bd); int uniphier_pxs2_sbc_init(const struct uniphier_board_data *bd); #else @@ -53,11 +52,6 @@ static inline int uniphier_sbc_init_savepin( return 0; } -static inline int uniphier_sld3_sbc_init(const struct uniphier_board_data *bd) -{ - return 0; -} - static inline int uniphier_ld4_sbc_init(const struct uniphier_board_data *bd) { return 0; @@ -90,6 +84,7 @@ int uniphier_pxs2_early_clk_init(const struct uniphier_board_data *bd); int uniphier_ld20_early_clk_init(const struct uniphier_board_data *bd); int uniphier_sld3_early_pin_init(const struct uniphier_board_data *bd); +int uniphier_ld20_early_pin_init(const struct uniphier_board_data *bd); int uniphier_ld4_umc_init(const struct uniphier_board_data *bd); int uniphier_pro4_umc_init(const struct uniphier_board_data *bd); |