Merge tag 'renesas-boards-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas ARM Based SoC Boards Updates for v3.16" from Simon Horman:

r8a7791 (R-Car M2) based Koelsch board
* Enable Quad SPI transfers for the SPI FLASH
* Clock workarounds for Ether, I2C, MSIOF, Quad SPI and SDHI
* Use shmobile_clk_workaround()

r8a7790 (R-Car H2) based Lager board
* Enable Quad SPI transfers for the SPI FLASH
* Switch to use dai info for R-Car sound
* Clock workarounds for Ether, MSIOF, MMCIF, Quad SPI and SDHI
* Use shmobile_clk_workaround()

r8a7778 (R-Car M1) based Bock-W board
* Switch to use dai info for R-Car sound

* tag 'renesas-boards-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: lager legacy: Enable Quad SPI transfers for the SPI FLASH
  ARM: shmobile: koelsch legacy: Enable Quad SPI transfers for the SPI FLASH
  ARM: shmobile: lager: switch to use dai info for R-Car sound
  ARM: shmobile: bockw: switch to use dai info for R-Car sound
  ARM: shmobile: bockw: remove old style audio clock
  ARM: shmobile: Add Koelsch clock workarounds for SDHI
  ARM: shmobile: Add Lager clock workarounds for SDHI and MMCIF
  ARM: shmobile: lager-reference: Work around core clock issues
  ARM: shmobile: koelsch-reference: Annotate clk_enables as __initconst
  ARM: shmobile: koelsch-reference: Work around core clock issues
  ARM: shmobile: lager: Annotate clk_names with __initconst
  ARM: shmobile: koelsch: Annotate clk_names with __initconst
  ARM: shmobile: Use shmobile_clk_workaround() on Koelsch
  ARM: shmobile: Use shmobile_clk_workaround() on Lager

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 18 insertions, 11 deletions

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 18c7e0311aa6..f8b1e05463cc 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -325,12 +325,12 @@ static const struct rspi_plat_data qspi_pdata __initconst = {
 
 static const struct spi_board_info spi_info[] __initconst = {
         {
-                .modalias               = "m25p80",
-                .platform_data          = &spi_flash_data,
-                .mode                   = SPI_MODE_0,
-                .max_speed_hz           = 30000000,
-                .bus_num                = 0,
-                .chip_select            = 0,
+                .modalias       = "m25p80",
+                .platform_data  = &spi_flash_data,
+                .mode           = SPI_MODE_0 | SPI_TX_QUAD | SPI_RX_QUAD,
+                .max_speed_hz   = 30000000,
+                .bus_num        = 0,
+                .chip_select    = 0,
         },
 };
 
@@ -567,20 +567,27 @@ static struct resource rsnd_resources[] __initdata = {
 };
 
 static struct rsnd_ssi_platform_info rsnd_ssi[] = {
-        RSND_SSI_SET(0, 0, gic_spi(370), RSND_SSI_PLAY),
-        RSND_SSI_SET(0, 0, gic_spi(371), RSND_SSI_CLK_PIN_SHARE),
+        RSND_SSI(0, gic_spi(370), 0),
+        RSND_SSI(0, gic_spi(371), RSND_SSI_CLK_PIN_SHARE),
 };
 
-static struct rsnd_scu_platform_info rsnd_scu[2] = {
+static struct rsnd_src_platform_info rsnd_src[2] = {
         /* no member at this point */
 };
 
+static struct rsnd_dai_platform_info rsnd_dai = {
+        .playback = { .ssi = &rsnd_ssi[0], },
+        .capture  = { .ssi = &rsnd_ssi[1], },
+};
+
 static struct rcar_snd_info rsnd_info = {
         .flags          = RSND_GEN2,
         .ssi_info       = rsnd_ssi,
         .ssi_info_nr    = ARRAY_SIZE(rsnd_ssi),
-        .scu_info       = rsnd_scu,
-        .scu_info_nr    = ARRAY_SIZE(rsnd_scu),
+        .src_info       = rsnd_src,
+        .src_info_nr    = ARRAY_SIZE(rsnd_src),
+        .dai_info       = &rsnd_dai,
+        .dai_info_nr    = 1,
 };
 
 static struct asoc_simple_card_info rsnd_card_info = {