1 files changed, 400 insertions, 18 deletions

diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 6b9faf3908f7..38611526fe9a 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -32,11 +32,19 @@
 #include <linux/smsc911x.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
+#include <linux/usb/renesas_usbhs.h>
 #include <media/soc_camera.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/r8a7778.h>
 #include <asm/mach/arch.h>
+#include <sound/rcar_snd.h>
+#include <sound/simple_card.h>
+
+#define FPGA    0x18200000
+#define IRQ0MR  0x30
+#define COMCTLR 0x101c
+static void __iomem *fpga;
 
 /*
  *      CN9(Upper side) SCIF/RCAN selection
@@ -63,6 +71,45 @@
  * SW19 (MMC)   1 pin
  */
 
+/*
+ *      SSI settings
+ *
+ * SW45: 1-4 side       (SSI5 out, ROUT/LOUT CN19 Mid)
+ * SW46: 1101           (SSI6 Recorde)
+ * SW47: 1110           (SSI5 Playback)
+ * SW48: 11             (Recorde power)
+ * SW49: 1              (SSI slave mode)
+ * SW50: 1111           (SSI7, SSI8)
+ * SW51: 1111           (SSI3, SSI4)
+ * SW54: 1pin           (ak4554 FPGA control)
+ * SW55: 1              (CLKB is 24.5760MHz)
+ * SW60: 1pin           (ak4554 FPGA control)
+ * SW61: 3pin           (use X11 clock)
+ * SW78: 3-6            (ak4642 connects I2C0)
+ *
+ * You can use sound as
+ *
+ * hw0: CN19: SSI56-AK4643
+ * hw1: CN21: SSI3-AK4554(playback)
+ * hw2: CN21: SSI4-AK4554(capture)
+ * hw3: CN20: SSI7-AK4554(playback)
+ * hw4: CN20: SSI8-AK4554(capture)
+ *
+ * this command is required when playback on hw0.
+ *
+ * # amixer set "LINEOUT Mixer DACL" on
+ */
+
+/*
+ * USB
+ *
+ * USB1 (CN29) can be Host/Function
+ *
+ *              Host    Func
+ * SW98         1       2
+ * SW99         1       3
+ */
+
 /* Dummy supplies, where voltage doesn't matter */
 static struct regulator_consumer_supply dummy_supplies[] = {
         REGULATOR_SUPPLY("vddvario", "smsc911x"),
@@ -81,16 +128,76 @@ static struct resource smsc911x_resources[] __initdata = {
         DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */
 };
 
+#if IS_ENABLED(CONFIG_USB_RENESAS_USBHS_UDC)
+/*
+ * When USB1 is Func
+ */
+static int usbhsf_get_id(struct platform_device *pdev)
+{
+        return USBHS_GADGET;
+}
+
+#define SUSPMODE        0x102
+static int usbhsf_power_ctrl(struct platform_device *pdev,
+                             void __iomem *base, int enable)
+{
+        enable = !!enable;
+
+        r8a7778_usb_phy_power(enable);
+
+        iowrite16(enable << 14, base + SUSPMODE);
+
+        return 0;
+}
+
+static struct resource usbhsf_resources[] __initdata = {
+        DEFINE_RES_MEM(0xffe60000, 0x110),
+        DEFINE_RES_IRQ(gic_iid(0x4f)),
+};
+
+static struct renesas_usbhs_platform_info usbhs_info __initdata = {
+        .platform_callback = {
+                .get_id         = usbhsf_get_id,
+                .power_ctrl     = usbhsf_power_ctrl,
+        },
+        .driver_param = {
+                .buswait_bwait  = 4,
+        },
+};
+
+#define USB_PHY_SETTING {.port1_func = 1, .ovc_pin[1].active_high = 1,}
+#define USB1_DEVICE     "renesas_usbhs"
+#define ADD_USB_FUNC_DEVICE_IF_POSSIBLE()                       \
+        platform_device_register_resndata(                      \
+                &platform_bus, "renesas_usbhs", -1,             \
+                usbhsf_resources,                               \
+                ARRAY_SIZE(usbhsf_resources),                   \
+                &usbhs_info, sizeof(struct renesas_usbhs_platform_info))
+
+#else
+/*
+ * When USB1 is Host
+ */
+#define USB_PHY_SETTING { }
+#define USB1_DEVICE     "ehci-platform"
+#define ADD_USB_FUNC_DEVICE_IF_POSSIBLE()
+
+#endif
+
 /* USB */
 static struct resource usb_phy_resources[] __initdata = {
         DEFINE_RES_MEM(0xffe70800, 0x100),
         DEFINE_RES_MEM(0xffe76000, 0x100),
 };
 
-static struct rcar_phy_platform_data usb_phy_platform_data __initdata;
+static struct rcar_phy_platform_data usb_phy_platform_data __initdata =
+        USB_PHY_SETTING;
+
 
 /* SDHI */
 static struct sh_mobile_sdhi_info sdhi0_info __initdata = {
+        .dma_slave_tx   = HPBDMA_SLAVE_SDHI0_TX,
+        .dma_slave_rx   = HPBDMA_SLAVE_SDHI0_RX,
         .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
         .tmio_ocr_mask  = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
         .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
@@ -101,6 +208,12 @@ static struct resource sdhi0_resources[] __initdata = {
         DEFINE_RES_IRQ(gic_iid(0x77)),
 };
 
+/* Ether */
+static struct resource ether_resources[] __initdata = {
+        DEFINE_RES_MEM(0xfde00000, 0x400),
+        DEFINE_RES_IRQ(gic_iid(0x89)),
+};
+
 static struct sh_eth_plat_data ether_platform_data __initdata = {
         .phy            = 0x01,
         .edmac_endian   = EDMAC_LITTLE_ENDIAN,
@@ -118,7 +231,9 @@ static struct sh_eth_plat_data ether_platform_data __initdata = {
 static struct i2c_board_info i2c0_devices[] = {
         {
                 I2C_BOARD_INFO("rx8581", 0x51),
-        },
+        }, {
+                I2C_BOARD_INFO("ak4643", 0x12),
+        }
 };
 
 /* HSPI*/
@@ -162,10 +277,6 @@ static struct sh_mmcif_plat_data sh_mmcif_plat __initdata = {
                           MMC_CAP_NEEDS_POLL,
 };
 
-static struct rcar_vin_platform_data vin_platform_data __initdata = {
-        .flags  = RCAR_VIN_BT656,
-};
-
 /* In the default configuration both decoders reside on I2C bus 0 */
 #define BOCKW_CAMERA(idx)                                               \
 static struct i2c_board_info camera##idx##_info = {                     \
@@ -181,7 +292,237 @@ static struct soc_camera_link iclink##idx##_ml86v7667 __initdata = {	\
 BOCKW_CAMERA(0);
 BOCKW_CAMERA(1);
 
+/* VIN */
+static struct rcar_vin_platform_data vin_platform_data __initdata = {
+        .flags  = RCAR_VIN_BT656,
+};
+
+#define R8A7778_VIN(idx)                                                \
+static struct resource vin##idx##_resources[] __initdata = {            \
+        DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000),            \
+        DEFINE_RES_IRQ(gic_iid(0x5a)),                                  \
+};                                                                      \
+                                                                        \
+static struct platform_device_info vin##idx##_info __initdata = {       \
+        .parent         = &platform_bus,                                \
+        .name           = "r8a7778-vin",                                \
+        .id             = idx,                                          \
+        .res            = vin##idx##_resources,                         \
+        .num_res        = ARRAY_SIZE(vin##idx##_resources),             \
+        .dma_mask       = DMA_BIT_MASK(32),                             \
+        .data           = &vin_platform_data,                           \
+        .size_data      = sizeof(vin_platform_data),                    \
+}
+R8A7778_VIN(0);
+R8A7778_VIN(1);
+
+/* Sound */
+static struct resource rsnd_resources[] __initdata = {
+        [RSND_GEN1_SRU] = DEFINE_RES_MEM(0xffd90000, 0x1000),
+        [RSND_GEN1_SSI] = DEFINE_RES_MEM(0xffd91000, 0x1240),
+        [RSND_GEN1_ADG] = DEFINE_RES_MEM(0xfffe0000, 0x24),
+};
+
+static struct rsnd_ssi_platform_info rsnd_ssi[] = {
+        RSND_SSI_UNUSED, /* SSI 0 */
+        RSND_SSI_UNUSED, /* SSI 1 */
+        RSND_SSI_UNUSED, /* SSI 2 */
+        RSND_SSI_SET(1, 0, gic_iid(0x85), RSND_SSI_PLAY),
+        RSND_SSI_SET(2, 0, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE | RSND_SSI_CLK_FROM_ADG),
+        RSND_SSI_SET(0, 0, gic_iid(0x86), RSND_SSI_PLAY),
+        RSND_SSI_SET(0, 0, gic_iid(0x86), 0),
+        RSND_SSI_SET(3, 0, gic_iid(0x86), RSND_SSI_PLAY),
+        RSND_SSI_SET(4, 0, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE | RSND_SSI_CLK_FROM_ADG),
+};
+
+static struct rsnd_scu_platform_info rsnd_scu[9] = {
+        /* no member at this point */
+};
+
+enum {
+        AK4554_34 = 0,
+        AK4643_56,
+        AK4554_78,
+        SOUND_MAX,
+};
+
+static int rsnd_codec_power(int id, int enable)
+{
+        static int sound_user[SOUND_MAX] = {0, 0, 0};
+        int *usr = NULL;
+        u32 bit;
+
+        switch (id) {
+        case 3:
+        case 4:
+                usr = sound_user + AK4554_34;
+                bit = (1 << 10);
+                break;
+        case 5:
+        case 6:
+                usr = sound_user + AK4643_56;
+                bit = (1 << 6);
+                break;
+        case 7:
+        case 8:
+                usr = sound_user + AK4554_78;
+                bit = (1 << 7);
+                break;
+        }
+
+        if (!usr)
+                return -EIO;
+
+        if (enable) {
+                if (*usr == 0) {
+                        u32 val = ioread16(fpga + COMCTLR);
+                        val &= ~bit;
+                        iowrite16(val, fpga + COMCTLR);
+                }
+
+                (*usr)++;
+        } else {
+                if (*usr == 0)
+                        return 0;
+
+                (*usr)--;
+
+                if (*usr == 0) {
+                        u32 val = ioread16(fpga + COMCTLR);
+                        val |= bit;
+                        iowrite16(val, fpga + COMCTLR);
+                }
+        }
+
+        return 0;
+}
+
+static int rsnd_start(int id)
+{
+        return rsnd_codec_power(id, 1);
+}
+
+static int rsnd_stop(int id)
+{
+        return rsnd_codec_power(id, 0);
+}
+
+static struct rcar_snd_info rsnd_info = {
+        .flags          = RSND_GEN1,
+        .ssi_info       = rsnd_ssi,
+        .ssi_info_nr    = ARRAY_SIZE(rsnd_ssi),
+        .scu_info       = rsnd_scu,
+        .scu_info_nr    = ARRAY_SIZE(rsnd_scu),
+        .start          = rsnd_start,
+        .stop           = rsnd_stop,
+};
+
+static struct asoc_simple_card_info rsnd_card_info[] = {
+        /* SSI5, SSI6 */
+        {
+                .name           = "AK4643",
+                .card           = "SSI56-AK4643",
+                .codec          = "ak4642-codec.0-0012",
+                .platform       = "rcar_sound",
+                .daifmt         = SND_SOC_DAIFMT_LEFT_J,
+                .cpu_dai = {
+                        .name   = "rsnd-dai.0",
+                        .fmt    = SND_SOC_DAIFMT_CBS_CFS,
+                },
+                .codec_dai = {
+                        .name   = "ak4642-hifi",
+                        .fmt    = SND_SOC_DAIFMT_CBM_CFM,
+                        .sysclk = 11289600,
+                },
+        },
+        /* SSI3 */
+        {
+                .name           = "AK4554",
+                .card           = "SSI3-AK4554(playback)",
+                .codec          = "ak4554-adc-dac.0",
+                .platform       = "rcar_sound",
+                .cpu_dai = {
+                        .name   = "rsnd-dai.1",
+                        .fmt    = SND_SOC_DAIFMT_CBM_CFM |
+                                  SND_SOC_DAIFMT_RIGHT_J,
+                },
+                .codec_dai = {
+                        .name   = "ak4554-hifi",
+                },
+        },
+        /* SSI4 */
+        {
+                .name           = "AK4554",
+                .card           = "SSI4-AK4554(capture)",
+                .codec          = "ak4554-adc-dac.0",
+                .platform       = "rcar_sound",
+                .cpu_dai = {
+                        .name   = "rsnd-dai.2",
+                        .fmt    = SND_SOC_DAIFMT_CBM_CFM |
+                                  SND_SOC_DAIFMT_LEFT_J,
+                },
+                .codec_dai = {
+                        .name   = "ak4554-hifi",
+                },
+        },
+        /* SSI7 */
+        {
+                .name           = "AK4554",
+                .card           = "SSI7-AK4554(playback)",
+                .codec          = "ak4554-adc-dac.1",
+                .platform       = "rcar_sound",
+                .cpu_dai = {
+                        .name   = "rsnd-dai.3",
+                        .fmt    = SND_SOC_DAIFMT_CBM_CFM |
+                                  SND_SOC_DAIFMT_RIGHT_J,
+                },
+                .codec_dai = {
+                        .name   = "ak4554-hifi",
+                },
+        },
+        /* SSI8 */
+        {
+                .name           = "AK4554",
+                .card           = "SSI8-AK4554(capture)",
+                .codec          = "ak4554-adc-dac.1",
+                .platform       = "rcar_sound",
+                .cpu_dai = {
+                        .name   = "rsnd-dai.4",
+                        .fmt    = SND_SOC_DAIFMT_CBM_CFM |
+                                  SND_SOC_DAIFMT_LEFT_J,
+                },
+                .codec_dai = {
+                        .name   = "ak4554-hifi",
+                },
+        }
+};
+
 static const struct pinctrl_map bockw_pinctrl_map[] = {
+        /* AUDIO */
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "audio_clk_a", "audio_clk"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "audio_clk_b", "audio_clk"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi34_ctrl", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi3_data", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi4_data", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi5_ctrl", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi5_data", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi6_ctrl", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi6_data", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi78_ctrl", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi7_data", "ssi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7778",
+                                  "ssi8_data", "ssi"),
         /* Ether */
         PIN_MAP_MUX_GROUP_DEFAULT("r8a777x-ether", "pfc-r8a7778",
                                   "ether_rmii", "ether"),
@@ -201,7 +542,7 @@ static const struct pinctrl_map bockw_pinctrl_map[] = {
         /* USB */
         PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",
                                   "usb0", "usb0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",
+        PIN_MAP_MUX_GROUP_DEFAULT(USB1_DEVICE, "pfc-r8a7778",
                                   "usb1", "usb1"),
         /* SDHI0 */
         PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
@@ -224,22 +565,28 @@ static const struct pinctrl_map bockw_pinctrl_map[] = {
                                   "vin1_data8", "vin1"),
 };
 
-#define FPGA    0x18200000
-#define IRQ0MR  0x30
 #define PFC     0xfffc0000
 #define PUPR4   0x110
 static void __init bockw_init(void)
 {
         void __iomem *base;
+        struct clk *clk;
+        int i;
 
         r8a7778_clock_init();
         r8a7778_init_irq_extpin(1);
         r8a7778_add_standard_devices();
-        r8a7778_add_ether_device(&ether_platform_data);
-        r8a7778_add_vin_device(0, &vin_platform_data);
+
+        platform_device_register_resndata(&platform_bus, "r8a777x-ether", -1,
+                                          ether_resources,
+                                          ARRAY_SIZE(ether_resources),
+                                          &ether_platform_data,
+                                          sizeof(ether_platform_data));
+
+        platform_device_register_full(&vin0_info);
         /* VIN1 has a pin conflict with Ether */
         if (!IS_ENABLED(CONFIG_SH_ETH))
-                r8a7778_add_vin_device(1, &vin_platform_data);
+                platform_device_register_full(&vin1_info);
         platform_device_register_data(&platform_bus, "soc-camera-pdrv", 0,
                                       &iclink0_ml86v7667,
                                       sizeof(iclink0_ml86v7667));
@@ -269,8 +616,8 @@ static void __init bockw_init(void)
 
 
         /* for SMSC */
-        base = ioremap_nocache(FPGA, SZ_1M);
-        if (base) {
+        fpga = ioremap_nocache(FPGA, SZ_1M);
+        if (fpga) {
                 /*
                  * CAUTION
                  *
@@ -278,10 +625,9 @@ static void __init bockw_init(void)
                  * it should be cared in the future
                  * Now, it is assuming IRQ0 was used only from SMSC.
                  */
-                u16 val = ioread16(base + IRQ0MR);
+                u16 val = ioread16(fpga + IRQ0MR);
                 val &= ~(1 << 4); /* enable SMSC911x */
-                iowrite16(val, base + IRQ0MR);
-                iounmap(base);
+                iowrite16(val, fpga + IRQ0MR);
 
                 regulator_register_fixed(0, dummy_supplies,
                                          ARRAY_SIZE(dummy_supplies));
@@ -308,6 +654,42 @@ static void __init bockw_init(void)
                         sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
                         &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
         }
+
+        /* for Audio */
+        clk = clk_get(NULL, "audio_clk_b");
+        clk_set_rate(clk, 24576000);
+        clk_put(clk);
+        rsnd_codec_power(5, 1); /* enable ak4642 */
+
+        platform_device_register_simple(
+                "ak4554-adc-dac", 0, NULL, 0);
+
+        platform_device_register_simple(
+                "ak4554-adc-dac", 1, NULL, 0);
+
+        platform_device_register_resndata(
+                &platform_bus, "rcar_sound", -1,
+                rsnd_resources, ARRAY_SIZE(rsnd_resources),
+                &rsnd_info, sizeof(rsnd_info));
+
+        for (i = 0; i < ARRAY_SIZE(rsnd_card_info); i++) {
+                struct platform_device_info cardinfo = {
+                        .parent         = &platform_bus,
+                        .name           = "asoc-simple-card",
+                        .id             = i,
+                        .data           = &rsnd_card_info[i],
+                        .size_data      = sizeof(struct asoc_simple_card_info),
+                        .dma_mask       = ~0,
+                };
+
+                platform_device_register_full(&cardinfo);
+        }
+}
+
+static void __init bockw_init_late(void)
+{
+        r8a7778_init_late();
+        ADD_USB_FUNC_DEVICE_IF_POSSIBLE();
 }
 
 static const char *bockw_boards_compat_dt[] __initdata = {
@@ -320,5 +702,5 @@ DT_MACHINE_START(BOCKW_DT, "bockw")
         .init_irq       = r8a7778_init_irq_dt,
         .init_machine   = bockw_init,
         .dt_compat      = bockw_boards_compat_dt,
-        .init_late      = r8a7778_init_late,
+        .init_late      = bockw_init_late,
 MACHINE_END