diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-25 09:04:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-25 09:04:18 -0400 |
| commit | 26473945ad6667183296e7edee2a65edf31bb6f7 (patch) | |
| tree | ceb27f9307dbc86e20a5a9eb392c786e2fee5025 /arch/arm/include/asm | |
| parent | 6f4e050639241218987541f4729172e4e0e2ff31 (diff) | |
| parent | 7f7409ba6ab937b73f16bac8d83e215db86ace3d (diff) | |
| download | talos-obmc-uboot-26473945ad6667183296e7edee2a65edf31bb6f7.tar.gz talos-obmc-uboot-26473945ad6667183296e7edee2a65edf31bb6f7.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/mmc.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/usb_phy.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h b/arch/arm/include/asm/arch-sunxi/mmc.h index cb52e64873..3da360b177 100644 --- a/arch/arm/include/asm/arch-sunxi/mmc.h +++ b/arch/arm/include/asm/arch-sunxi/mmc.h @@ -127,4 +127,5 @@ struct sunxi_mmc { #define SUNXI_MMC_COMMON_RESET (1 << 18) struct mmc *sunxi_mmc_init(int sdc_no); +int sunxi_mmc_has_egon_boot_signature(struct mmc *mmc); #endif /* _SUNXI_MMC_H */ diff --git a/arch/arm/include/asm/arch-sunxi/usb_phy.h b/arch/arm/include/asm/arch-sunxi/usb_phy.h index b7b831e24a..17d31b8e31 100644 --- a/arch/arm/include/asm/arch-sunxi/usb_phy.h +++ b/arch/arm/include/asm/arch-sunxi/usb_phy.h @@ -17,4 +17,12 @@ void sunxi_usb_phy_exit(int index); void sunxi_usb_phy_power_on(int index); void sunxi_usb_phy_power_off(int index); int sunxi_usb_phy_vbus_detect(int index); +int sunxi_usb_phy_id_detect(int index); void sunxi_usb_phy_enable_squelch_detect(int index, int enable); + +/* Not really phy related, but we have to declare this somewhere ... */ +#if defined(CONFIG_MUSB_HOST) || defined(CONFIG_MUSB_GADGET) +void sunxi_musb_board_init(void); +#else +#define sunxi_musb_board_init() +#endif |
