Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4896031ybl;
        Mon, 13 Jan 2020 23:27:14 -0800 (PST)
X-Google-Smtp-Source: APXvYqxKB7jXn6nP1m7JxZ4Hu4PCB2c/yKDQbd18KqG7ZNPqroonjnXUWzWMPPSOYd5YEc4zRV3J
X-Received: by 2002:aca:1b01:: with SMTP id b1mr14829139oib.6.1578986833996;
        Mon, 13 Jan 2020 23:27:13 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1578986833; cv=none;
        d=google.com; s=arc-20160816;
        b=jUhAAnSw0mNvuBwuj2wIVK7SRSpKi+43htkmK/w30PaimaXVyYnsQgQJS2gHc5+LU+
         uA4qg6jAAfJSpHmi8dJ8DhGfkj2wcm9OizN8Ktj+W+nr6AE7BcSfO/qr+f/fgYfyPqcs
         UZsqAj09BXYcbQNzLQ47yufv1nPDFvdHgjeYFy0FAQrW7B/iSjrMWpM53UorP9Y6NTiN
         UQQk+ZRoZ5TNDVRnJKJTTZh+jkT2z/z54ZZ6/gv5ccVJ/dyS4eNOFz7jbR/q7M5OYQEC
         GxA2KE7zB9duIWsTNGP6U80C8jhrd4PK6OiCoByqJsioE9fjnxD4YdQNjCNylskUJzAk
         HVkw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:sender:dkim-signature:mime-version:references
         :in-reply-to:message-id:date:subject:cc:to:from;
        bh=VIAVqKegLCz30ikMaiq3GK4scDod4shzi8/tBnou6Qo=;
        b=OzXw6qZYBOo7hNO7JC2RBKMSuEFjV/m+HEdz7Ujje6LtTlVQUW7+R/ZGY41ufIraW7
         VANT2M5qcAT9FrJwO5sdTS0AxOvq9ktH2s/HYxG6P+ExzE9MYu/8wm8ey8R2DvZfPBQf
         FoKDE9NxxNnMS+Dle2GYWBeRP90MQZ2mpDWwHDdOcPfPkoyMdPxf19Krdyc2Y1v+42ZN
         tbh+omjP50iuMR4ZN6aaV4hPzl2mByElqxIdTDXbcD72xizMFqy68xyNxQ/T6vorZI4A
         0MrdcJsZAiFdXTaVZkZBHLOWN6bh8HvfcIul9dnKwv1hMQd68RtrrFqrNwTpFt3R6EI7
         sY3A==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=pyPs4BIb;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
        by mx.google.com with ESMTP id f17si7712876oto.85.2020.01.13.23.27.02;
        Mon, 13 Jan 2020 23:27:13 -0800 (PST)
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;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=pyPs4BIb;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728984AbgANHZv (ORCPT <rfc822;gklkml16@gmail.com> + 99 others);
        Tue, 14 Jan 2020 02:25:51 -0500
Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:13884 "EHLO
        hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728993AbgANHYi (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 14 Jan 2020 02:24:38 -0500
Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA)
        id <B5e1d6ca20000>; Mon, 13 Jan 2020 23:24:18 -0800
Received: from hqmail.nvidia.com ([172.20.161.6])
  by hqpgpgate101.nvidia.com (PGP Universal service);
  Mon, 13 Jan 2020 23:24:38 -0800
