Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/mt6311'...