Index: firmware/export/config-ipodnano.h
===================================================================
--- firmware/export/config-ipodnano.h	(revision 14657)
+++ firmware/export/config-ipodnano.h	(working copy)
@@ -85,8 +85,8 @@
 #define BATTERY_CAPACITY_INC      20  	/* capacity increment */
 #define BATTERY_TYPES_COUNT        1   /* only one type */
 
-/* Hardware controlled charging? FIXME */
-//#define CONFIG_CHARGING CHARGING_SIMPLE
+/* Hardware controlled charging with monitoring */
+#define CONFIG_CHARGING CHARGING_MONITOR
 
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
Index: firmware/target/arm/ipod/power-ipod.c
===================================================================
--- firmware/target/arm/ipod/power-ipod.c	(revision 14657)
+++ firmware/target/arm/ipod/power-ipod.c	(working copy)
@@ -44,6 +44,8 @@
 {
 #ifdef IPOD_VIDEO
     return (GPIOL_INPUT_VAL & 0x08)?false:true;
+#elif defined( IPOD_NANO )
+    return ((GPIOL_INPUT_VAL & 0x10) | (GPIOL_INPUT_VAL &0x08))?false:true; /*5v and 12V pins */
 #else
     /* This needs filling in for other ipods. */
     return false;