drivers: charging, battery and mfd related changes

Conflicts:

	drivers/battery/max17047_fuelgauge.c
	drivers/misc/max77693-muic.c