Merge branch 'topic/asoc' into for-linus

* topic/asoc:
  ASoC: Blackfin: update the bf5xx_i2s_resume parameters
  ASoC: Blackfin: keep better track of SPORT configuration state