Merge branch 'topic-0620/samsung-audio-3.4' into chromeos-exynos-3.4

Merge branch 'topic-0620/samsung-audio-3.4' into chromeos-exynos-3.4

* topic-0620/samsung-audio-3.4:
  ASOC: SAMSUNG: Add samsung i2s dev name to make work with DT
  i2s: samsung: Fix build warning due to possible uninitialized usage
  asoc: samsung: Fix compilation break in Samsung's PCM driver
  ASOC: SAMSUNG: Use of_match_ptr for defining the of_match_table
  UPSTREAM: ASoC: Samsung: Update Kconfig for Exynos5250 and Exynos4412
  ASOC: SAMSUNG: Add dma_prop variable in s3c_dma_params
  ASoC: SAMSUNG: Add DT support for i2s
  UPSTREAM: dma: pl330: assign a new cookie when restarting tx descriptors in cyclic mode