diff options
| author | Rob Herring <rob.herring@linaro.org> | 2015-01-22 16:04:34 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-04-07 16:14:26 -0500 |
| commit | 163a5c261ef9dade49099db0d6d63799fb765bc4 (patch) | |
| tree | 6cade3b9b5700200cd8d909cfbe2579642781e4f | |
| parent | ceb98c1c87b464d004e79e6d36f23607b97395a1 (diff) | |
pxa1928ara: hacks to get USB mass storage working
Really, g_dnl_board_usb_cable_connected needs to be callable when the
connection is active.
Change-Id: I77b5eca5951537b97ad6b20c6de0536e2c66af9f
Signed-off-by: Rob Herring <rob.herring@linaro.org>
| -rw-r--r-- | board/Marvell/pxa1928_ara/pxa1928_ara.c | 6 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 4 | ||||
| -rw-r--r-- | include/configs/pxa1928_ara.h | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/board/Marvell/pxa1928_ara/pxa1928_ara.c b/board/Marvell/pxa1928_ara/pxa1928_ara.c index c381a35c9a..282ee44ae1 100644 --- a/board/Marvell/pxa1928_ara/pxa1928_ara.c +++ b/board/Marvell/pxa1928_ara/pxa1928_ara.c @@ -15,6 +15,7 @@ e* (C) Copyright 2011 #include <mv_recovery.h> #include <asm/arch/mfp.h> #include <malloc.h> +#include <usb.h> #include <power/pmic.h> #include <power/marvell88pm_pmic.h> #include <power/pxa1928_freq.h> @@ -106,6 +107,11 @@ int board_early_init_f(void) return 0; } +int board_usb_init(int index, enum usb_init_type init) +{ + return 0; +} + int g_dnl_board_usb_cable_connected(void) { int chrg_type = mrvl_usb_phy_28nm_charger_detect(CONFIG_USB_PHY_BASE); diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index e045957d07..ea3c9746c4 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -683,8 +683,8 @@ static int sleep_thread(struct fsg_common *common) return -EPIPE; /* Check cable connection */ - if (!g_dnl_board_usb_cable_connected()) - return -EIO; + //if (!g_dnl_board_usb_cable_connected()) + // return -EIO; k = 0; } diff --git a/include/configs/pxa1928_ara.h b/include/configs/pxa1928_ara.h index 30c1e6d487..bc1832fe7c 100644 --- a/include/configs/pxa1928_ara.h +++ b/include/configs/pxa1928_ara.h @@ -84,6 +84,10 @@ #define CONFIG_USB_FASTBOOT_BUF_SIZE 0x20000000 #define CONFIG_FASTBOOT_FLASH #define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 + +#define CONFIG_CMD_USB_MASS_STORAGE +#define CONFIG_USB_GADGET_MASS_STORAGE + /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros |