Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

7 files changed, 334 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
new file mode 100644
index 000000000000..7c6d33f29796
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -0,0 +1,96 @@
+Renesas R-Car sound
+
+Required properties:
+- compatible                    : "renesas,rcar_sound-gen1" if generation1
+                                  "renesas,rcar_sound-gen2" if generation2
+- reg                           : Should contain the register physical address.
+                                  required register is
+                                   SRU/ADG/SSI      if generation1
+                                   SRU/ADG/SSIU/SSI if generation2
+- rcar_sound,ssi                : SSI subnode
+- rcar_sound,scu                : SCU subnode
+- rcar_sound,dai                : DAI subnode
+
+SSI subnode properties:
+- interrupts                    : Should contain SSI interrupt for PIO transfer
+- shared-pin                    : if shared clock pin
+
+DAI subnode properties:
+- playback                      : list of playback modules
+- capture                       : list of capture  modules
+
+Example:
+
+rcar_sound: rcar_sound@0xffd90000 {
+        #sound-dai-cells = <1>;
+        compatible = "renesas,rcar_sound-gen2";
+        reg =   <0 0xec500000 0 0x1000>, /* SCU */
+                <0 0xec5a0000 0 0x100>,  /* ADG */
+                <0 0xec540000 0 0x1000>, /* SSIU */
+                <0 0xec541000 0 0x1280>; /* SSI */
+
+        rcar_sound,src {
+                src0: src@0 { };
+                src1: src@1 { };
+                src2: src@2 { };
+                src3: src@3 { };
+                src4: src@4 { };
+                src5: src@5 { };
+                src6: src@6 { };
+                src7: src@7 { };
+                src8: src@8 { };
+                src9: src@9 { };
+        };
+
+        rcar_sound,ssi {
+                ssi0: ssi@0 {
+                        interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>;
+                };
+                ssi1: ssi@1 {
+                        interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>;
+                };
+                ssi2: ssi@2 {
+                        interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>;
+                };
+                ssi3: ssi@3 {
+                        interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>;
+                };
+                ssi4: ssi@4 {
+                        interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>;
+                };
+                ssi5: ssi@5 {
+                        interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>;
+                };
+                ssi6: ssi@6 {
+                        interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>;
+                };
+                ssi7: ssi@7 {
+                        interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>;
+                };
+                ssi8: ssi@8 {
+                        interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>;
+                };
+                ssi9: ssi@9 {
+                        interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>;
+                };
+        };
+
+        rcar_sound,dai {
+                dai0 {
+                        playback = <&ssi5 &src5>;
+                        capture  = <&ssi6>;
+                };
+                dai1 {
+                        playback = <&ssi3>;
+                };
+                dai2 {
+                        capture  = <&ssi4>;
+                };
+                dai3 {
+                        playback = <&ssi7>;
+                };
+                dai4 {
+                        capture  = <&ssi8>;
+                };
+        };
+};
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 953f1cce982d..69c44269ebdb 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -392,6 +392,7 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg)
 }
 
 int rsnd_adg_probe(struct platform_device *pdev,
+                   const struct rsnd_of_data *of_data,
                    struct rsnd_priv *priv)
 {
         struct rsnd_adg *adg;
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index d836e8a9fdce..215b668166be 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -100,6 +100,21 @@
 #define RSND_RATES SNDRV_PCM_RATE_8000_96000
 #define RSND_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)
 
+static struct rsnd_of_data rsnd_of_data_gen1 = {
+        .flags = RSND_GEN1,
+};
+
+static struct rsnd_of_data rsnd_of_data_gen2 = {
+        .flags = RSND_GEN2,
+};
+
+static struct of_device_id rsnd_of_match[] = {
+        { .compatible = "renesas,rcar_sound-gen1", .data = &rsnd_of_data_gen1 },
+        { .compatible = "renesas,rcar_sound-gen2", .data = &rsnd_of_data_gen2 },
+        {},
+};
+MODULE_DEVICE_TABLE(of, rsnd_of_match);
+
 /*
  *      rsnd_platform functions
  */
@@ -620,7 +635,92 @@ static int rsnd_path_init(struct rsnd_priv *priv,
         return ret;
 }
 
+static void rsnd_of_parse_dai(struct platform_device *pdev,
+                              const struct rsnd_of_data *of_data,
+                              struct rsnd_priv *priv)
+{
+        struct device_node *dai_node,   *dai_np;
+        struct device_node *ssi_node,   *ssi_np;
+        struct device_node *src_node,   *src_np;
+        struct device_node *playback, *capture;
+        struct rsnd_dai_platform_info *dai_info;
+        struct rcar_snd_info *info = rsnd_priv_to_info(priv);
+        struct device *dev = &pdev->dev;
+        int nr, i;
+        int dai_i, ssi_i, src_i;
+
+        if (!of_data)
+                return;
+
+        dai_node = of_get_child_by_name(dev->of_node, "rcar_sound,dai");
+        if (!dai_node)
+                return;
+
+        nr = of_get_child_count(dai_node);
+        if (!nr)
+                return;
+
+        dai_info = devm_kzalloc(dev,
+                                sizeof(struct rsnd_dai_platform_info) * nr,
+                                GFP_KERNEL);
+        if (!dai_info) {
+                dev_err(dev, "dai info allocation error\n");
+                return;
+        }
+
+        info->dai_info_nr       = nr;
+        info->dai_info          = dai_info;
+
+        ssi_node = of_get_child_by_name(dev->of_node, "rcar_sound,ssi");