For Neo900 we will provide battery charging pads under the back cover (when we can find a way to do so), and we will take care to make them as tolerant to crappy supply as reasonably possible.
For USB we need to follow the common USB2.0 & charging_amendment specs, and we will probably use the same detection scheme like N900 (D+/- short), since it's the simplest (for user to handle) of the 3 variants for fastcharger detection that the USB specs define (the other two involve resistors to get soldered to the plug, sth you don't want to do). Anyway we will take care that charging is controllable by software just like it is on N900.
Please check other threads in this forum about fastcharger detection and D+/-_short

/j