Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Jeffy Chen <jeffy.chen@rock-chips.com>,
        Mark Brown <broonie@kernel.org>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.14 071/161] ASoC: rockchip: Use dummy_dai for
 rt5514 dsp dailink
Thread-Topic: [PATCH AUTOSEL for 4.14 071/161] ASoC: rockchip: Use dummy_dai
 for rt5514 dsp dailink
Thread-Index: AQHTz5iZ8tg2VOe/dE6Uq93DXbxxeA==
Date:   Mon, 9 Apr 2018 00:20:44 +0000
Message-ID: <20180409001936.162706-71-alexander.levin@microsoft.com>
References: <20180409001936.162706-1-alexander.levin@microsoft.com>
In-Reply-To: <20180409001936.162706-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 2dd8053d-e3c2-4503-50c9-08d59db028e6
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:20:44.0660
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1080
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Jeffy Chen <jeffy.chen@rock-chips.com>

[ Upstream commit fde7f9dbc71365230eeb8c8ea97ce9b552c8e5bd ]

The rt5514 dsp captures pcm data through spi directly, so we should not
use rockchip-i2s as it's cpu dai like other codecs.

Use dummy_dai for rt5514 dsp dailink to make voice wakeup work again.

Reported-by: Jimmy Cheng-Yi Chiang <cychiang@google.com>
Fixes: (72cfb0f20c75 ASoC: rockchip: Use codec of_node and dai_name for rt5=
514 dsp)
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Tested-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 sound/soc/rockchip/rk3399_gru_sound.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3=
399_gru_sound.c
index 0513fe480353..21ac8d6cce3a 100644
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -387,7 +387,8 @@ static const struct snd_soc_dai_link rockchip_dais[] =
=3D {
 	[DAILINK_RT5514_DSP] =3D {
 		.name =3D "RT5514 DSP",
 		.stream_name =3D "Wake on Voice",
-		.codec_dai_name =3D "rt5514-dsp-cpu-dai",
+		.codec_name =3D "snd-soc-dummy",
+		.codec_dai_name =3D "snd-soc-dummy-dai",
 	},
 };
=20
@@ -432,7 +433,18 @@ static int rockchip_sound_of_parse_dais(struct device =
*dev,
 		if (index < 0)
 			continue;
=20
-		np_cpu =3D (index =3D=3D DAILINK_CDNDP) ? np_cpu1 : np_cpu0;
+		switch (index) {
+		case DAILINK_CDNDP:
+			np_cpu =3D np_cpu1;
+			break;
+		case DAILINK_RT5514_DSP:
+			np_cpu =3D np_codec;
+			break;
+		default:
+			np_cpu =3D np_cpu0;
+			break;
+		}
+
 		if (!np_cpu) {
 			dev_err(dev, "Missing 'rockchip,cpu' for %s\n",
 				rockchip_dais[index].name);
@@ -442,7 +454,8 @@ static int rockchip_sound_of_parse_dais(struct device *=
dev,
 		dai =3D &card->dai_link[card->num_links++];
 		*dai =3D rockchip_dais[index];
=20
-		dai->codec_of_node =3D np_codec;
+		if (!dai->codec_name)
+			dai->codec_of_node =3D np_codec;
 		dai->platform_of_node =3D np_cpu;
 		dai->cpu_of_node =3D np_cpu;
 	}
--=20
2.15.1