summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/drivers/power.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index b5d4d7d22a..c3f2d82db4 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -27,6 +27,7 @@
27#include "logf.h" 27#include "logf.h"
28#include "pcf50605.h" 28#include "pcf50605.h"
29#include "pcf50606.h" 29#include "pcf50606.h"
30#include "usb.h"
30 31
31#ifdef HAVE_CHARGE_CTRL 32#ifdef HAVE_CHARGE_CTRL
32bool charger_enabled; 33bool charger_enabled;
@@ -108,7 +109,7 @@ void power_init(void)
108bool charger_inserted(void) 109bool charger_inserted(void)
109{ 110{
110#if CONFIG_CPU == MCF5249 111#if CONFIG_CPU == MCF5249
111 return (GPIO1_READ & 0x00400000)?true:false; 112 return (GPIO1_READ & 0x00400000) || usb_powered();
112#elif defined(GMINI_ARCH) 113#elif defined(GMINI_ARCH)
113 return (P7 & 0x80) == 0; 114 return (P7 & 0x80) == 0;
114#elif defined(HAVE_CHARGE_CTRL) 115#elif defined(HAVE_CHARGE_CTRL)