2 files changed, 101 insertions, 0 deletions

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 7e3f42bfaf6b..bcbd74c564a1 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -272,6 +272,7 @@ config MACH_LAGER
         depends on ARCH_R8A7790
         select USE_OF
         select MICREL_PHY if SH_ETH
+        select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
 config MACH_KOELSCH
         bool "Koelsch board"
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 6a7041f9afa6..e8242c552da1 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -20,6 +20,7 @@
 
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
+#include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
@@ -52,6 +53,20 @@
 #include <linux/spi/flash.h>
 #include <linux/spi/rspi.h>
 #include <linux/spi/spi.h>
+#include <sound/rcar_snd.h>
+#include <sound/simple_card.h>
+
+/*
+ * SSI-AK4643
+ *
+ * SW1: 1: AK4643
+ *      2: CN22
+ *      3: ADV7511
+ *
+ * this command is required when playback.
+ *
+ * # amixer set "LINEOUT Mixer DACL" on
+ */
 
 /* DU */
 static struct rcar_du_encoder_data lager_du_encoders[] = {
@@ -509,6 +524,77 @@ static const struct resource usbhs_phy_resources[] __initconst = {
         DEFINE_RES_MEM(0xe6590100, 0x100),
 };
 
+/* I2C */
+static struct i2c_board_info i2c2_devices[] = {
+        {
+                I2C_BOARD_INFO("ak4643", 0x12),
+        }
+};
+
+/* Sound */
+static struct resource rsnd_resources[] __initdata = {
+        [RSND_GEN2_SCU]  = DEFINE_RES_MEM(0xec500000, 0x1000),
+        [RSND_GEN2_ADG]  = DEFINE_RES_MEM(0xec5a0000, 0x100),
+        [RSND_GEN2_SSIU] = DEFINE_RES_MEM(0xec540000, 0x1000),
+        [RSND_GEN2_SSI]  = DEFINE_RES_MEM(0xec541000, 0x1280),
+};
+
+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),
+};
+
+static struct rsnd_scu_platform_info rsnd_scu[2] = {
+        /* no member at this point */
+};
+
+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),
+};
+
+static struct asoc_simple_card_info rsnd_card_info = {
+        .name           = "AK4643",
+        .card           = "SSI01-AK4643",
+        .codec          = "ak4642-codec.2-0012",
+        .platform       = "rcar_sound",
+        .daifmt         = SND_SOC_DAIFMT_LEFT_J,
+        .cpu_dai = {
+                .name   = "rcar_sound",
+                .fmt    = SND_SOC_DAIFMT_CBS_CFS,
+        },
+        .codec_dai = {
+                .name   = "ak4642-hifi",
+                .fmt    = SND_SOC_DAIFMT_CBM_CFM,
+                .sysclk = 11289600,
+        },
+};
+
+static void __init lager_add_rsnd_device(void)
+{
+        struct platform_device_info cardinfo = {
+                .parent         = &platform_bus,
+                .name           = "asoc-simple-card",
+                .id             = -1,
+                .data           = &rsnd_card_info,
+                .size_data      = sizeof(struct asoc_simple_card_info),
+                .dma_mask       = DMA_BIT_MASK(32),
+        };
+
+        i2c_register_board_info(2, i2c2_devices,
+                                ARRAY_SIZE(i2c2_devices));
+
+        platform_device_register_resndata(
+                &platform_bus, "rcar_sound", -1,
+                rsnd_resources, ARRAY_SIZE(rsnd_resources),
+                &rsnd_info, sizeof(rsnd_info));
+
+        platform_device_register_full(&cardinfo);
+}
+
 static const struct pinctrl_map lager_pinctrl_map[] = {
         /* DU (CN10: ARGB0, CN13: LVDS) */
         PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7790", "pfc-r8a7790",
@@ -517,12 +603,24 @@ static const struct pinctrl_map lager_pinctrl_map[] = {
                                   "du_sync_1", "du"),
         PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7790", "pfc-r8a7790",
                                   "du_clk_out_0", "du"),
+        /* I2C2 */
+        PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar.2", "pfc-r8a7790",
+                                  "i2c2", "i2c2"),
         /* SCIF0 (CN19: DEBUG SERIAL0) */
         PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7790",
                                   "scif0_data", "scif0"),
         /* SCIF1 (CN20: DEBUG SERIAL1) */
         PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7790",
                                   "scif1_data", "scif1"),
+        /* SSI (CN17: sound) */
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7790",
+                                  "ssi0129_ctrl", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7790",
+                                  "ssi0_data", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7790",
+                                  "ssi1_data", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7790",
+                                  "audio_clk_a", "audio_clk"),
         /* MMCIF1 */
         PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.1", "pfc-r8a7790",
                                   "mmc1_data8", "mmc1"),
@@ -616,6 +714,8 @@ static void __init lager_add_standard_devices(void)
                                           &usbhs_phy_pdata,
                                           sizeof(usbhs_phy_pdata));
         lager_register_usbhs();
+
+        lager_add_rsnd_device();
 }
 
 /*