summaryrefslogtreecommitdiff
path: root/board/samsung/trats
diff options
context:
space:
mode:
authorMateusz Zalega <m.zalega@samsung.com>2014-04-30 13:07:48 +0200
committerLukasz Majewski <l.majewski@samsung.com>2014-05-05 08:00:28 +0200
commit75504e9592745021006cb8905b5ff5a51d9d1cb3 (patch)
treed3f70f43a6eb464de67b84664d068f819fb01d9a /board/samsung/trats
parent6b423b752b24bf69962821754314418621fc71cc (diff)
downloadu-boot-imx-75504e9592745021006cb8905b5ff5a51d9d1cb3.zip
u-boot-imx-75504e9592745021006cb8905b5ff5a51d9d1cb3.tar.gz
u-boot-imx-75504e9592745021006cb8905b5ff5a51d9d1cb3.tar.bz2
usb: dfu: fix boards wo USB cable detection
Former usb_cable_connected() patch broke compilation of boards which do not support this feature. I've renamed usb_cable_connected() to g_dnl_usb_cable_connected() and added its default implementation to gadget downloader driver code. There's only one driver of this kind and it's unlikely there'll be another, so there's no point in keeping it in /common. Previously this function was declared in usb.h. I've moved it, since it's more appropriate to keep it in g_dnl.h - usb.h seems to be intended for USB host implementation. Existing code, confronted with default -EOPNOTSUPP return value, continues as if the cable was connected. CONFIG_USB_CABLE_CHECK was removed. Change-Id: Ib9198621adee2811b391c64512f14646cefd0369 Signed-off-by: Mateusz Zalega <m.zalega@samsung.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Diffstat (limited to 'board/samsung/trats')
-rw-r--r--board/samsung/trats/trats.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 7c79e7b..ab0ad1d 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -430,8 +430,7 @@ int board_usb_init(int index, enum usb_init_type init)
return s3c_udc_probe(&s5pc210_otg_data);
}
-#ifdef CONFIG_USB_CABLE_CHECK
-int usb_cable_connected(void)
+int g_dnl_board_usb_cable_connected(void)
{
struct pmic *muic = pmic_get("MAX8997_MUIC");
if (!muic)
@@ -440,7 +439,6 @@ int usb_cable_connected(void)
return !!muic->chrg->chrg_type(muic);
}
#endif
-#endif
static void pmic_reset(void)
{