Merge branch 'topic/asoc' into for-linus

* topic/asoc:
  ASoC: Fix lm4857 control