X-PGP-Universal: processed;
        by hqpgpgate101.nvidia.com on Mon, 13 Jan 2020 23:24:38 -0800
Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL101.nvidia.com
 (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 14 Jan
 2020 07:24:37 +0000
Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL109.nvidia.com
 (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend
 Transport; Tue, 14 Jan 2020 07:24:37 +0000
Received: from skomatineni-linux.nvidia.com (Not Verified[10.2.169.242]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121)
        id <B5e1d6cb40001>; Mon, 13 Jan 2020 23:24:37 -0800
From:   Sowjanya Komatineni <skomatineni@nvidia.com>
To:     <skomatineni@nvidia.com>, <thierry.reding@gmail.com>,
        <jonathanh@nvidia.com>, <broonie@kernel.org>,
        <lgirdwood@gmail.com>, <perex@perex.cz>, <tiwai@suse.com>,
        <digetx@gmail.com>, <mperttunen@nvidia.com>,
        <gregkh@linuxfoundation.org>, <sboyd@kernel.org>,
        <robh+dt@kernel.org>, <mark.rutland@arm.com>
CC:     <pdeschrijver@nvidia.com>, <pgaikwad@nvidia.com>,
        <spujar@nvidia.com>, <josephl@nvidia.com>,
        <daniel.lezcano@linaro.org>, <mmaddireddy@nvidia.com>,
        <markz@nvidia.com>, <devicetree@vger.kernel.org>,
        <linux-clk@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
Subject: [PATCH v8 11/22] ASoC: tegra: Add fallback implementation for audio mclk
Date:   Mon, 13 Jan 2020 23:24:16 -0800
Message-ID: <1578986667-16041-12-git-send-email-skomatineni@nvidia.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1578986667-16041-1-git-send-email-skomatineni@nvidia.com>
References: <1578986667-16041-1-git-send-email-skomatineni@nvidia.com>
X-NVConfidentiality: public
MIME-Version: 1.0
Content-Type: text/plain
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1578986658; bh=VIAVqKegLCz30ikMaiq3GK4scDod4shzi8/tBnou6Qo=;
        h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer:
         In-Reply-To:References:X-NVConfidentiality:MIME-Version:
         Content-Type;
        b=pyPs4BIbu2fW/nI8eek0kwRoqtA5Uidngga+CFt7gD8NbauQv9BVrnxpM6fcFow0q
         0AdYCIOmXWah/c2ii77yHeul6KJ9IB8Kw3W6onF2MQQnS9quOKqAjH1g8N33a86YGp
         /BKuDJrylBDKrVEi8zr2Lw1QKyByO/15OPPOhaTlWW6znKZWPJhzVqQcUWGUPUDJkb
         /rCJGT8oCdLpNhDjB0YIx0IoedEb0VzV8CU0mQELI+YmJqQe8B4GWqMpXjOh0OoMFk
         zmr+jvb28uaF5cFMho4tk0n9jpDCkaqlw77BghVFXVcT0TR3d5RLKsCdlpV6VtkfXh
         8njyKrJRcpyJA==
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

mclk is from clk_out_1 which is part of Tegra PMC block and pmc clocks
are moved to Tegra PMC driver with pmc as clock provider and using pmc
clock ids.

New device tree uses clk_out_1 from pmc clock provider as audio mclk.

So, this patch adds implementation for mclk fallback to extern1 when
retrieving mclk returns -ENOENT to be backward compatible of new device
tree with older kernels.

Fixes: 110147c8c513 ("ASoC: tegra: always use clk_get() in utility code")

Tested-by: Dmitry Osipenko <digetx@gmail.com>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
---
 sound/soc/tegra/tegra_asoc_utils.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index 536a578e9512..74d3ffe7e603 100644
--- a/sound/soc/tegra/tegra_asoc_utils.c
+++ b/sound/soc/tegra/tegra_asoc_utils.c
@@ -191,9 +191,21 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
 
 	data->clk_cdev1 = clk_get(dev, "mclk");
 	if (IS_ERR(data->clk_cdev1)) {
-		dev_err(data->dev, "Can't retrieve clk cdev1\n");
-		ret = PTR_ERR(data->clk_cdev1);
-		goto err_put_pll_a_out0;
+		if (PTR_ERR(data->clk_cdev1) != -ENOENT) {
+			dev_err(data->dev, "Can't retrieve clk cdev1\n");
+			ret = PTR_ERR(data->clk_cdev1);
+			goto err_put_pll_a_out0;
+		}
+
+		/* Fall back to extern1 */
+		data->clk_cdev1 = clk_get(dev, "extern1");
+		if (IS_ERR(data->clk_cdev1)) {
+			dev_err(data->dev, "Can't retrieve clk extern1\n");
+			ret = PTR_ERR(data->clk_cdev1);
+			goto err_put_pll_a_out0;
+		}
+
+		dev_info(data->dev, "Falling back to extern1\n");
 	}
 
 	ret = tegra_asoc_utils_set_rate(data, 44100, 256 * 44100);
-- 
2.7.4