summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-08-06 09:09:01 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-08-06 09:28:28 -0400
commit5d1d431b9793ae69a622a27ab8c25969a5c0ebd5 (patch)
tree0234f36092077e36c98b21b7f16b9225aec935b0 /firmware
parent6f92c498c446c1133801e499840bf6fc607226b4 (diff)
downloadrockbox-5d1d431b9793ae69a622a27ab8c25969a5c0ebd5.tar.gz
rockbox-5d1d431b9793ae69a622a27ab8c25969a5c0ebd5.tar.bz2
rockbox-5d1d431b9793ae69a622a27ab8c25969a5c0ebd5.zip
FS#9295: Detect external power supply for ipod 1st & 2nd gen (Mark Fawcus)
Change-Id: I7b64c37ead60152c8a12556cfa344e225abc1980
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config/ipod1g2g.h4
-rw-r--r--firmware/target/arm/ipod/power-ipod.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/export/config/ipod1g2g.h b/firmware/export/config/ipod1g2g.h
index 057b0fab48..fd497c7469 100644
--- a/firmware/export/config/ipod1g2g.h
+++ b/firmware/export/config/ipod1g2g.h
@@ -131,8 +131,8 @@
#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
-/* Hardware controlled charging? FIXME */
-//#define CONFIG_CHARGING CHARGING_SIMPLE
+/* Hardware controlled charging */
+#define CONFIG_CHARGING CHARGING_SIMPLE
/* FIXME: Don't shutdown on low battery until we have proper suspend. */
#define NO_LOW_BATTERY_SHUTDOWN
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c
index ef594173f0..fcaf5b4ff8 100644
--- a/firmware/target/arm/ipod/power-ipod.c
+++ b/firmware/target/arm/ipod/power-ipod.c
@@ -66,7 +66,7 @@ unsigned int power_input_status(void)
if ((GPIOD_INPUT_VAL & 0x08) != 0)
status |= POWER_INPUT_USB_CHARGER;
/* */
-#elif defined(IPOD_3G)
+#elif defined(IPOD_3G) || defined(IPOD_1G2G)
/* firewire power */
if ((GPIOC_INPUT_VAL & 0x10) == 0)
status = POWER_INPUT_MAIN_CHARGER;