Merge remote-tracking branch 'regulator/fix/max8997' into tmp