From patchwork Wed Feb 1 01:59:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 649212 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8F74C38142 for ; Wed, 1 Feb 2023 02:01:07 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6589F1FE; Wed, 1 Feb 2023 03:00:15 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6589F1FE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675216865; bh=yl7shQUkZMV8bsx7rXG/CwXlCYxzB98OtMrEcTK0N4o=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=awHnkevX7nVsky9rnlMw+x32HKWdVfhf1sfL59NCFQAn8XwFcPiUfKXoAjND+ujph AOjxQCrWPblZVvTIr+ynrBGWQCiKEk53DAioDovUH94tks1qmPCBN1ewNr6Kwbp92E ySnyVRam3mtRvdHMJXCgu1WS9CjvNsrq4NUHBRp0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 815C7F80543; Wed, 1 Feb 2023 03:00:01 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0C4CFF80544; Wed, 1 Feb 2023 03:00:00 +0100 (CET) Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2130.outbound.protection.outlook.com [40.107.255.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 60078F804E2 for ; Wed, 1 Feb 2023 02:59:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 60078F804E2 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=lbJZ4w6Y ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LxWMpw4pI/TTYPduPu9Kj6WYVGtuxzfCylgtJoBN6ZytcbbpGfiogdBc88kBEJaIS/boRRnKUZrad08dpPfhj5Gj9EGzRGbWRdkRGoHw7TKhY0Y5o+hyn74CgxRk7XjPEKmYbmDMak9CB4picFovUKAI6wWxIOF5EWfSjTKJ3AZSIXNRcf2To2aWN0L8HiiaYjFkXtjV6FwoyQtsgyayg0oFmWYO78xAbnXBhHc/L8sDgDGBiXs7j8ot1RRKmZhELzVRORotU53vPlU2hkG5lJD1NiayO97AoVV6OQSe+F/cd34uWEdbe4m7YOXID96eua6AZdByDapdlfdRiEOukw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ao1OGLJED45OxwgUvjiKqW+CYWBiPGFXRnUmNfBthCc=; b=MU2k33ay2JB4SaMXjbYgzWDwebYGNs7dg3HuTkP1fnee+CWdNlHJnd9udsNeg0VBp42J1OkHKIPmXfDPYN+I3LK8vea71lel9iZ7OZPFuBQ8pbLxeEiHDWT7FDJvzP2RQnRvrh4/L6h9aiMqgDlHJT+d7jg+/xj7GoIsBK312+hoEogKEgw2zAsphTjR/2O8gBxpPdg8BLByYHBKpHW8LvDKsLBuDx273BYQ7jc3Qw5JfNcTuk/Qq5mjhjhDx5ys4nb2ctM9cXCYDSV5R3KgteaVdJU+LLuqDfdTkvrQVAQUQ20cNkrkhMhrMSOEjx/jx9yHanDHzfwBJm3Z0Vx4KA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ao1OGLJED45OxwgUvjiKqW+CYWBiPGFXRnUmNfBthCc=; b=lbJZ4w6Y3oapRvNat4Ykn/5S+RohMZgoi2g8k4XlmDMFyLkIRUexMwbefH5AvV9yNoSBxlv4F7sdgdhQhMfR4PwiWfvxuN0UxLdmOu4/tGNNPlPx0pFF3bOht2QfbjSMUPtwUCakNfOLcF3o1JeOtgiXhbohQAfEvqUfB7zPlC0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB10342.jpnprd01.prod.outlook.com (2603:1096:604:1fa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 01:59:46 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 01:59:46 +0000 Message-ID: <878rhi6t7x.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 01/15] ASoC: rsnd: check whether playback/capture property exists User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 01:59:46 +0000 X-ClientProxiedBy: TYCP286CA0100.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::7) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10342:EE_ X-MS-Office365-Filtering-Correlation-Id: d347e08a-11d9-4155-05ac-08db03f7fe91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ElnmwAzUWz8PO4L8qhQnFJvk0ffWkJyWj8tu/J2QDxc7wCe7t3lj+WVLuL4HYb9tsBqX0sG28sDvi3FWKBmpNKPjJS0a7uki96uererRZlrJHaWWVbqrZZb3gwYf5FJW1T336cXNNpA47XuzyVYHS9zINFTQ6YemX1ucdNICQ78R5ffnQcw2bN0aQmejOJEN4/XtkhkcDtLxVK5Jt5mEMEEQwgcCs4E3Gco/54Mhvs3zSa2zMoc3B0vExGQmvVPJQVzkcJnfh5JGM4BgNs/qWm+ugJbMkTsIXdLPFAtpuIfxvNxgOXmYlOZEJ4NV6VDGS/a5Q61kZqSgFenPFfmYmRbuyPybTz8OEAxBRAzAL7KSO5Wg4ROF/TSIWm6LsAU32RJxt1kolw7w5CUaZJRkFe2k9lnrxjo1ghm95yogo5wZWaJ4uUzjfmnsHKCVWse6H9ITyIOqlj/kFCozjiYBCbj4Fb2YNm4AazIK44D4RS3nbPP8e0Ca/iW2aU7CEHykH/90xJ8F7EJMpRJH53HSkk7M5N1yOk01ONlS9NAohmTvWRYcX/wNloMcX3s08IpUlHmX71uEA4qm7nTdUTstYtOYANO6OsKtjKNAui1tlPd9Z7gOcbSdIJf0daKFHLijFZcmP9VGAVc5Y1NbeDckSCgSK3s5gButNooiXQMfDUSSHJxaHOh/X/JPi//+7UUFIjBiOhGLnCDUwxuvD2sfjQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(39860400002)(366004)(396003)(346002)(136003)(451199018)(86362001)(36756003)(38350700002)(38100700002)(83380400001)(6506007)(6512007)(186003)(26005)(2616005)(2906002)(316002)(66476007)(52116002)(8676002)(6486002)(478600001)(66556008)(6916009)(66946007)(4326008)(5660300002)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CBFGTrIW0UtljccIfGqKbiqLvdReTsfOCGrbZddhZLMbtK+LNXm8sGChZ4zkwCjObLe6wg6JND1KJ60qO5RXnefjI1suXLyGzNgeYhd3nGzB+r3D2NGLzjWGauzJRb9yGjKj8EybuWT8Pf1vPJ5G33VGQvinBzKAASN6dewgmXy6uhGgDL7Tv7DcnAz4dNR7CyE0OeHFAp0n2DuO2RziU7ngYejzZKxHP2MsVUuD6M569eyiSogeJWnWZjaeiMKsULfX9HEpH4/g4NF5BMyfc0jTzozelFsT1GH8yzXCCV107rWi67J21YmF2AcVckMpUatRdHJfp8eNeYmfb6q8Cypm2/iXsEKtxkVTqTaYQyAXwfSfWhjuzVB/DjndzpKFyzo+21RsJq4U/QHzejPD8CE3ximafkF0fuvY0kFWgy7YmbLJGsg4hEFcRfejSi7vj23yU66PJBqyTGQ5oSDCFzl+hNE7ZisCmFZ1XFnqw3b260yusHfOrTsrv7w+X4rEsaiAkRx2bUrmwxQdF8GS9A5VllbwBASey/xvH32PcOtRrSd5npaCJHQ+G4hB49L/w1sqcHD/Mm9hlsT5pOtXZUe902ZZSwiA/LlRlZmVqgUVPIAUB2Hvvyo54grF4YGFMO3fAGiSSiQ1IKIG4WI1fCs5zse1SykQ/ijLWroMKQrUxpVdZqsmXUzvXjyYzot4t/dmZiA6Av3KxYb5jUQOkD6JGuhWM5GBEdN+94192s7nQPEGd/oBe72qGTHOHPNgGiDSWI5vJX8IOQOOPCdH6fX+ccMgtfr4q4cSmz/TVsbSlgF9W1xXWZihiIKMQ/+yZrpz85heHAJP8PQUhmSI5Htxoc9SaYpIYUW2U3bN5nNDhS5rCzIlEFWkdK4PZMTjvnYqV0iepwmVxqtJLQhVHI7GMee05vCtF8mIeA5p3tsR38y6SdMMzBhUyqq+FpzHl5yp3ew3/ZlaGkCBGuPWxK1sQ+dra1LKz9j255pEl1GW+4cuOUcijPy+eA4gBH8fQP1+GwdLrJ0Z01Fzo+6+41L0OdjyF2/5CoS6zZJ5CzID4b/NM+dZssn5889JhoGACmipJDwQUyjLP9ILn14xa4VdPL/80aXguszO0Urit6ycHwrmHEdX/2eilXsiWwo/SeVWvOjmzR9QXfh6Najg/Xq3GVBSBt9SoxTYqncubO9d7tpTIWZLoM0DdiUpKijRr/HALT+axB3OVpp+NqO9TWy1IwMvH0C6nHmmJ+sxE5zIYXWxKjUc9Eif9w+E5LCUrR4bNU8AkRCpw9HLjcl409NVK9yawcFDvlc/zag+Rmia++UJTV2/32/Mf9T3kSTZ2xB2q0yiOO1RyTWbjGACWHFfV1qfrZKqzZzfdXbQ+h0uCblZZQvrsne3c96gAm1OIWg1coQ/mpGAh7OyCY1Ga/Q4FGZy6LGjh6hmiT2ox6tOvaqNfYxLuWe7f80FUIUecahMJ1NC9kYe0zFuvyBLk9C1dhVs1+b7SdCi82LPcZA84/A4eIfeIWyxlS+0WGzzJgLNnuzUw8JFRY6xul9d1R3lJnCUx0L0OpUm1Rmv0Q+aT5NyS3dtolEkrHfIbH7CZWRPYh0D8eU1JMURu/NvmRBBKPWRFTCJdTXzG9hor1I= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d347e08a-11d9-4155-05ac-08db03f7fe91 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 01:59:46.6873 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2NRN1rD1ZQEutSIq+fmsvUzHlF3FEw6Pc1E4t9aL9alpmYJsbOriU8h/Is+WSKDpzpv+6dx1a8b7vVGFb4+X2PyNHmg+nqFCpqPJt+CGn/K42ir06UVWQ8XTcuYXh3BR X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10342 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current rsnd sets "channels_min" which is used from snd_soc_dai_stream_valid() without checking DT playback/capture property. Thus, "aplay -l" or "arecord -l" will indicate un-exising device. This patch checks DT proerty and do nothing playback/capture settings if not exist. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/core.c | 42 +++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 2d269ac8c137..ca3a0f285092 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1343,6 +1343,7 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, struct snd_soc_dai_driver *drv; struct rsnd_dai *rdai; struct device *dev = rsnd_priv_to_dev(priv); + int playback_exist = 0, capture_exist = 0; int io_i; rdai = rsnd_rdai_get(priv, dai_i); @@ -1357,22 +1358,6 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, drv->ops = &rsnd_soc_dai_ops; drv->pcm_new = rsnd_pcm_new; - snprintf(io_playback->name, RSND_DAI_NAME_SIZE, - "DAI%d Playback", dai_i); - drv->playback.rates = RSND_RATES; - drv->playback.formats = RSND_FMTS; - drv->playback.channels_min = 2; - drv->playback.channels_max = 8; - drv->playback.stream_name = io_playback->name; - - snprintf(io_capture->name, RSND_DAI_NAME_SIZE, - "DAI%d Capture", dai_i); - drv->capture.rates = RSND_RATES; - drv->capture.formats = RSND_FMTS; - drv->capture.channels_min = 2; - drv->capture.channels_max = 8; - drv->capture.stream_name = io_capture->name; - io_playback->rdai = rdai; io_capture->rdai = rdai; rsnd_rdai_channels_set(rdai, 2); /* default 2ch */ @@ -1386,6 +1371,14 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, if (!playback && !capture) break; + if (io_i == 0) { + /* check whether playback/capture property exists */ + if (playback) + playback_exist = 1; + if (capture) + capture_exist = 1; + } + rsnd_parse_connect_ssi(rdai, playback, capture); rsnd_parse_connect_ssiu(rdai, playback, capture); rsnd_parse_connect_src(rdai, playback, capture); @@ -1397,6 +1390,23 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, of_node_put(capture); } + if (playback_exist) { + snprintf(io_playback->name, RSND_DAI_NAME_SIZE, "DAI%d Playback", dai_i); + drv->playback.rates = RSND_RATES; + drv->playback.formats = RSND_FMTS; + drv->playback.channels_min = 2; + drv->playback.channels_max = 8; + drv->playback.stream_name = io_playback->name; + } + if (capture_exist) { + snprintf(io_capture->name, RSND_DAI_NAME_SIZE, "DAI%d Capture", dai_i); + drv->capture.rates = RSND_RATES; + drv->capture.formats = RSND_FMTS; + drv->capture.channels_min = 2; + drv->capture.channels_max = 8; + drv->capture.stream_name = io_capture->name; + } + if (rsnd_ssi_is_pin_sharing(io_capture) || rsnd_ssi_is_pin_sharing(io_playback)) { /* should have symmetric_rate if pin sharing */ From patchwork Wed Feb 1 01:59:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 650166 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 86E89C636CC for ; Wed, 1 Feb 2023 02:01:17 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 61596826; Wed, 1 Feb 2023 03:00:24 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 61596826 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675216874; bh=7NDdN1rVFmuvWIzVJNVBAgpyW2bPYmoRfPJ6q5V3fLI=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=GOevrmQ09Yo0X+QLMs5CGBKm3vegO/XsbIt993mZMT6PhWsi1gumDE6g55jn8FwyR L+Nny6QyrYDNW6O1/Tgsh3Zhe21g1wh8scnNS2bLrP6NLETHT1YCkpjihOzpZZgZ9h CFVBLydj0ab5nlak08t7rXrAtT9SajQN/S1viinc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 65836F80551; Wed, 1 Feb 2023 03:00:06 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A327FF80551; Wed, 1 Feb 2023 03:00:04 +0100 (CET) Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2130.outbound.protection.outlook.com [40.107.255.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D3B38F8053D for ; Wed, 1 Feb 2023 02:59:54 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D3B38F8053D Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=A7axuDgN ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DBeh0XuFiR25Sxo2UJY9v1bX71tEIrl64eHIWvO5VxoAKSgdSH22XH2rInHWpZfMpmLfOQrbTLnAgMV0+lT08j32nX93T+jfYD4Vijs0HPLdvxtip11ndM+3py7WvNanBaWY6vY7pahQd12dAW0WntE2mGJ/y2j46TRi+ZFR58hxAiSxhapOvQ+6OmssEQR+CPzl2ob468gXhl8mBKPlFAuBGEiifoo9dstUi83Cy/M15x7blC0DbG4k6u9H2JnKNZbnr5YaQhXKWlkoZYDshST4Q+JOKhbhkq5mf6UhXev327bYe1yAnjqoj7t69KmBFDce2U1SCs2OEbFPkOxoMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+N7r45QFkjT6U2EizS1V9zFr/Y9xai32Ueyo/RFLzFs=; b=HvUAYGr01blWtiYWsym5U85WRRmsEYU8sCQDP75KempNveEPt2wQ94viHo+mYPeracPJBxJwCei6d84RZHuRDmwuog/6LjLQvQqGdF+M3QlELr1L7nrZJRXdmwK/BNAErr1ItVaVRTF7Pc1cM4YUp1rA6axMAXacB9Jy1pSRtDmL0VWqsW6VEhAiACaVmbWmi+7AJZnrR4YnBhJ1sDHyCDD1LUfWCz/hqrCo4tf9kvWPvfORyGME+oMSA305L6gEwzfZn84/RwknVPcMkE4xjblBQt3Mg3qu0x1MztRuZdV2/ORplup6/lDyX07gRDSalluS2NO5CZl6oEReymK0eA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+N7r45QFkjT6U2EizS1V9zFr/Y9xai32Ueyo/RFLzFs=; b=A7axuDgNbAw+2PGGGtXZlMxKd6E2E60lB78Lo8Z/zK1VjMgcKx1f/2CJEJ2NsYFboe9LbVZMkjFttPJhQ912Z+B7SCb7otAnEfYAxqBMG94w9FBiJoG6XVcK7/njRpKSab43+cvxNBPl6DCq8wZ2lkyz6WHd3U3aM6MJEHXNAVs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB10342.jpnprd01.prod.outlook.com (2603:1096:604:1fa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 01:59:53 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 01:59:53 +0000 Message-ID: <877cx26t7r.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 02/15] ASoC: rsnd: fixup #endif position User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 01:59:52 +0000 X-ClientProxiedBy: TYCP286CA0104.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::20) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10342:EE_ X-MS-Office365-Filtering-Correlation-Id: f9776667-02de-41e6-1272-08db03f80260 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pZWsQMoRZTyPubS5+aZEeJWKxH5+abZwaEIMW0XhXmP1gH+RN7883cdRx+UqmQg2/VrrfHlckTwGnhbdhTHCk3AiBIf+a4+1oX9YHQX8qMLLwd6svtRnH3JYBXK869NCorgTN2xjHva1uPjL6+2hqW0nerio8bU56o9CgCYD4vL7gHAbQmZ/WR9h5ibwO2fYmtIcSblXwpJQT7uL0hi/WjiLTIts0d2J6B5M9LQHsqYjB2fE5tlodWESgzGTdZAMKpbBG0Jf1kqSVaiaoK7tYUuxZIuXIDQrij5ID8yHh7rtdcF65XBO7wb85Quw1t1nQap7jyOrdCfbswyXvTaZY5Zh9Z7py2iivFamP+CE6ofld9sqaEkPvjdtehbTYCDxx5nH98ZRZXqQpqGaQFMq8ahDIT2EsqTilDiAPf4uc8oCp1CVNTsJAIP3KRaSZrCRDuzKK9sOMnaHjaew2vVPo/cX6pEniAQ6c2A3jnGP6bY7tON1ZSh7dEMcq4AEwBOIvGsVrSXdmAhGb1fwukAJ0l8wmWg0cMZIAhbRJhAFI9Tn/5FqtzaZ7wjfMhO3Tqa5HRuZker88JiWnMKY3iXFRAKuI8KalfdPCEdob68K9gd/O5Kh0S/K2IUgjGxMSmiClJxmZbjzM86K0GrrskWlWuzc7oh0MdWAOjcIc/Hs0RhtcPfCGEaPumVK2c3jPp3Y4MaCCvdqgnUcMryZ//uItw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(39860400002)(366004)(396003)(346002)(136003)(451199018)(86362001)(36756003)(38350700002)(38100700002)(83380400001)(6506007)(6512007)(186003)(26005)(2616005)(2906002)(316002)(66476007)(52116002)(8676002)(6486002)(478600001)(66556008)(6916009)(66946007)(4326008)(5660300002)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9BW8E92XRxtgm4H/+Cqvpt5ldMLpRhkeh5O478ZUSO511hLxcSX0U/+1+9kb08zasHWLePTG0iznJDOvp4eEIX17/mRkNyrCYeOHWXUSEJbyie82Sm3UqHlMPxhBcobwuUcA1SLl67uRiNLhREZS+0osu8lBPKBYp4G26g41yCbhaynB+NGzoJ3N0zmev/kcEdK8L/EPi1iYm0wx4Tjwc9aHwMvBHkMzDjtpIggmo3x3GSrLy2rQ2kuY7dezI3ys3NqmfKBZvpsqxYIFWYPQrDsjg3WBln8Vv0h0Yt7jW/vOJ5ymqLdY0yUP0ZINJP3W1tVE3GB6NqnMVup3wL88O8j/5zOg1/oETrys17Jgsr3tsAs6AupMQ3Qn+kXulFktF0b4Bef118PWel8xAsI3Uzj0lpewO3zdKYDxA6HemEP8Jf3VIWqC6rhAtzjwVNymdr5tvn5Oda79UfYFCEfxjgYtp1rPsK5N3GKtWFdQjHJYx+z6dDJw/7m+OHEPhzOaSFUMYU99iOV7QTnc1DuRVnXSFNmApfpEDVBa5Im7MWGpkAaukoQoNPWM9/Ox6WC/lArOhghm8ldb+Ozznrdd43059EqXhHMPFGPi01OA3FMxq4n6AIPaJ8YYFT55L2hMhq+nQBl8RdScNuOeUBDZ25LjPg56goRMPxMYz8iRSlKinl+5OIO73aFF9/VgBI5AqrjbmnB3TmhxbtIo2L0SJIO1jSU3bljRab6TttBJ9WOI7CErY5QcoSmwXzx6ecO5VIcCVFoLPYIibwA7rNsiJGEEyqoR/WDhEUG2VMtek0ZdNtXo4ZlqncopiK9PEplBa8oOiQouJFmI0ws/5O1+sgHRYm/aU4c0A5P53IXnw3UR38pm3TE6edTM0cscpOJrwRiVxTOixFo1OaeR4TTopJgUFMm8pzl16cZaEpGyW23+hA3DBNH1htlB0hfmmgSEsJZMbp4HFHULGua0+cjBecRvpkC1A/r+Eoz86xAUMPgLlDf13lAi7DFJ+p4RR0gWvUMqU7ek5lA/DsAEwJR/aSHGnNT6JI6j+g36fGkUOCy6h2aKAhnn0eQwAwkNBA6JSodpIgFpTf0outz43OddVHd0I8GLwcFBej4bGjQdRdkakU2rSnnNGxvVAgDRbrAxE1sTvlsLIAbTbFpkhK5ezf6rbelCWKdHSj3n2p6ZOp1P42Qg2PPutAPSTC89Sz5DXkWi4/9voD0+MFp+iXJf8pLw5WMt86QxsV97OqlCalrrUeAHEPf5dJVo61OvnouXK2SkUgHvhwr5cPivEkDvuco7TXnxE83NHV7Kohhj2iKO/0UxS2POBV1C+jdU5OWshvTNtS24+4fT/scVsyXARa4SuO9ClE2kFy/LFip5lBSTigE/tgAjmRKRiynSaZhxCCFCZ7YyUp/u+h4z5SENFW1AQqDQXH84i+8SqP9NAXwVm4cep8/NoCUQyA47j+Sp1YxLv1IVXxyTAwWoau/uHbx+DSvV63bcWaF7TANYh5cMA0NV+wgkl+NzPB0Pnv3dzdcqggEl0paX55ZO/OSRGY7gHA7PBBE8nXkigxLBs7MJuOHrTXH/tz5moq1gmlEsgUpXgIW/zZSLqlUD08jj9ZztGexqknouyzyK0MIXDag= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9776667-02de-41e6-1272-08db03f80260 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 01:59:53.1242 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nboAbgFo3b3ygvuQNqCJ/OXzHxr0U/mbVXZ8wqElCz1IMitocCfhPATCsK/VGdYFh5PNPV9f3B0r2OC22CN0f+rKOjic44hikZtQd2gDnBCI7eJQFca37kU983bEbYML X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10342 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto commit 1f9c82b5ab83ff2 ("ASoC: rsnd: add debugfs support") added CONFIG_DEBUG_FS related definitions on rsnd.h, but it should be added inside of RSND_H. This patch fixup it. Fixes: 1f9c82b5ab83 ("ASoC: rsnd: add debugfs support") Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/rsnd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index d9cd190d7e19..f8ef6836ef84 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -901,8 +901,6 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type); if (!IS_BUILTIN(RSND_DEBUG_NO_DAI_CALL)) \ dev_dbg(dev, param) -#endif - #ifdef CONFIG_DEBUG_FS int rsnd_debugfs_probe(struct snd_soc_component *component); void rsnd_debugfs_reg_show(struct seq_file *m, phys_addr_t _addr, @@ -913,3 +911,5 @@ void rsnd_debugfs_mod_reg_show(struct seq_file *m, struct rsnd_mod *mod, #else #define rsnd_debugfs_probe NULL #endif + +#endif /* RSND_H */ From patchwork Wed Feb 1 01:59:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 649211 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1FC8BC636CC for ; Wed, 1 Feb 2023 02:01:30 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id AE54182A; Wed, 1 Feb 2023 03:00:37 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz AE54182A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675216887; bh=91Axqi74xdJv700kvBkl9r6bwzVvWbPBwvxsa+zEFyQ=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=BJaAEnoXVVDzLKepuOfHv+CHS+86hJa9lrpY5tBJMqKYnMEvvSTZTg+ZsgCRR9sti 8uM4/ehPIfyvA2T99xr3Bl6RabG1Bl9f7Kvbcze+sYho+nRnaQMyDJ6rOwTSiY6FJK xOL8tX33/mz8+nIMHgFgzq7oNmG0Y1x7vjRvNCDg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 236BDF80558; Wed, 1 Feb 2023 03:00:11 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3DA84F8055A; Wed, 1 Feb 2023 03:00:10 +0100 (CET) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on20703.outbound.protection.outlook.com [IPv6:2a01:111:f403:704b::703]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 81E65F80544 for ; Wed, 1 Feb 2023 03:00:04 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 81E65F80544 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=bCPHP9V4 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BBnBkJ27kCnGsHO4bUgFaQ7BEfPE4lhabNDpz1zAVF5ZoGJIVOmQTIRsq0wScMs1jgXC5sKR0KPP24t7ABx9z0BaYRc1izFyqhKtBA7LhQZ6kTfdeeLq4vq7XVg+XOAC4Dx96SAQ08M/Zba0V9OViqGZhjKgpsPs4L9oVLdG38SyuabS7AXisLu75OnZrqjtjd8jQC7Fd9t2W0yhzuNVnsX1LqsRBEbJdWmNlOMrAybJgf9Fy9hcUWyH06dBtNTUB8jSp2nhELhQHmqbzJ1jo/sNEDqtFQuWJwSRWtyXAqFE3ESvKBzbrNMdAnAY/iho6R4EswaqSz4JuluDzV5giQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+b6JiMv9xGNQHw7tkOhtiFRMfjhdrSWVfLdQ5J954EU=; b=iQpyxy/0bO4IM/v+bh3aFlCGiEPdfN4oEUWblnhfd+xjgLhAnQ9+LVrGiqXEGJpL9sZNfnxpgV+KJPtvPH4nGImYtNFB4Rav5e8FOGuL7X5HknB3MXWbJigf9NGBbpJpM4aQMZNKHsGn4XWBexRiqwoaKtz7W+bElgKEzK+8IElfb1OcsVmuK7C65/1UTlda8GStTcQ2uSDKWo/N0asVP7ROyCr3uNfC8rccq/3/itj+rarPWotTEOg2RWNAbfWt3BkDiq9sHhykYLjldEeDfO3zEHCLK8p3NYqjkAbV0abWvj368GQ+IUaDvlu/hJQIFKl40SaT6UKw06uiP/Nu9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+b6JiMv9xGNQHw7tkOhtiFRMfjhdrSWVfLdQ5J954EU=; b=bCPHP9V41/wddshsiu+x7TOVY2WI9IVTLeNaGUauiWEFxB+Wn2JwJS0E4k7o9gZS3TJQtjTIMdIoECkySFOxokS0fiJZhobE/gvFuVcFV1XGW5lBTHkuL77pvLCU3v9Tcufq2Ucy+vdJykN8LuCMXlUoPNuDUOpw47fORSqHDgA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB10342.jpnprd01.prod.outlook.com (2603:1096:604:1fa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 01:59:58 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 01:59:58 +0000 Message-ID: <875ycm6t7l.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 03/15] ASoC: rsnd: Remove unnecessary rsnd_dbg_dai_call() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 01:59:58 +0000 X-ClientProxiedBy: TY2PR04CA0015.apcprd04.prod.outlook.com (2603:1096:404:f6::27) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10342:EE_ X-MS-Office365-Filtering-Correlation-Id: 73d2910c-c2e1-4a0c-70f1-08db03f805a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oS1/uipMfGwK8qOzIDFCwHuMHO14OsdVfelqLfaF3LSV1dLGAdtqMlce9a8iPL+gOsttDvNo6vF0keKj/3Oy1ERe1ZxBXm+PysudM35eXhLX4xu1qhKUsFfzcldTkkSZwv+UNZucVuPjD61eFAtVELQjSP/QUR710A2X9TF/AogCGzQeHtOINVqMFo3+Fka3pLt8vL9ntcG78NyRgM9s0ibe/4Xrh/kAfneIbz357UggZ1m/7fFvXKZ9gTLOgNLaV0jKMevSWdAGkmajuziGvqd4xg/XIs539O5r2ik8OZVkMtwN6tGc4jGaiX2PPKx2OpIvz2M84ugzTqP5d/HbPi6m2KX27Z+Qvt2X5d3W1SFgVJeL2jOl98m8NNwPWp1+TzpI3TWxeJvzrUzxqc2DhdbNqymwLYCSHhU7OSezxK3XsIFkFGlAX8jCwG2npJIRH0vk4+gkBxR/GJyRPN5zYBJE7ZR8ZtRtpk+BfIxbxqEjDnkJqbXTJ7lGTaaQFYuih62o9Vnjpk66w2BjXk4zuZYuI9yhr4YticMB89RDER9mOAI6hbLohu/tjkoyMfakLQofQ997ngJi1RUlryY2n1jXyVSN633SqUpgpfC7Phm//xUWVtcpbVD2jwHCMLlieqOB0/eD/cZ4Kc7zlwZx1BztoJaXC/bennOx5Wnca54lkBX8ySvxqICAcPgwlFxRi0ehlm5aPIdcwNxNfNQ5Fg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(39860400002)(366004)(396003)(346002)(136003)(451199018)(86362001)(36756003)(38350700002)(38100700002)(83380400001)(6506007)(6512007)(186003)(26005)(2616005)(2906002)(316002)(66476007)(52116002)(8676002)(6486002)(478600001)(66556008)(6916009)(66946007)(4326008)(5660300002)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zpT5eTu/+vnNpgikL+oMLZYey+2SuOjn66NmlI+R9EwZBFUig9/QsygkqsTSZdCWiFSm2NpFI9gLR0ZeMD7jaML/dly1HSgFcDT8dP2lDuaAJvTE7kbndjTmOUP4NN2JoinlHwdJZnKV289ypo1mAvaFD12j22gLTvIY7BeUb1GbPd2gikAmDgHdCbeNRPsNPbV/gX0ycz55uW//jNdp4YlwhSWuL2AoX+TL/5tmH/nyf43YX5Q7ecmyh2BDBK9L420TCf1BKMKZew1msxDVr8LhIC9P4q0v3xZWWtLZC1kdqDyN6i0A526VYzuIXdx4xlcPSvP3EyK3hsPzp/n0aRlUKL4dJyx9tNRlpx11g+Z0bx5d/Yh+PFG0G7qvtXs1ic/QI8w05rUtPESQbWMjAvbdoPeOVU/Byo4SOO9nwCBZHjFd5zxQ/RflMH+aCh1/08cpGYpgP7pCToVlzWzQOybeg+At32kUa9PWGBFomVJy925gtNb4GFVl1IusPikksZOUide9IxLSdJlrvXhrttqK20UhedFrci7RGJMTksrpTP+CrtpwBFbC6E+GO7/nTZeNhYWou9kG9TJ7yjeymdlfFqigvKKf9DNbMypLsqX8TAdmGefq8Mdmjd4lllD6BHxwb2RtP9++V4Odd4ebgsBmgMuNpaXYW4zUMJPGQxBPLiX1NcwSJ9WoZee26Z8QY3w87vfwEwFa09jt9K6WsGg810gvHfMlERUQZPMyPz2ShJWUvZhhHMHNdAzYeGTiPAJQfHYcG7SsHVQClawZn8AGs9bHpOttjdMITsnBOZSJL88/+hIbD49/2aQUHJhaoR6wus2UL9BPFZwCHZzMVkYVk7eGQIS9CefvK7Evl3LsG2CRlwbd9snmTlZ8y6fzoTHuMzJxpgcpfv4V2ypXHZ3caxGOy1M/S62MEkJxSbkyl/0XAtORZi7BAT4iYNIqzn8vdhaQx5QBzeHBvyly7pl+Gsl7W8lHXolP109fwkWPPYSbJjllUrXfTEoW2wBOqfLtvvowe2lwqwmdtpABj5V6wqEdDV9Z3vxqmJjkY34veEBMp4pkfpDK+HsW9IDDbOJfiUURprJKpk8vKB7V+xkiGzvUWu0jNuIXxsqnnQiI6YGCvZ3cFAVdGSw5X0F3h9WkJ270Ce8RYj7KwQIDB5VAGryLUn/XcZ4KC8hX6aWi9dT1awZ/nhnYoYRr9JiDtE2Tsr2HmyzzSif1Iq49rIy0VuazKaI/TySzGp3IgtAbUEOekNqvXPlePDVk6ojqiOqPIAwS4YBflZO8VVp9pYA5EmCcvwLVWXaHVsiyQlAayeRTRMtoLKUXmwPu4Yq0gENNNgP3hMqntp3DDIQjh7cElHZsYYRo0DQOYYzMdAPoqANVNCnL0x1abD5lKL/XQp/FVbeaMxklHK6g4PRTi+28jNp6b40772/ymKutKYocJdZhXd6q56sBnybaBGb/yQu0334c4GvfeXgNO4bUrroOy7HpJBdWJh4Q8/S8dGQ8NmODduXHMhCXYHW84VDsx6LR1UTtZ59/GIueiW2Kp5iXBcChLP9E4ECm7CyjcWLGs3rM0tbc6D6HvUJrhXNOfbaVx4q0/OxnQHAz0nkdgoy5Dd/BXLHxrsJz//YhS5s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73d2910c-c2e1-4a0c-70f1-08db03f805a1 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 01:59:58.5389 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qMd/7f6+BfK6yKq5q82XWi/FEbD1OXJFm8mkPlCqsBBQpMh6SFQEHC9XRapXR5vzS8mT6B+R3Tf5N72PfTri5mdQ/gf4Ct21ZGUFuXvKiSyj4o9dQN+cntn+PvjmJA1X X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10342 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto commit b43b8ae87c8e0a8 ("ASoC: rsnd: protect mod->status") removed RSND_DEBUG_NO_DAI_CALL and rsnd_dbg_dai_call(), but these are still exist on rsnd.h. This patch removes it. Fixes: b43b8ae87c8e ("ASoC: rsnd: protect mod->status") Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/rsnd.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index f8ef6836ef84..a09b3612b7f9 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -891,16 +891,6 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type); dev_info(dev, param); \ } while (0) -/* - * If you don't need rsnd_dai_call debug message, - * define RSND_DEBUG_NO_DAI_CALL as 1 on top of core.c - * - * #define RSND_DEBUG_NO_DAI_CALL 1 - */ -#define rsnd_dbg_dai_call(dev, param...) \ - if (!IS_BUILTIN(RSND_DEBUG_NO_DAI_CALL)) \ - dev_dbg(dev, param) - #ifdef CONFIG_DEBUG_FS int rsnd_debugfs_probe(struct snd_soc_component *component); void rsnd_debugfs_reg_show(struct seq_file *m, phys_addr_t _addr, From patchwork Wed Feb 1 02:00:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 650165 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E43B8C636CC for ; Wed, 1 Feb 2023 02:01:59 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9C6D3208; Wed, 1 Feb 2023 03:01:07 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9C6D3208 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675216917; bh=XMjYOUM7lUqz+7TUOX8F3LAffkORiKtfkeVl+wyC898=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=vHEDd6aLGtpUC39xL+2TIrG4UXkFK6owTxz8ZEsXkQLu8i4yA6J15mY91e9cn9Nl5 J8LLHNuKCziJcO8s/pSfd3cpguyEjkRWQYn0uIc8xsacl5mmpG31rPGGCX/byAtRr3 1+vLsOFgM4K39OPEqHsAmPtAqU2YhSyTBcQhfSEo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 4DBCCF804E0; Wed, 1 Feb 2023 03:00:17 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0A14FF80567; Wed, 1 Feb 2023 03:00:16 +0100 (CET) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on20703.outbound.protection.outlook.com [IPv6:2a01:111:f403:704b::703]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9445FF80552 for ; Wed, 1 Feb 2023 03:00:06 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9445FF80552 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=KJVaUtUY ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KOR+VwI7WfDPbjlhvIK/4cBaO3sbM8PyQBT0OCRE2vqHTVYvJpF1grxtEQ/0AhO077otJ+Wr0sSohu+mf4rG/s5e9ZZgq6yBV4zG/zr6OlASblSypBREzCpR03tgqE6uGCuSZPXYZ7YS1SCz1akw29DmRJ1HEokTKXyOGsPN9nNGKiIhtu9EQFqhjIQWM4znyfKSZtzbc15AHNIaTC/lyr/+hYKYpk5SUOWGh3zUE7WnV4w/vnYgDwvb3PAABwhI/RRqLlJMQoX4f3k+GEJnAR4JeU5uFTktBLN78iRWavSxC7WQzhfDTwEy7FBd66+K2vc94dSXwaEau6peaGaYWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eX0BcLYnTIDVQBDU3CTAwjiOFtV0ZcnRE+rnAnq4VnY=; b=NlMjTwOqVm1c3LMJKsJBiSYKJzkO2NRZvNbAMBTkbEgJeYndVzM1+a3TLcPVIxeoCSP2N3FDkr8tI/jFzEdaO3nnMtVCcicFLGa1Svp17066BE7rh42WupXEpOY+XaQuVZHqRc6azzk3/XpqIFVrrdC6c7haV1edapRI5mDesqK6TZoV55dXbj7DVOuQubHpLvHnz7Q7DUfKCtAf0BH7SMLkz0LX7rnnzE46CZux+duAA13wjlK0nPJ6wDiIoydHOzQSq75FkTBgrKUFaX2nkpy99hwLels/1TEKWBtZmjvEt/8DHKwGq3KPKO+hvAM4wP2uZ8JJvFpMMEtZLYpj1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eX0BcLYnTIDVQBDU3CTAwjiOFtV0ZcnRE+rnAnq4VnY=; b=KJVaUtUYUgbLwSlpHJtvo2IOU22S7vPT92U8ANJ77BP7GkcuTeOuuIy+C8A8IdrOtuUESbKAtXXFgSzJDWIy0iMna2+/kWT9WheDzlrCbXr+VGvWHjCQwu5BDWbIyzPucxkveMDXWnoTYyGi1pDkaOYmvtlxMRaffNsrPZMPhNQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB10342.jpnprd01.prod.outlook.com (2603:1096:604:1fa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 02:00:04 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:04 +0000 Message-ID: <874js66t7g.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 04/15] ASoC: rsnd: indicate necessary error when clock start failed User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:03 +0000 X-ClientProxiedBy: TYCP286CA0217.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::18) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10342:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ccffa75-b039-4c5f-32d8-08db03f808d1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I1uyEtMMYktlHj2wFZp++Sbrqn3y9dqC+d5IRVGDbAg+hf/0nDcqA85IS0EWGtEwLMALNP3S+uVhttTLfIZj+RESYKN2QUTdMLMJVQKVzY7e1F7HfIZhjm6Ei08pTJKQ4fQJv7A2xl80ujTIovnjIRbSLUCIuI4KoRipl0sIx3sEijuvexwqF5xkGIA3Bzaa4BjPAKe/sIJOdXPvniRjjy3dFgXnReKfuT9FX+gPL2LWdZNE86XmHYTlBjtPiLGfmhn++jjy/sf1L7yBkzvLamPTGOHiiv85JoDjyQvE9Me6ElTGIQjI9skNvjwTxTtlbMH7YPsX0gUTabRIwfBBJyt9Zd3j4cLrPaRjyyr9Ds0q9H/y5W/uUqfVnBbcgTCbCZLZ/gHJi/w1W9XlbXxv1r4PKxFPGeM97GlnngUg0N7vuG2YaoNHdxpUq4zs9fte2nYPH87K5cv2F2u5pVfT8J3hOypJM9GDeKN/cdoklhagl33+SWmNfbDpERj7I8qLywKVXsmWv1qwHhUcu6I1uCm4ejICoGsBnBQ1iw77jGzG81nGTBOklGy+Z8gmdOKOxUStoYQZ1VitfweeLmyPM1UNAW4h9rUtDmfAwEduQ1BUzPDOH/ioN6ZGaASLxkmp2hC6bTqj/DVTbou58ZeQhyUDiBxt665Yz+9Q7Fbt+efS7d8N3Ji2CSo8RRtfNUwG0y6BdsRh7spOAJFEYG0oGw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(39860400002)(366004)(396003)(346002)(136003)(451199018)(86362001)(36756003)(38350700002)(38100700002)(83380400001)(6506007)(6512007)(186003)(26005)(2616005)(2906002)(316002)(66476007)(52116002)(8676002)(6486002)(478600001)(66556008)(6916009)(66946007)(4326008)(5660300002)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Hvd/Vunb4CtIFEKQYafIOZlNW8zEBC/9tRrkq7KssIaPGGC/6vU7yF3DAbJ2vz5mAMaknGy6rP3PhXLRVLjaqBioAYLO2tbE8G/jm085KaFWh8LiVuNXuQiaVM4FWLxp4yha7WTgwT5Tf0Cj7PqmgV7x5NEJbO2Q+tdiX+YQmKfWntn+fZq7kWcTz7FM96pJJQRIDfQNGrObsruNShKKrqXTaLJzGk7k07tmZj7DLMjF9cFnK/RZbRrvbNJmFLQoECUAXZQ4J5Y/iH9cy9491+ii55j91Y0nXsdRwGj4tflKwnKh4B+OVLcoL88QAJdWidcnIxwimORMSKVNiizWiWeF84h4otoiPr0YXnB1Ta9QWkG6nRVb78qsszMemZ4/zNLW1bjUoKhj8eFYCAERPsWtJy3chCwukMYREBnbCV4Cy1tTFIVnhj/2jX2bgcn2FNMa5d3oX3TiBczcwj6Q/BQXEAePiahHjHmjZrqvLvCw8hHy85GmYMmdKOrZJMosjbbQVLAB9+86DMQCu+8Pf1tJ7NFROLGlwNovZON/FnxUMUjeP5+Fa8Hv9SihVQGJhBcb38lqbFi0aQNMyoJMaEUIduKlnGC3zeLY+YrcsFnm0h/ygXMSmz+h9Xou+MubibRDHj0nA6ljTKZADGWw7p/AKTUGsp9IMdcXRgAC4KhQrqIwEaxQ7UuoYlIXnXkpejAouUOiUhViww/dGgx44+g2R8235VhcM99ADtCsr6/hpH+A1//0S2i7TlHlaq4VoyVZe3bZebAkIz0IbnHPHimK2FMIWRp+ro4KMmWRVBL/oGqvwYV1A4djRYxxem9BCK2An0lKaBdq0WSQhkarGWqaG9wWHS88IbKMJVD1H6aE7AxRsPoRZ41UHtdRetelWfAOVCLRcG3vYQEsWo8zfWO2ZkrmaJ5wI6Q2h3CMNP5jrt9qIbALkHETOVUqKai2Fz4V4BV3BIDrYXBAntuSbu2hIp/1P7o+8pCAM1uaO2JkZRNCQUdCHMjG3qpVxq40JMjtKbGMnnPA9hPwG91bJeOxK1mS7EkhlgNmnbaQPul6mEj0udBCT8VTXe0ZIACzq/5I2YoKCbH5CZOF30g8MdFbURxX6xPigk8DZCouJ9E/zoL4Ox1sclv0s0yrD95C+H1VOsXmVF70fzSEqKxUc6cG5RvZ+n5oQbekb2q9mxGiTGcWshB6aK3Oc8uqQposdQysjYPsXnZGJW9vbHUAnmD+/hcykvX0eA9rPyggi1ug8xg6CZUiQVc9pBLy8johFWcKwKC8bNNYNbSQGAowA61cKoH+91Md9eTl4c6dtwfhbiqgK4ET6Fmi0gJXhky8SzeZqbpslfv/sSqpQf06nExuhemM2Fe2kQLxCs1i3m6/F3wXy9ChNlmFrlx3z7k93S6OYhsINGRHd4UD/FlcrISixWDsiexgANQ1UJegggMr9hVMYBNtGgYexTGMJq2iHOZla1tGDUds1vQO7Y3/n5IWCpEOBbg6VMvhW1jTbLnH4OWL7Vi8UyiiK/z/Anwk+Id6zjeNIdiKJ701MGJaB86KVwG2/UYEWYPQf1h4qmKE4O5i2DPLlIDoog3+GRry9LLAogBVxI5uyAhICotQC4qlyga/Q3aY2zL/uonhBYs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ccffa75-b039-4c5f-32d8-08db03f808d1 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:03.9960 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: L444AxUC4rY/zqEbX3ihpIkQQfyXgM5OAN5RGn6kbeN2RrnlULTxw9Jg0qWi63Qn63Nu9+cHgpKsAHkwwIiTVd8RXoHNg1ihEDGweH4MesIBh7CnpLaTJ+b3KO8H7ULM X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10342 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto rsnd_ssi_master_clk_start() indicates error message if it couldn't handle requested clock/rate, but it is not caring all cases. This patch cares it. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/ssi.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 7ade6c5ed96f..8ddee5b03ece 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -303,15 +303,14 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, return 0; } + ret = -EIO; main_rate = rsnd_ssi_clk_query(rdai, rate, chan, &idx); - if (!main_rate) { - dev_err(dev, "unsupported clock rate\n"); - return -EIO; - } + if (!main_rate) + goto rate_err; ret = rsnd_adg_ssi_clk_try_start(mod, main_rate); if (ret < 0) - return ret; + goto rate_err; /* * SSI clock will be output contiguously @@ -333,6 +332,10 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, rsnd_mod_name(mod), chan, rate); return 0; + +rate_err: + dev_err(dev, "unsupported clock rate\n"); + return ret; } static void rsnd_ssi_master_clk_stop(struct rsnd_mod *mod, From patchwork Wed Feb 1 02:00:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 650164 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9A6AC636CC for ; Wed, 1 Feb 2023 02:02:22 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 20420829; Wed, 1 Feb 2023 03:01:30 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 20420829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675216940; bh=CAc1Hrpa/1ttWCcTuFg8ndHTOr2Kw4XsX2EEAFE1L/M=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=n3HoR6gg/SCOemppQBKF7Khe+8AJeKIUS95FqZg6qUBLHS3NmDsCU2vkkEYScoNCC KiXiglgl7kZsnM6tKkfR3+yW3WK4zHdmnwVXGoo5FiwVF66cE30wIYFEKfGWAew++4 gSikKW6XUtye6iSoYZDFmXKaJ8pJSzOGiJuyK6qw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8CA90F8057A; Wed, 1 Feb 2023 03:00:33 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B0D78F8057B; Wed, 1 Feb 2023 03:00:32 +0100 (CET) Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2070a.outbound.protection.outlook.com [IPv6:2a01:111:f400:feae::70a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1BCFBF8056F for ; Wed, 1 Feb 2023 03:00:14 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1BCFBF8056F Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=MHsuGOE+ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LE2C8potvQJxf2IW375Df7pkdBlA62+jFmcH4+XeDM8T1T4O/vrC7K3X/ScWopvJqM7ilyeSmVdNc4Uo83JL/lTQ6SubA+gwkNVs32XNXd3G2bvFPzYsXlW8xiZmAgcokul8mKB76kM7DQSgXjWWLC3OA16V2ZKkceESS9060H++bhV/1o9ELtV+Xl33Ss1Z9msza4ZU/bZic2OUAabXoRIjXsWlz7n69M03Kw+eM0iZMmVd7loRdJlTxy7IjUKZJKYH1TUx0+okbb5yLbGaG5EagtkZA1OyiBqBGWeEIdFu45M0d0sL2Go3Weq5kLpZQ83Jfk6HbPc2GYKCQGbVOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BqgI3iX66aDYaaPaSBMt0wOzUgHFjXkU8sB8qsSvnK4=; b=j8gHEUj0gEUQmmK3QD28tAgfLUIHfr4XhuwwgbBZlUmIdFhOf5ws3rW9/QKG2Ch2FeFwojucp5i9qxd8y9/2L/zItnn+7jlmeMVXk5nQcHFjvhhhE9Bwe1mXSGn2z1ihL4/RlHRdYMVeZA4XPN8Xs0P2DoHbtCK6gGzCgfz6Pw+6aNHBP5NZ3G20/5tMr9uTHh44JSQT3ysO+0lb9X+vQ9vUCu78gZxew+ziqJmc8xK9iMQfrRvksCcr9nZMebT4eUFfEgFAFcBrhCSQRXF78zzf0BfvIErOdqOFuDpBZwcJpVd0ZP94lA1ZFNVSWuZwFkk124Wg7VZIraplBZw+8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BqgI3iX66aDYaaPaSBMt0wOzUgHFjXkU8sB8qsSvnK4=; b=MHsuGOE+jdzU8xhVF4A3vST5nkdjywXz6bydcwqPslC/FtoBZpaq5EmPLomziu9vNViQGt2kTam9A9MehIcPCDtLrXXjv54WvLCntB6JhLsN04cNNWn9jIuc2AYB3EV3BUySUtFTW4Y7L5vYC75g8HpQRvJJgdG22dM8or5vU+o= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB10342.jpnprd01.prod.outlook.com (2603:1096:604:1fa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 02:00:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:08 +0000 Message-ID: <87357q6t7b.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 05/15] ASoC: rsnd: indicate warning once if it can't handle requested rule User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:08 +0000 X-ClientProxiedBy: TYCP286CA0141.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::6) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10342:EE_ X-MS-Office365-Filtering-Correlation-Id: 3bf15ef8-134e-4d52-abee-08db03f80bb9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pgunDnXx7d47ieqLBHgD34oaSuBuBcW7uWJKINEJiDdJE0/suhhH/g0HxymnnnchTivJYkTEwyvfwaVF6fe74v841zayLAQDEhkA2zwlojZ2I24CyxFAZx5r7eZuOb3HP4DTORnHG/xW9AWu6Fbqy3g2KJV1TtSvLMn7Q0yM4Ht2xTnZLLIrjJuGnPrzFhWA4NGkpxfAGgl5gz+wY5j2adBJsRSx0YQ3qThjhZiIPWo5uFhV34eH7upW/ighqXliHf2O0IXyceAn0kT0q6rQzo4DvV78WpaoHPA5iUrQKDAzTPOe6J3g0v6VWnhGPQEPF3+MA+D6sWAkxbxIkaAbxke6Iy8YuKvEtVUkAcVDy8nKTMOIYWRkO1jWAN3RooaEFCbVJWFXPaTa9ZbSxidS8wGqb/Mp00YVmOVVKc3wvRtC94/D0j4bnHvWVPLSnPxKk0xJi1b0f915onyr0BCwfuXfhEPKMVxRsmoWlGlUki/b2yJ05+usI9QWWAMp7B2C6R9/ZD3gvvV5izPaoqB0m6C6gch60MpfIdA/i1hQXMqTnH99rGwF+qu6XzDRJcOGoap6PuU1+R7M4kmmRe31hpmfqo3PB+/wgQYtNQ2/dY+Zl31bUneo2+ncYZW3Y0CVw0Ga/oXdA42/nPo/S2HKNXMSvPqPxtOKcauQthGJYE1+B5uKbOPaFpqt0Q3PZ4iw X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(39860400002)(366004)(396003)(346002)(136003)(451199018)(86362001)(36756003)(38350700002)(38100700002)(83380400001)(6506007)(6512007)(186003)(26005)(2616005)(2906002)(316002)(66476007)(52116002)(8676002)(6486002)(478600001)(66556008)(6916009)(66946007)(4326008)(5660300002)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SZN8BetLjxvlDCqekab7tgAaTcfgYkvBBOrdtHMK8JK7xzXEd0zzsxnH4ECYIX6QtWdCo1lqKQMCL1vOnDhp1rnFZXXiLHiE8OFuMseZ8mZUU7SvD7PrDWxgbnSYnU7YSvvdpb/p/12W3FLWyTQ1ASruxx+dZCGE4Dk9Ele2hwmuMDBCeTpVNkCBWho4G9pMRT/9Hj2ge7hzPe5iBNIrMFbalGP37Eqd6u1Z1HZ7i+5/b5r7g9yih9aeUlMS7Na43Tro4eGXME6BxHTt7CGH5/kTA5QAQomB1m4pVo3FYEkfMoe/1wujD1kYpZ76VcwYO7EwQnn73+0V1G1JIxDrnfzKuGkCPZo1M6woiFzdM971wI/khf/NPhSWddVUpfICj8iTw+HdSjdaoDmAcbbc4kMVCZwxtwdjXO3MGN2+9Ta6LneqvOhETMExfwbjHciperl122RteZqcxqPDQl50n5cDQPN4A6x0AJxoYNA4QMUZXi+qKEiFSDmLE6NbwkcOBao2IBRWPdpkOnDi5jUjXXfkcRtqHItVorU+VDliABI/6hzCw8LG8ZIBuYbEky3N2yN0l02iicoTyDQ/ISjNiVXZCPUUw995aRMFJw0ak1blqGQVyiyQcLrPzQBNJnEzcyMcieZNz2QkzHv/IlPrk+My18rfTXdzny5YGf+2QnEr0GANetDy4R6YioCHZegEBe5MJ64vxUQ0N0K2u28gLYv3dWf+EpZu51n0pyA9HyXOYewetV1U6f1QFWAEbMyQ+40533gshniGDqZZWxx3OMFfKkzajyyoSW8aJzo8tR4ApHi2LIPCWFNM+HKamoxgXe41+TyhhF4pSpZH/HCYK5Zt7a9cIlsg6ypz188yxXakeyV1cwWiF7V2OF+ciSZTRmC0CKpJ4g7NAqcC1Rkx0qtLFhCWCFSnpUR6ZTc92bYTl8fJNlU25I1sAOHbucuD8YNmhcIYzH9O79TUUt8hxncERMjieicqdi0teewpVjZ56kpz4RcTWlMkWrJzlcIT0tD3ePec3oBvEhTPcqi7nkA6XBQmO+DH4TZSsxKfjn4Y2/NweA8/qWSG9hEsj8Qfx/C42GYmUe8VBuIH/ZrtCKqGghtYW27uVbPhYR5SeNURfgPdnuOOmADA55pdYVLSKfLTX339ORmrLZ7r3ZgqJvUw5LS9ITGexyUKAlyZTQHSfyLezD/Sp8yYEILf9CAUCvUYCwwDYPixtiavKRuLhHWssixzsJFTZNWm1B1kT35mkQIDzSTPcNG/ZtyA5d4PeHshoYcGEY+68JCLl1tX/rV+YYMM/9mwyYmEZdRG8VY6LwhrNtTgsWZYTpUe576TTTqNWE2COxNZAipqk2fmxLK+mtXGJFYFYG7crMhcB1PnZ7MYSCmVfoNxijWa6A4ZXd31/42xKKTXQo8PHXoh6fMz6D+sHn1hcmMk43/kGJN7ungFUw4Z8Y4AS+yxzldOm3oeCLJQIgYzxlPCw2VdOwgu9aHsA2hV3JTkPpooaa9Y3Wxym8FmnCg0QpiGvFHRA7lrtRvLSIfWyxp24jiepEN5WinLw8Gr7XYL7B/iERfzbIdQ/3foiu8rX8jSdgkHfhp5fsGn1Mhg2uZIkWw5OG8RiUlVYvk0Gnjimu01DQo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3bf15ef8-134e-4d52-abee-08db03f80bb9 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:08.7484 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +lAhtW/H9jaE59L8ZtdETY/hxN6i15co0S4wwWAiwlIVCVSIabK+A0iFSuoNt1aaGGyVKPNftiI6KYsDrVNceUAoCa2MIUO6P2N4Y6sQXF6dQj1JCV0Fv/sf8xva9FiS X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10342 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Some SoC can't handle all requested hw rule. In such case, it will indicate like below, but it is unclear why it didn't work to user. This patch indicates warning in such case once, because player will try to similar rule many times. # aplay sound.wav Playing WAVE 'sound.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, Stereo aplay: aplay.c: 1359: set_params: Assertion `err >= 0' failed. Aborted by signal Aborted... Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/core.c | 19 ++++++++++++++++--- sound/soc/sh/rcar/rsnd.h | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index ca3a0f285092..3de81af41ffc 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -869,7 +869,8 @@ static unsigned int rsnd_soc_hw_rate_list[] = { static int rsnd_soc_hw_rule(struct rsnd_dai *rdai, unsigned int *list, int list_num, - struct snd_interval *baseline, struct snd_interval *iv) + struct snd_interval *baseline, struct snd_interval *iv, + struct rsnd_dai_stream *io, char *unit) { struct snd_interval p; unsigned int rate; @@ -899,6 +900,16 @@ static int rsnd_soc_hw_rule(struct rsnd_dai *rdai, } } + /* Indicate error once if it can't handle */ + if (!rsnd_flags_has(io, RSND_HW_RULE_ERR) && (p.min > p.max)) { + struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai); + struct device *dev = rsnd_priv_to_dev(priv); + + dev_warn(dev, "It can't handle %d %s <-> %d %s\n", + baseline->min, unit, baseline->max, unit); + rsnd_flags_set(io, RSND_HW_RULE_ERR); + } + return snd_interval_refine(iv, &p); } @@ -922,7 +933,7 @@ static int rsnd_soc_hw_rule_rate(struct snd_pcm_hw_params *params, return rsnd_soc_hw_rule(rdai, rsnd_soc_hw_rate_list, ARRAY_SIZE(rsnd_soc_hw_rate_list), - &ic, ir); + &ic, ir, io, "ch"); } static int rsnd_soc_hw_rule_channels(struct snd_pcm_hw_params *params, @@ -945,7 +956,7 @@ static int rsnd_soc_hw_rule_channels(struct snd_pcm_hw_params *params, return rsnd_soc_hw_rule(rdai, rsnd_soc_hw_channels_list, ARRAY_SIZE(rsnd_soc_hw_channels_list), - ir, &ic); + ir, &ic, io, "Hz"); } static const struct snd_pcm_hardware rsnd_pcm_hardware = { @@ -970,6 +981,8 @@ static int rsnd_soc_dai_startup(struct snd_pcm_substream *substream, unsigned int max_channels = rsnd_rdai_channels_get(rdai); int i; + rsnd_flags_del(io, RSND_HW_RULE_ERR); + rsnd_dai_stream_init(io, substream); /* diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index a09b3612b7f9..3e1184f56ffd 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -513,6 +513,7 @@ struct rsnd_dai_stream { #define RSND_STREAM_HDMI0 (1 << 0) /* for HDMI0 */ #define RSND_STREAM_HDMI1 (1 << 1) /* for HDMI1 */ #define RSND_STREAM_TDM_SPLIT (1 << 2) /* for TDM split mode */ +#define RSND_HW_RULE_ERR (1 << 3) /* hw_rule error */ #define rsnd_io_to_mod(io, i) ((i) < RSND_MOD_MAX ? (io)->mod[(i)] : NULL) #define rsnd_io_to_mod_ssi(io) rsnd_io_to_mod((io), RSND_MOD_SSI) From patchwork Wed Feb 1 02:00:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 649210 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A0D5FC38142 for ; Wed, 1 Feb 2023 02:02:07 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6B77484D; Wed, 1 Feb 2023 03:01:15 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6B77484D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675216925; bh=IgjlsKVvdpy1x13nm46AKK0bCSaS5btydejTuueHaIE=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=REleZLchNsMYA64y5eqwQeEeNBmBEtSEKBy4c66klBhADkQAQhIpsWe6d+gZjVKaS WKV1E7LZ0sCItDgbOB88enehDPRj5poc1zpQH/I1tO/LaXnzI+nfhz22eUtcezOukN xgIpBMGhmEuV9UhNHUJnm3nH6T9aTOjtFh62qL2g= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id EC8B7F80524; Wed, 1 Feb 2023 03:00:28 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 732F2F8053D; Wed, 1 Feb 2023 03:00:27 +0100 (CET) Received: from outbound.mail.protection.outlook.com (mail-sgaapc01on2071d.outbound.protection.outlook.com [IPv6:2a01:111:f400:feab::71d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6D852F804EB for ; Wed, 1 Feb 2023 03:00:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6D852F804EB Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=msjWe6TM ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UQYrfVmZT6IXgPiY1ydo8cQSOPPM1FJj56rlYyNO/tpeAlQsNY6EYV5Fcp/+8n7MrBEnldP2+9o/49Apg0gxlNF7JLlVQX9hcA6AjZJui7fzSXQvzwJ+2C/vDhsgBH37v0ojcolore/E2NtDT7WNpl6LQ5qecNY1bzCKb1BE52j/kpsugJX16l58nrT09zsDw2/M7UgcBqr39vO1OILQizPfPWw0+TrH9dd7LrTJSVfEwl4H90Cp+mdjLprujccM7z7xXNHElOujqrZG763p7CX2kqMYjY+nUrN9e8vut0m48C9fPtaOFD0F43DLO8oW7E8LJlotx5krX2OokS/b3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VDbUFlUtUZa6HzeKA9B+Heke7MSpgzLdP3/or/wzC60=; b=hIXYHo9odLwB7DDJjw9ErLfLj8/pFic35xyiBFB7bSh3lp5GxT0ibsX3qV5K2xLcc7ZsI/U1DUrNCIaj8JVSfibv5w7AqXGAw7Xy2hgr+vIxXJC5sLcLk2gYfZLR7xT8bf3T57YqO+o3ngC6yXu++8t2aUujWsGa8pKK/D0acUzf9NdbNedec6sFFaZVtKauqWDeTtAL2eYjOsw5XM6XE4Z5eEu/arqlmvhHAMjT6IZldYM7fjZGS8bargnviPC6MuszpBrbacivkToWcB/f8ix4c1Vn9JTBjiQ7EDjsjIslt103j1Nf5S7NCJFui83PrDO95UJOKlOU6DiArmhhUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VDbUFlUtUZa6HzeKA9B+Heke7MSpgzLdP3/or/wzC60=; b=msjWe6TMmqv9zAuDuURAJbRGY7UAfjyHIUdjTIvXX+k1MDYHw5OwRI64UN4ZG2zQ/zdiHB4Lh2lE2Isf1dT4GoyFxpPKdfkUBKU/OcnTkr4aQE7d7UEItaK/oSskwT0x4nCMC21+R0LQzR1v/0gpsx4TkLbV2drfeP/QQCI+SM4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB5600.jpnprd01.prod.outlook.com (2603:1096:400:43::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 02:00:13 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:13 +0000 Message-ID: <871qna6t77.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 06/15] ASoC: rsnd: use same debug message format on clkout User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:13 +0000 X-ClientProxiedBy: TYCPR01CA0179.jpnprd01.prod.outlook.com (2603:1096:400:2b2::14) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB5600:EE_ X-MS-Office365-Filtering-Correlation-Id: 0121844f-45fa-49b7-9c2d-08db03f80e6f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3ysbMOKI5HkWc8AT+cNglTJC3H3Rq2flNH0yZzBYbTfVUoOXaqGuILl9ww1X25jV/draV5On5uAeZmThBoYi74XUFhKR6fb7maxLNwBG8j04CrLQP1e5exi4ks+X2yqQ6W/N/yQdW51sIMA/MBciw8eJsNyi5r2RjsFR3SBrmeF0jDB78tQftj5T+0tVTCNaEfaM8rr2A9WheA85L5SuAhjFIxH8D13MmXGtyi2ms4OhGy89bpXqKzmd4Zm9+dHlP0MUpiIcZ6HTVs9GTWgQ1xrSlQ3X3WnUQVps2R3UdvoxBs1njQdJaCoJiZnfO4NCVCYDrQXJ0KFQmAlrjeGwMSGKAbCenMhVM/GKGwFp02VBK1vR6QdGZajrXnisKrUUeHt5FBc+e3FxB9sFJRsC5HY+0PZag9B61mV0QxkRp0gtqP/gqyb9mpDwnr8UR6Hy758GBFvuNhH7del7Y/A83POtSAw6yQKE4uHi+PVmHCYHaZucA69P+xkr6aFiwxiDTZgm8jFKEiU/3z7qAQoM95eemg4/3y5PFTqxynD+P3Y7ha5XiKYwX5xeUvY4YGH3+8sr5B7jqRElPwCa5sflYR/fIaGOhlWiG1+td7TSwqVpkmLBroupS47aUuEpjTp0JMFVvH9r1E3SdMvIqX9QuQr7rbIsT+opF5n3ZYX/LWVYE8miG0rQjCi5cTDEf/CSKLI8HsOE/Ii2fojt2dohRA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(346002)(39860400002)(366004)(136003)(396003)(451199018)(186003)(83380400001)(316002)(41300700001)(8936002)(6916009)(8676002)(66476007)(4326008)(66556008)(66946007)(6506007)(6512007)(478600001)(26005)(2616005)(52116002)(6486002)(86362001)(2906002)(15650500001)(5660300002)(4744005)(38350700002)(38100700002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GWYQvjMkgl77HmoBAukLXKIYQJUy9AxDq77zxskYDBb5Lw0S5sXzkcFch+B69Q08+F2FC5x3KB995yF6S29HjlLIh6TaZ7Sq9+UpT5A2idXfjPOlLh7xwhFtGKPQxDh6V0ehrJCPRMJqvdv4pzQK4yjRUTiuakuPBcbxGGSs69OKzucVtuCAVmwiauD0P+erWOceMHeOUAjPWz8QPCz4LfKdNjviT/4yWERnkhJ/pFOpy1y/0kLDoZPmNs6iwNAmOwPMeaZxf6KwOkobTVZxE/TnirNELeHdrJQ1DOo8n0EjGTSlGIm3KFwmQl/acg81ujak67ZaRy8g+xOJaQn6gTxBmVd4HOfantBhsFJlAW1YGe2ner8Cz+8NmRgfu8izyNmPXTqUAO5Y0jh2mP+3BZJXcwZastb9mEOTz5ilTcH0KcJuIuBeuBgXq6anPXrartd2Z4C42OZBY70JuSmatbkqXPNDaZaAml8ugCavL3KdSu1AHFsHNYWRmkAJ8SBEcw/pUEZ9AC4lJ97TSQF339GPABYVXyHfuim1p/99TVuMvXwkkxqwuXZ8ejDTbnBHNt3KFBj4F43jXvm4p5Rp4z6uwVVNtY/QLaQeLUs7wE4BtLq0AARDzQY+vjvar8wU1xyPqgW85Vz5FXGTsz7c98IO9i3/edqyTSd4Nb2efy2Pejm9/xl9xD4bkbrYll0d/rXWVIe1cEFD48X1lxH+lL0h5AwLOhHs8IXXhFSGx3+AGC5fAXpPr/mTPuifcUVynd9V8m4oLMKmlxgpjOl2/pHJMhU6UNjdOL2t0WAkyRqhktsZX2QoYSjZNZ6Zg8qdK7z6rWE09tatWuqRDCe9g+hmGAKDKWlW3EVZUeAPSLXWGt3oqrofY+NOs336wT8a0wBAPqE4Oja8EnhEtBRdtxKJV+LCJtKK2zs9y8nkUaUOk2xfGWOwmpsDaXPEdhWU+UjDpuK8T6AvjSkMfnIalSJESKLxEVEt/WD+/aMpBbvLmLmpjhPJHejcJmiv4N584dAU1YnTXmvQtPMgVSbyZ4FoIFHfIrVpfRO6RYA8u6hmEgdY26Aj0jYdFSBpmKKzapce4mc509pRmk5HvXIqS9hr4B+BBTlr6kJ2xZ2/YkAU/75O9Q1U49V1TGAWnszUfwPblavOU8Cuz2SHGN1QBUQOThE+XsYlqhGz9bgYDugDz24cR1thjIdRvy7VOfqd8OSWQf/Dje5EDerVbu4dv/p/hu1aKotuXB+pi/rT9dBZuesH+UQquAh//2UmISg/NYeYR0B7rNA2MuXxHJpZNNfsYkOXXo/nc8DhKHeRqGWw7TOBoqtgKYU3nnOF+LCGMPIYKJ9yMEnhC6ynQ7irEBOsq4jtYLT+2u9GJ+fFEzPvbZqZ+X9p3nTErWwQ0N+kLW4vnf96fvicf5iUhsr6wVK1IgS2JKwgcx7mVz4ZoB7E6UYrQ3REsew6/3QmKlwePDL1bx7FhR3rB7BVvnZxjQJcfWlcyKo5gbdakEaMHkz/2wbVKL5sM7C6d12WNhWbidwL1a81ozW6+cqvqIGhMNQ11PhXhiWrPZYcYC07n24Qh0j0Aq2R5mXzlAgOji/fyFlRqha9H3YYPpdufR3jrDNe3RBx8w29Qt77KVMMnc0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0121844f-45fa-49b7-9c2d-08db03f80e6f X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:13.2962 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hKSqtTJN4Pm7a5S/daKM7H9gIFfJtz2BgbtXQzaXIIbDMnj73RQ0nAuSnRhLxAjXuUzrdAWluOXifJrw6OZQysCAp0qf1y2w0L/tTfG9ilxpgsIIzzLYEpD73X0+Zt99 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB5600 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto This patch follows clkin debug message style on clkout. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/adg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index ca1e1281cefa..2c7958620524 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -661,8 +661,8 @@ void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, struct seq_file *m) * by BRGCKR::BRGCKR_31 */ for_each_rsnd_clkout(clk, adg, i) - dbg_msg(dev, m, "clkout %d : %pa : %ld\n", i, - clk, clk_get_rate(clk)); + dbg_msg(dev, m, "%-18s : %pa : %ld\n", + __clk_get_name(clk), clk, clk_get_rate(clk)); } #else #define rsnd_adg_clk_dbg_info(priv, m) From patchwork Wed Feb 1 02:00:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 649209 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BC87BC636CC for ; Wed, 1 Feb 2023 02:02:50 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CD24B1F6; Wed, 1 Feb 2023 03:01:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CD24B1F6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675216968; bh=NTJpSrWTMDoe6YpwlNI0LpR+uf0YLAbNI4nkTv/EvOM=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=s3QLOCvboR8btxmdh02elm6wEvE/fsIcA8oqZfbXxIEn/LbqbusiYcmaw+wVbE0Y5 lAtzdHcpC4oQoOGL+e8zvWbBxzWxcPz0ggltrsIidEusrVngEyD9gByE8cHfhIHPd7 i/aQzx4X1k2DV+TBfpyegEt5wTdA5PMI213C9DPI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A7F1BF80589; Wed, 1 Feb 2023 03:00:36 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 672A2F8058C; Wed, 1 Feb 2023 03:00:35 +0100 (CET) Received: from outbound.mail.protection.outlook.com (mail-sgaapc01on2071d.outbound.protection.outlook.com [IPv6:2a01:111:f400:feab::71d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 340A6F80570 for ; Wed, 1 Feb 2023 03:00:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 340A6F80570 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=K3Sz47O8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JD0nQaiGZ9R2jWqKSDPgwN6Ic1JSlJlfQrZzDXXUyslnJ03D1LpT0gcXykGqI2LKy0AG/VZOhaoDm3cfntUkgLWeu60s62PtWUpidda9hxkqTroVwuNuEITgt+OWtwVW2KeEo868JMnfSadcHT1pfJ/bwn6FlC6yoy/FAgN6sNj6uXvBHlthqilFB11Zitt3NJKGYv/L9TK+lJHuipfNzCf2/5YhEfWjdd7/q4mANgzeOje1mndqSUyY4TvdGnUKb9PwCWlw9XyQslg3TSfkMkKZO5Ip8DGNHC9xV/+VDOkAJ6T6tMhNJShIJcncOTSX30W6uCJTq7ou3sIFb4bhRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=coBHrlAr0T6W8W4/8UZ91ajg0ummsYruUap48JIUyjE=; b=Wsf40XxM9aj2aXR3fFwmXHsilVC6Fo1HotEO8Y32/bUVspoUXf+HnWEPzWiq1LGhqWgsopbyam78bBO72WIC+cxyGh3Z2c9U6bjY+02XLCTiDhjCtFsswTrRh3SWsSzibgcG3kwbEWFH1nGW6SfFF6yXijve/Hdq7fUY+1omLBXRXB0iH0cRCvfcd7iHn5QVrB+mMS7YiX8j/F9GHeJ3dS6mBdn7juAo10IBJov2ZnMxPPRlXlkF0W8OyQ/dHPRsZPOFdHK7/wKCqYaTuHcrXLPI0sHwJAprw53oYTvc0x/VHEd6JV/dnJexDK+9gPMxRrGHBy8pmJRLbOB8MMz9Qg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=coBHrlAr0T6W8W4/8UZ91ajg0ummsYruUap48JIUyjE=; b=K3Sz47O81QJqtT3BTX30sFpAyBIknKxtZ0sxm2iQipCOuH4A0R5JMeavblIZfB4cJX85r9ioFjwF/Xw+sjst+zsGngLyvyz3LmIRXZ2uTfGHPK/NAJJH4oI1F1cgM0aPTy3a2d723Q+k3tdpIeWtF3Y//Ggtsd47tPhsv7O7Mmo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB5600.jpnprd01.prod.outlook.com (2603:1096:400:43::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 02:00:18 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:18 +0000 Message-ID: <87zg9y5emm.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 07/15] ASoC: rsnd: remove unnecessary ADG flags User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:18 +0000 X-ClientProxiedBy: TYWP286CA0004.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:178::6) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB5600:EE_ X-MS-Office365-Filtering-Correlation-Id: e59347ac-0c16-41ae-bac8-08db03f81179 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tOfFPqY3qSabNYOZDMj4a9m6EoPVyG7TyTnqud5pWDa2Fy7J7K9w776AaY5efdlA72vub70R1n0hdu7W4ueQAzhTKriXQAzK1Vvq7YLVp08oTZC7rw4YYCakQEKcgw+pMkBrhiCzjNXhe5lOkfZKXYbUGzxOlOsUN0BOSSWOiS3dyyMnFrcPsbpaUW4GGO/Rb+yZL5aP+rP39jIvZfnhSOXsGmwyQgVWTg09ntP/1MQolxeVVesu4Zsk/8BlJH3ONg6ARflacOGVU8wuziDSh/E0jxoJyddh+BDEB+iS2dyXNv/9fLIHUO6ThmdMFSpe/1vhutXxOVpnqeRB2JKdnXG+cX09MWHWce/rHDz/gZvDvEjT/bcen5SLRSWOdyqg4TIFFIQyu9fkfcQdhma1Rs4oq0uyt1J61WNSTeh9TBQKi6+clMePm40pC2wx/vByzXuQAVOVhYRGcM6IXana7sXWb/C/qLUyFAzlcJjXDuX10GMZrK3hjMs5sf5rrgOv2Jj+BPT/5MdjUtOwUqSwD7KrKnKQ5zXx0DUzqUzshwrV5NVCL/cOaNEGTnPLRwWqOlc73OqEr6sp59/zo4v0+Nl5tj/GK6myVnvWo2Q3gC7EOW0g2yCINxmgtRFkw9BL9UzSc3w9xi2zdX0kAptVEyYlPtedtttsec7sobxP3GxPSytpLJbGfscR0BKUm5kwuB2B9+Cyf1qPl/CsyogxDg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(346002)(39860400002)(366004)(136003)(396003)(451199018)(186003)(83380400001)(316002)(41300700001)(8936002)(6916009)(8676002)(66476007)(4326008)(66556008)(66946007)(6506007)(6512007)(478600001)(26005)(2616005)(52116002)(6486002)(86362001)(2906002)(5660300002)(38350700002)(38100700002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wT/sFQpa4n/a9Py+MopkbbKeg2klgk2e5Ltk2OF79T+cbt3fLBCS+qnJ11/A11faOnMipZ8NwK0YmwUX86L9z4+gFOMCFa8bikoBHVmvB5ceoMCbz6RvKvjkLJP5eB7UM8kf3C+XzkE/sMT7kGRaFYHi9MXCVMjYM/qeMY1inhtZEqxao67ayJTt5pnfwVERutZ7SSPOBMhNUkEcIxlexJLghIp3SX0oRhm/iUEvaRDSe+XgBz5zqo4bJN27xqswLQ66csADhCsEGeSkY7hYiPDItSBXoegw+iw+ju7Ty5bqxwjd8LLaLtAaFsEUUjpd1MQFVsBFFZG0LsPDRi+VBdi2HmsciNJAFplGbBFkqY9VO/ahVghRq98I9mNwxOBUDaQw5Id6xKxtDr0mBgV2SKaaIKOE8rth8ssKnIDzW/w8qnt5FDS30viH1/zQoFfUYHiIvXFzrWwAJx1/AD8Gp3YD84Mwy5FmPwDuHCAQS81z1k2thSL/OX/YuLwkvmeTpd1WWttLtCu++PFBPU0LN7aK9/ZdfzflsignoG1zD6Ae7knIPFiVknGQDdtoEi9OEkiV5KyySuK8wfoQaFO+6UmM8A0nQC570k3CmOsv6qYvcjPxsZo6HEG6vSYj7lyNYw83GVdq/LWf3WnUCEvHXHusFBJq2sHMtkrNLRuUPtaD8SOtcx10gpN7QP8mWFV8yI6y6U1/cRgFO11FLw22eTkApgMmZd/ECPhGEAne8NtMYuD1Ka47/8Wi4VqebVeroQWzAwDLEt5V1hEhOvBYUjOR394gBHA65J9FgkpBOWJfxKz7Iy7v3axIAvhCUciRDYU1tKQ4IB3VugD4D6eCMAc7vRLbacRmU+ka5JfBOrX73p0nSGkXFEzjv8tq3jJmH05GSiAuTanjgFNaHkJLwkZrr9yAvBE40gPcioEbZlF4TY97wjkcDka9Vupsf9rsWOWG49HKGFn67FOxKdW83Od+GApwkEvq02RSQqYAuR9tq3wMfi2Nm8ZaJQsAipOT47jjsX9X6mXDGcxZ2i3K/PPpawt6C3AzNliQu8333a4jxTHQZJYDiogx2yghKRi725PdYsF6CjpAmWS9q/YC5/10VcNrknQ4XjuYm/h3gmDbeQ+BeiCwflJxk7ZJCg9nYL75gjtkBY/wd82Q8WJS4S6Djhl9nDSTEIjv1mfL8is7dnGPFKtLKitUlstwt5JSjl6KIcgh4eV5Z0vadw6JHXbN5URWYmjm3ea1zRhKSsmqhDdC6SaeJNwywzw+DY349zw9oSEyftrzsiyve9M6Zw/Wh6PYLbiOCo66PU5CDnAOmmW0oesYg5FGQHgVPLo9o1P9VDiJHFyGWrWq0wc3xzk4m8upnuLLrmXK7+YtbyueQCUiLh3HJRj6702CdBUsf79R3qwuoL4dc/ACiBtoELY/WhL22AegVk4ig0ydacdcoiWXFjw1IuYUINOvJPTbI+ECppQRkjvzATz6lG20SFTkbfvwwld0Ag5QOwMScQJdHujuCawbGH1z9Ldn2KJmaaRYp7oJXaF/rtt/b+2ZndEcelbiD3BsqnbOSj3rp4iE2BPZfujgjx/sNZbgl5SlG73Yj9HSM+TuY26eF0+H4kg+7lTeanq3lLP9vJ3qMyc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e59347ac-0c16-41ae-bac8-08db03f81179 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:18.4113 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YgMnMwyjnqNqlh9kRARbom1+lZuuHnae/8h93kJ1iaY8FEnZlnrakXKQTf1yZWj05XAHuTpjtAAEHo1NC5KRT595tLuG9xNjmEttH7wj29gEX320XvddDNfXAau38Ka6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB5600 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto The flag LRCLK_ASYNC / AUDIO_OUT_48 had been added to handling special case of Salvator-X board, but it is not used on upstream. It makes code complex today, let's remove these. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/adg.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 2c7958620524..776dfff8016b 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -32,7 +32,6 @@ struct rsnd_adg { struct clk_onecell_data onecell; struct rsnd_mod mod; int clk_rate[CLKMAX]; - u32 flags; u32 ckr; u32 rbga; u32 rbgb; @@ -41,9 +40,6 @@ struct rsnd_adg { int rbgb_rate_for_48khz; /* RBGB */ }; -#define LRCLK_ASYNC (1 << 0) -#define AUDIO_OUT_48 (1 << 1) - #define for_each_rsnd_clk(pos, adg, i) \ for (i = 0; \ (i < CLKMAX) && \ @@ -341,13 +337,8 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate) rsnd_adg_set_ssi_clk(ssi_mod, data); - if (rsnd_flags_has(adg, LRCLK_ASYNC)) { - if (rsnd_flags_has(adg, AUDIO_OUT_48)) - ckr = 0x80000000; - } else { - if (0 == (rate % 8000)) - ckr = 0x80000000; - } + if (0 == (rate % 8000)) + ckr = 0x80000000; /* BRGB output = 48kHz */ rsnd_mod_bset(adg_mod, BRGCKR, 0x80770000, adg->ckr | ckr); rsnd_mod_write(adg_mod, BRRA, adg->rbga); @@ -514,12 +505,6 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) req_48kHz_rate = req_rate[i]; } - if (req_rate[0] % 48000 == 0) - rsnd_flags_set(adg, AUDIO_OUT_48); - - if (of_get_property(np, "clkout-lr-asynchronous", NULL)) - rsnd_flags_set(adg, LRCLK_ASYNC); - /* * This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC * have 44.1kHz or 48kHz base clocks for now. @@ -547,8 +532,7 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) rbga = rbgx; adg->rbga_rate_for_441khz = rate / div; ckr |= brg_table[i] << 20; - if (req_441kHz_rate && - !rsnd_flags_has(adg, AUDIO_OUT_48)) + if (req_441kHz_rate) parent_clk_name = __clk_get_name(clk); } } @@ -563,8 +547,7 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) rbgb = rbgx; adg->rbgb_rate_for_48khz = rate / div; ckr |= brg_table[i] << 16; - if (req_48kHz_rate && - rsnd_flags_has(adg, AUDIO_OUT_48)) + if (req_48kHz_rate) parent_clk_name = __clk_get_name(clk); } } From patchwork Wed Feb 1 02:00:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 650163 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B2B0C38142 for ; Wed, 1 Feb 2023 02:02:56 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 995A2846; Wed, 1 Feb 2023 03:02:04 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 995A2846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675216974; bh=OKfkUkasitwgxBr6wSs6c3kyR2rLITGRguHh40JAERA=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=qAEWokoYpj1yU2YEcL957XMzL6jmQ8YOeXAvD+k7Xvf8xE6ssKNBDKV2A/I9kxBh0 LMa9hMU4gv3J/ElasQGBFc0ix3fj0Dmuo4/RKODfWfWhp6M6EUoVwg7AgnvJAXWMYa v72FDDw/9VzcCS0oJaClF/YjmVJsDxG8ETxlRHpY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 400F7F80578; Wed, 1 Feb 2023 03:00:43 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A2E58F80571; Wed, 1 Feb 2023 03:00:42 +0100 (CET) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2072d.outbound.protection.outlook.com [IPv6:2a01:111:f403:704b::72d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D5AF0F80571 for ; Wed, 1 Feb 2023 03:00:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D5AF0F80571 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=WQaj2bVw ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QQ1YMqzDgR6YOJYn2EndLSDwTVjgZOyAor9MWRp2IAOHvTq887Vtb/5trh4FUmpwsryU83ZQcBaCtkSbWXWlwj6gd1cgWctDND0VzoxjYf/aQxylHp60IRwGeADgiFgESHg5F6Gv+eS1M+9myFtiedR7rHQ0Z4ELPzDEVGMdvcJsfuyn/QBIOU6I81K0Re4Zp4vTCT569JociFnWSfIXp0n5jHUfcBERhMqvlHjJ5ZGtCd+ja8T5oXojHeubtqMcqfsU3PUrx8MVPnJ+Oopi/UAhRPUC/GxQ6B7LNSnU2evXUL+Ex+v9N5P0reFVPkTY8L/LDypSS5WEXu5HqVC86g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nsPBqGsp04wRUzVTD0jI47Vz1kDF4lLi6P44wKw6cGw=; b=nOLiaCm5TPk1X+5S0q+aiIPZtkKHl/a04hIsVWKaGrsjcoICwYGOyFBLVKu929259QRUiq0HtCjTVH0OIisemO7weg0q8IIq6cqYqlo89AM0mQ6MswBJ60gV8KiVabb2TEzcnZmD6/9iJzpadomJQfc9FBYMWovwxPED6IaYYBo7AHp0KUeV8kAVWspoEBUd1Ib46+vUNNozFlVPovDXqamzxxE03+7um6SPPqabT708hb9EE5PBFNcemkYEZbCO9lia6FwuJBSDZdiGLkpue7UbUpU/L5lbqSC7ZRu88LV0wJ/4tytxBL9zMBZYadgr377n6ilCOYHveNHGYFekjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nsPBqGsp04wRUzVTD0jI47Vz1kDF4lLi6P44wKw6cGw=; b=WQaj2bVwG8U10Jw0fDsDMdWwKRKDlQJcLkandDiN+RC8ckR69NWXdrSsssg5LAuaoUQ5+W+urKqt6R5L2lSqZllIYSAYVeTdaCy0HM4Jaxt2tMTYgS3dUuNpRV4HWZA3skxrk0Te+C0rY2iLLtL2KV9HlgAdq3J8VB6hRu9ANvg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB5600.jpnprd01.prod.outlook.com (2603:1096:400:43::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 02:00:23 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:23 +0000 Message-ID: <87y1pi5emh.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 08/15] ASoC: rsnd: rename clk to clkin User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:22 +0000 X-ClientProxiedBy: TYCP286CA0040.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::15) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB5600:EE_ X-MS-Office365-Filtering-Correlation-Id: 651b825a-a539-4111-3cee-08db03f81440 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xH2cjxtXUozE5lcGrLMxH7MI2OIEL7X/4AyF/TyorhEalj7+kUZbhaYr8i3Ojc4zOqHJmRzViE+nh9MDLcCN7aFtiK+sUER87QsuUbdLalQxw40jXwbf9trjBKMWVZ6x2QjbVoaY++L1gCPDgnT+d6MSuWTcKXqd9SFBv7nO4qVBAeUlLMkqro413dM7t18OdpD6v8yFq6mPhixAmxNp4ZL1/XViLuhKRmwbvgnF1dfHHfzZ+rWfQEtpAdpH6Ig8oN1w5Owl6g/ZRsTdWkaJ3M7pNnc84DfpaqNCmoFmuRbBLtth6K2FenlLB3doyoCI+YCOaZeM/uqPYcG+JgZJbGA+e7gbgajSPT3vyDcMxCb91rSS1X6D0O7XqGaXVd4aI0HyXxEg3S4u7MpyZhk70IliF7PQMj9cE7CEEapFbSnw7zG/mg+hWDWtMjrRh1BYWxFXsCjJkrCdk3UHx/sFf+/j0Uv6777N051xoroRwSTRVXSCZkm1xB1Lgy1KMf5fFb2hUPhP4mQF9c3NVEIIy8O1qd4S+O06fTo2pADRIO9oLLYttrkZ26451e5QjzwqijYvwgJ2RSsZnilAQN1KGU/XSHQv5prLVz+uuO+2XMSfhdtsrAd1pR9GxxnLHft7feLrZF9YSgVBKqzf7ZvXBmrl2GiYuZ2yeYTK0fbT+sy5Nh//QO57d8MAMt1Mv4wlzO2a91IpKhB5n/wAmrVsNA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(346002)(39860400002)(366004)(136003)(396003)(451199018)(186003)(83380400001)(316002)(41300700001)(8936002)(6916009)(8676002)(66476007)(4326008)(66556008)(66946007)(6506007)(6512007)(478600001)(26005)(2616005)(52116002)(6486002)(86362001)(2906002)(5660300002)(38350700002)(38100700002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XjOeWjc6oB5yevSkW45AKT5IcHNFY1UmK4yuTihqkmhyARm29XlcJv8yKJYeExv347Vz32ZWrTTYH6SJ7ZtWBlcExHp+Px4Ioy6h5jrAebA7q/W48iuw8pXML13Na7yyw0nivpxaEsoR9wk/trDf/Fe83P62war0U74po7wOIInPG7TL+n+2X7BdHP3YrWiXjHjyoO7SKdBVIypseWuEuzp0z1Qrm4eilwITh6/v+7HnID+xgxpVu4l9RT280vztFisqIc3tr7Z/vw7wQS+HckP/jAOu00eObqeOcXO6ztLLao9ho4ER2PuvVA/Bn0yPmFX4LOqHbp1aoUhooYx39/uTEyEix4VD/I4/YLzGImi0QWaBXJkIPpqDhGHoUfZIoO/cT4LiWGVAc77bUMHh/N/eQkt+946UvQXi814U+aYM2WH1gUSBJy/RZzTJqfLTpkdl6RtJjfz9o9cnRVMxS765vlWEVeSGrmUQ91VGXozFoP4QOTaCM3E9d8Q0vQMlba1CeL/CExmVrbOZCUPwLRf6zHDAxl4XRnuMCeXLYcGXUfpMnZGzAHaH6ZUc0sDHxqv3JBFrJbdxc7v7t0+hpZDn2kVCt2PwCKwU2v2HHCWF3q5O7aj1Dwn0pqSIaFU3NgeXK60WVxRNWyV3Xz+mCptHZhVz+95Y4PNvBNaI0qYVkmJwpONfijwAsSHJjtLIAFxRR6NREP1tuVkJNHYnuXMUIA+8FuNcVzediG4JCHfytETJqN6L57OyzSvV5Jr8CMNwchR2NwwD6Y85WAJNtM94NF2p1Q3BaEamUJQVATVq1iV1RIdYDU1wpjdWvMkRCIA4UsDuJqygf0N3O5P7fA45PjLSGduQJRfEZFc1HIW/WBhHTR+2qZvfnHIlTq2esJIPnUKtwtXhDbfVQ0xTg2kQV2fohA/yZ/V05SIUcmNgzDx93GF5/BCfY8+75dzeY3To0Qho0x0XOGZry+htKijo0HT17y0DMc8AxLoJ9RGH4/296YBG1hVBbUenU9R6NAZrQKOXjhI3RRbzJZhOwAaGx1bSmaTNokwMbiiQmgdT7R6u75ure8HrXj2KlwXhq5fSbZPBTq6SMB8lkJMxYRZs0oGD/cwPoIRldkfaG5eYH68OdJDR/Gkd5TvOwuZgvaX5FF0U0QaTJV0Nc//FCY66yhS2D8YW8EX76n+dwdyOeT2R6so2R58OnQDAL37XDPjJhl66+uPNgBVkvP1ZIW2nfPXwoOk92RdWOF9cAT+T/1yxByTH76kqwGf/EDYE1n5oFixQo96Au9Q6JUaeehK2nzfrv2CS3vVs8ZfWq2AFZxOvEK8Xh0x/hxSOvcW32PKdm0Ye3niJBtXoehfNCIEjUAxiilha+XkS1cN4NNN6edaV2rJmfYbsp8UkqcC8AdG/W8QoYQymdpJ+nJQkD4Me1Ns5oZDBFGY3mdo99bbGppS7LquUstZ7D8efRzFVqLkmeNz5HKlHdEUBKs3jbv+ScmK3meFctHv20JPksh84OkX8t2qyR57Cku5WTFKmTMxjHWT89VX9V8PpzKtBkTjCF9EjII5XodgCqTIEW/FTkE674mO+swfYhxL/qgenih2cbYtq6JD4NQTfpn7FZnBO1v/aZhh5Xt4hdCL3AcE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 651b825a-a539-4111-3cee-08db03f81440 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:23.1146 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ijzsJ/avsHJ3JJPnEMdf07uafBVj7xFC7snJFnAsLfvpRU3ZI8K5g4KJWPuEfJv1kjRpr/PEyJ6WMLIp6zInWGU3S4qy4SqbWCAzeEmvNJ/FBVP/HESXYQUA24QcmsZV X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB5600 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current adg.c is usig "clk" as clock IN, but is using "clkout" for clock OUT. This patch arranges "clk" to "clkin". This is prepare for R-Car Gen4 support. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/adg.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 776dfff8016b..6392d20ad4a3 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -11,7 +11,7 @@ #define CLKB 1 #define CLKC 2 #define CLKI 3 -#define CLKMAX 4 +#define CLKINMAX 4 #define CLKOUT 0 #define CLKOUT1 1 @@ -26,12 +26,12 @@ static struct rsnd_mod_ops adg_ops = { }; struct rsnd_adg { - struct clk *clk[CLKMAX]; + struct clk *clkin[CLKINMAX]; struct clk *clkout[CLKOUTMAX]; struct clk *null_clk; struct clk_onecell_data onecell; struct rsnd_mod mod; - int clk_rate[CLKMAX]; + int clkin_rate[CLKINMAX]; u32 ckr; u32 rbga; u32 rbgb; @@ -40,10 +40,10 @@ struct rsnd_adg { int rbgb_rate_for_48khz; /* RBGB */ }; -#define for_each_rsnd_clk(pos, adg, i) \ +#define for_each_rsnd_clkin(pos, adg, i) \ for (i = 0; \ - (i < CLKMAX) && \ - ((pos) = adg->clk[i]); \ + (i < CLKINMAX) && \ + ((pos) = adg->clkin[i]); \ i++) #define for_each_rsnd_clkout(pos, adg, i) \ for (i = 0; \ @@ -52,7 +52,7 @@ struct rsnd_adg { i++) #define rsnd_priv_to_adg(priv) ((struct rsnd_adg *)(priv)->adg) -static const char * const clk_name[] = { +static const char * const clkin_name[] = { [CLKA] = "clk_a", [CLKB] = "clk_b", [CLKC] = "clk_c", @@ -112,9 +112,9 @@ static void __rsnd_adg_get_timesel_ratio(struct rsnd_priv *priv, unsigned int val, en; unsigned int min, diff; unsigned int sel_rate[] = { - adg->clk_rate[CLKA], /* 0000: CLKA */ - adg->clk_rate[CLKB], /* 0001: CLKB */ - adg->clk_rate[CLKC], /* 0010: CLKC */ + adg->clkin_rate[CLKA], /* 0000: CLKA */ + adg->clkin_rate[CLKB], /* 0001: CLKB */ + adg->clkin_rate[CLKC], /* 0010: CLKC */ adg->rbga_rate_for_441khz, /* 0011: RBGA */ adg->rbgb_rate_for_48khz, /* 0100: RBGB */ }; @@ -287,6 +287,7 @@ static void rsnd_adg_set_ssi_clk(struct rsnd_mod *ssi_mod, u32 val) int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate) { struct rsnd_adg *adg = rsnd_priv_to_adg(priv); + struct clk *clk; int i; int sel_table[] = { [CLKA] = 0x1, @@ -299,8 +300,8 @@ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate) * find suitable clock from * AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC/AUDIO_CLKI. */ - for (i = 0; i < CLKMAX; i++) - if (rate == adg->clk_rate[i]) + for_each_rsnd_clkin(clk, adg, i) + if (rate == adg->clkin_rate[i]) return sel_table[i]; /* @@ -358,7 +359,7 @@ void rsnd_adg_clk_control(struct rsnd_priv *priv, int enable) struct clk *clk; int i; - for_each_rsnd_clk(clk, adg, i) { + for_each_rsnd_clkin(clk, adg, i) { if (enable) { clk_prepare_enable(clk); @@ -367,7 +368,7 @@ void rsnd_adg_clk_control(struct rsnd_priv *priv, int enable) * atomic context. Let's keep it when * rsnd_adg_clk_enable() was called */ - adg->clk_rate[i] = clk_get_rate(clk); + adg->clkin_rate[i] = clk_get_rate(clk); } else { clk_disable_unprepare(clk); } @@ -418,15 +419,15 @@ static int rsnd_adg_get_clkin(struct rsnd_priv *priv) struct clk *clk; int i; - for (i = 0; i < CLKMAX; i++) { - clk = devm_clk_get(dev, clk_name[i]); + for (i = 0; i < CLKINMAX; i++) { + clk = devm_clk_get(dev, clkin_name[i]); if (IS_ERR_OR_NULL(clk)) clk = rsnd_adg_null_clk_get(priv); if (IS_ERR_OR_NULL(clk)) goto err; - adg->clk[i] = clk; + adg->clkin[i] = clk; } return 0; @@ -516,7 +517,7 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) */ adg->rbga_rate_for_441khz = 0; adg->rbgb_rate_for_48khz = 0; - for_each_rsnd_clk(clk, adg, i) { + for_each_rsnd_clkin(clk, adg, i) { rate = clk_get_rate(clk); if (0 == rate) /* not used */ @@ -630,7 +631,7 @@ void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, struct seq_file *m) struct clk *clk; int i; - for_each_rsnd_clk(clk, adg, i) + for_each_rsnd_clkin(clk, adg, i) dbg_msg(dev, m, "%-18s : %pa : %ld\n", __clk_get_name(clk), clk, clk_get_rate(clk)); From patchwork Wed Feb 1 02:00:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 649208 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9067CC38142 for ; Wed, 1 Feb 2023 02:03:14 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A5B9A74C; Wed, 1 Feb 2023 03:02:22 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A5B9A74C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675216992; bh=ndBPOEOG7pTa4qKu397LM48FdXsi0ENZoaL+7Lnu+Js=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=g849zC+fFKbvuvLU76uwcWbmfGw8Oh79eo0dfC63If47DosZzixB0tb2GoBUCn3Pi xSaUL5FKhZo0PU2bRmN8B+jHZRccvReNV3NkOUIRFxYpbP4cAq0eRKLwZ9TOiXOtHQ 0VnFHJxT4ABYvcjNjiXCQivaJQQo6ttrqyvnzKTc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id EB518F805A1; Wed, 1 Feb 2023 03:00:44 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 91E5EF805A1; Wed, 1 Feb 2023 03:00:43 +0100 (CET) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2124.outbound.protection.outlook.com [40.107.117.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0E423F8057D for ; Wed, 1 Feb 2023 03:00:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0E423F8057D Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=IktRBJr9 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e3v+1hMl3t9Qf+dVAxT93YPh407pHxwZ2GOmZhjtRZjcgW1Tp/YPe8ecoyNrmy+RJ/RgW2df2+OJj7zmNuG3CwkXRIS1OfWRzbIp5grWD8Glntpg1CtEznrkzICtigZdh5LXEsX77EhIAf+4vZAc+rWRcy6X4rT2GdALpdElQrwNYap3TXDwZa4mMA2wtQGBCTNX8iHCWlVwa8NLF05+L6qvB9PJELnAnZ+XuqxitiEfJRIEOHqL5lWvxONi3DCT1HWlo8kn1MsALMHjigvXzE5Y5FsyaC9uTVAgLdgcnAMc47AdXG7XSTnhQALbr+Cu8kfWBbac/HcPKH3Cba9Djg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=d5YMEvz9vpzCYAGyFsKoyVOgJLU6Z5Q2JsBZ0uy6JPA=; b=dfvw3qanhlWa0S23E+UitvLFtIlRKYoT2ktt/dvNmbnl9zlj7y4TBZGVleyXP7gjLMibdV88HNqjvLY63uqs4avTZ2XVspHtvIrKs4zo5V4qDC8LF7ycQQphiVXZ5p0mINBzPRLcZCgQcZzoaFdVHAqSkgyHSuZbuTeRTGlO0jhGHNIGBYLpbEVVtr6a250MQciV6nJ9dxrPVW/SpykzXiSnO0fLd+A/u3l01aolBYAkZm7QKGSGtuTxay/3JokOm62bV9mWb5L/4pqBK5K37H06rET0OBmmws9PUFXo96FuSu/Xrf6cMJ0ElPEWK8PkVeL9mGF4dh6IeLdMGStOSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d5YMEvz9vpzCYAGyFsKoyVOgJLU6Z5Q2JsBZ0uy6JPA=; b=IktRBJr9vmQE9Tg2qAFWQTNH2+iJ4zrbmGjgPr1EZHEYCwpW330EQqOD66FHetTSMKNpiAPHW6C03z2/yCDqsr3Ik7g7cwDu5pjSbk8BMByt+j8tiNcgr1LdGugK6joJnNPm7OAV1PP2TjZMqC85vFzBz8skcycKA+VF2NnK4g4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB8772.jpnprd01.prod.outlook.com (2603:1096:400:18a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 02:00:27 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:27 +0000 Message-ID: <87wn525emc.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 09/15] ASoC: rsnd: moves clkout_name to top of the file User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:27 +0000 X-ClientProxiedBy: TYCP286CA0007.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:26c::12) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: aff410ea-b644-4f2d-d43f-08db03f81713 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k0eu7ZbiSh2CybKH4ds99NmQIkspUFh6b4TV624iXDMVX/Byu9L0DYHxPTfsFPl+cCKZF1CJDwqSPS2fJ2h9IKS1CZEKz0kY6P48VjWQfKLwUt4SJo4aftggWMEQw+8gciULpzM+mbjdbnwawPnYn5sfF7KmgEIeMLm4inPDAppBRsvgQMuGl9+YSHgYwOMtfO+YtQ0Qk/F6LSrqu0vxdc31+//uNvjm8ngknZyfOZxuKKjWmxFfQV7ZfXU+idYlB0OP045gOpGkVGZah2a6cPaonxIJQoW+0Xx4yWaaD5dsGsxvDhErMnJhhbG4bsquRhXwuof0Lwkbt4PEle+7FUtA8i6wZKMvDgdDpm+qtOfdvZsYn9b+hUDywzEz5DMVKFKpEDP2JQRTraskU9+NbKG6Sq5dLzHIHieZAGXHN5oBtr7ccB8a5ZzMU8qfV5YXQ3SfSRORgnSVVnp4qww6NCHIMmwCL0n7WQWqHArZV3fAXUyBm/KdXdy+goI9YFBzW5cmYURgG2bASjmtf54PO+PYWj5ojIv9jArlf+tNfIqZAgdX1QX+kp0rZyWMC2TEI4cYS3WWbK8EJHWx2XlzItq3tKEBp+qiBxRGXHcafsXyUICHSZnAO1Y3EfoQPujk6ZMp/glaQN2LLrP63BbYIOn/OKpwGKEqZ1vX6sGGPFgaHB+/aNN0Ygy95DRE4DMhR+n4GvLWaZ87Imz4G53aoQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(39860400002)(366004)(396003)(346002)(136003)(451199018)(86362001)(36756003)(38350700002)(38100700002)(83380400001)(6506007)(6512007)(186003)(26005)(2616005)(2906002)(316002)(66476007)(52116002)(8676002)(6486002)(478600001)(66556008)(6916009)(66946007)(4326008)(5660300002)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NaeQjmN75cl5T8Xe6d/tIYdUIJWXaJDuQ8WrJ3mUT4pF0xpK/nGCJfdnZF4j1F02H5YG3zf3xBgujun2GVNuroaukBdgfYc+MPLGhXr2ZPUB4O0EQOLxh75feQB/gxxSDbA2jfvFT5zCHUV68F4lIKb/1VSqvquwMIV3JdK5DPwXliW0TZPRjOQ07FzXAN1djJBTRdFrgBIVfcSX4/1osCovfRX8fpDSLkLZMB7K1g6ytYYNL/xwPS/BXbXOrvpNeC5SSp4hbCayRTZE0NnJ0N93GuFgxABg0MZ9Jtus/psv5FvIIbBKflU4b/e1ERFxxmi61twSt7gRi3E3zAAQNaXRshukfH0qKpfuuNfJlN4YD7emagD/Id6d7cfVrfZP+o8KJ1doDnXgMTqBVdJ45DPhITSLjUn4CKqWmK1QktIwRJR1vUv8nLwdjNmqb8qBJA12qX/vEkbd0RRFPOVWl1S0XOkvj4CiMMzt2k/ogoPzaMxrs1RYemiBm4bQkDW2x60fkRpZP+76FXWZDxN1tzmPuNwCKmOynbil/y7pWeiWg9RXAArjCvxcbRYBehRQUvb2iDpPIcMNy87yr/WUsBF2vmXb/r9didtVFWyhcs2zlaAoeqLGGvtu7Qv16BSavXumGdrVw1QmEidLgyf0/CWYGp1V6ba44sC0ESwpgjV7XAp4FmqJwf0cEo5/Dyaiphkm+4Saq/BMvTPqdNq9ciOEb9oIJOFZbZwWRucIgSsdvLTJ3yEG7K3/aFnLXNKa+/0L1sthsRCLLIOX2l5SLnYACnravpe5QQsqoJ74ZvCtAd9yJM3iQ46z6WIbN1Y3Ux5YXpfb8XjZaZWCe52QGGPBBcbar+YgxTrJzdpHgjnTrscIvu+1UNQW0mVTUs+pvDg4UyIGFgJyMgLzkp5Qn/fAoIzKCJIx9TtsPlXYLHv0UW3m5Qh07Q+iz56WM3pif5aOTb9hvZW1wVwjJvsfvdQHrT0DgiToB2HvlzcPqBuMvA0tGp0Unf90hGVphjQfB/w67XSf2NJHfRoLx5QJVJDpTjcKD5vbvHgKqpzb9Jc404UAxsXTHROjFpcSE/Pn/3weHO9vlckWep8fpStURnFy/yDVrPZFl52Ur5coKnPu5KaNszRObJzrmBult5FHMap4DprJOPnqkPqx8gvYd2r3clBo6/LTFKR2dHc8jovrq7jdq6/fJ2soOBAVPs4HDO6aFU4Qe4Bu+FZwRa6UfAkX6L6rT77AryUCuew5sgB0tkMdmsYXSmLTqAO2Ccn3JHRECCj8JfByEGIzNzYWI5QAZzKmKJ+ZhYB19dllgRnPUsApravEYaZrLRCDtpWCxk1sAHUChTHXb/uqjSBSMORZaKu07SA1yy5RA48x19/KXBuUc9AsmvFT1X2ie+mNESzguDCzqdPTJpUmHKM/ErI2U3HHsHXHr3YrGtZMhsTDDAEpk5VbkZCExOHZKL1fnAHWUOHE8JCFNhtyOl3/PArrpvvaOK1Gxz4ORNH52ONyAc3GJpxAVQVD9aHeve4xjg6HNLl7rG7lxPYf2C3qcN6XIj+P17Y+L+vmeDEwGWDGPW/dLLfB1aR73gBKG8IGY8SXl8sq27uRhSMD3ZhTrjHkmT1hdY9buAAsVevW67A= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: aff410ea-b644-4f2d-d43f-08db03f81713 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:27.7942 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HzLyuT/RaSWlLLlc8+8byfWPVeM4mzfezmFnqUS65cKCxtSyeX6pJh/QgK8NsXxBo82Een4FNicZpMFxpE2ij6WUwmRQSDtre7o2jNouHF1f6kXaRCGX+NTeiRjeI6gJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8772 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto This patch moves clkout_name to top of the file to handling both clkin/clkout in the same place. This is prepare for R-Car Gen4 support. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/adg.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 6392d20ad4a3..f937cd4fe09e 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -59,6 +59,13 @@ static const char * const clkin_name[] = { [CLKI] = "clk_i", }; +static const char * const clkout_name[] = { + [CLKOUT] = "audio_clkout", + [CLKOUT1] = "audio_clkout1", + [CLKOUT2] = "audio_clkout2", + [CLKOUT3] = "audio_clkout3", +}; + static u32 rsnd_adg_calculate_rbgx(unsigned long div) { int i; @@ -465,12 +472,6 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) unsigned long req_48kHz_rate, req_441kHz_rate; int i, req_size; const char *parent_clk_name = NULL; - static const char * const clkout_name[] = { - [CLKOUT] = "audio_clkout", - [CLKOUT1] = "audio_clkout1", - [CLKOUT2] = "audio_clkout2", - [CLKOUT3] = "audio_clkout3", - }; int brg_table[] = { [CLKA] = 0x0, [CLKB] = 0x1, From patchwork Wed Feb 1 02:00:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 650162 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DFBBCC38142 for ; Wed, 1 Feb 2023 02:03:32 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CA1B1828; Wed, 1 Feb 2023 03:02:40 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CA1B1828 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675217011; bh=XauARPb4yfsArZgBCAe1snDIeUZhOWAPvHqQAmGVjfw=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=TuGsJHbZ/Eho/RANnGPmcJ0KaimlGXz8Q/iPTtnmDEZ0KjXs6XL3Z7iEm73I4jP7P SRYnh12JFmAKSrQEyPKda8fu9mbj39MEi1TPtA9Q2MCrGXTRxI1Ik0NySmLIq/fBF5 w9Esbn3tNB03AR33EyjIwuhgdDGhREqdzvrWODqw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 16DFBF804DF; Wed, 1 Feb 2023 03:00:50 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5B469F805B0; Wed, 1 Feb 2023 03:00:48 +0100 (CET) Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on20711.outbound.protection.outlook.com [IPv6:2a01:111:f400:feae::711]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0FAD2F804DF for ; Wed, 1 Feb 2023 03:00:37 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0FAD2F804DF Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=SXGWDcZq ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kLfckeL8fkMBpEdfFMYe/JiwTmF4NjMI1STCC/yB5LAT1hlbVd2vQtVU+xTRlx7IKeePKrxhS2xNOfOjF9B3Eq1oTF6Gsfeor0cv1j6ImAa1OMj5BGDPQhb9KqAi30lGBWe6gkmF8tnnNPwDWnCqmVPGdQMNwxVDaURloNKODaBDlAOu35BVIp4NuTXuUWxzWS1kwAFPRWNBNYtCF0uU5mTShhUa2AowXIaAcX7dqqg/Ao2gR3Xda+8MiGxVyW53BMnpNj64P6cEJ58mWb5SjiKzWRTekB2BPQV7fH8GPCI0AsqpXnGLt7wxi8qqOSjf8Yqm+W/uu2Y2lCA0vjs/XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EU3yJLywdFdPej+//P9ZbZ24ivzbiUMcfAFbSI5jQ+c=; b=fsLoBe6ukm/SRanCRck0cu5eZtYKvEJHUI3Qf+pQ+ZbH2HijXYT4efk/GHZ4Pi4e0gt6LIFYe6/+eKNUdG1RE09KEyI/mD/c1B9mAYIyHcAyQNiRUKc1XV8Q3DektmWtJxmiCb3c3IOf7HKhk+ihRn/PDcu2qdhm0FeWvk7YKpWUcDM1ND7Zv8vOSu4bqfdECPBaptSrNnP0p/niSuYkYak7Tc9HeIhk4P5DHYipJ7BnxmiROKkeK+w94tlIlQUK5ImgP5hq8ubfWczU8TKQPJL3CCBATaFAn5XkIY82jYCHY3w3VUUvj0FcWYqAWda/ZQCjIm+1iFyROKGw0ozXAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EU3yJLywdFdPej+//P9ZbZ24ivzbiUMcfAFbSI5jQ+c=; b=SXGWDcZqcH7+L7rIbcbhGjMLbtO9ahgc1tNERN12PiTS4sDTymaEguOpY37h1VLtDcX+3/M5XQhruzmfblgQpS9o7lyuq3f/qg8PDQTT/A735SJ/VVz1GaVc7K7T1KueO2b5x0ThWm+p1zckkGSUS3QqxqJ5Z7VHA+I7lAZDZJI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS0PR01MB5444.jpnprd01.prod.outlook.com (2603:1096:604:ab::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.38; Wed, 1 Feb 2023 02:00:32 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:32 +0000 Message-ID: <87v8km5em7.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 10/15] ASoC: rsnd: use clkin/out_size User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:32 +0000 X-ClientProxiedBy: TYCPR01CA0049.jpnprd01.prod.outlook.com (2603:1096:405:2::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS0PR01MB5444:EE_ X-MS-Office365-Filtering-Correlation-Id: 682bc1ca-2618-470c-40d6-08db03f819e6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 176m6unVEmoJj7aEUwFLf0sbuGYuXb+bcGmugWMgAHW6IWt+MByYIFbcPSW5FE2e+Xwvxe433l3kyaR3GSF+dVFUBclUsjyOm7V97I0ay8iRjOVC8F5IRJ09tMRwW5K50FRCT48BRQUXZNjuKhnhytYTuwkqJ833ET43/zuU/ejlFf0xdu2QI5JbFlcb4I8f7djfxd8+5/JJoSfRMWnm22pTLFRHlIO0vREFa8TiJuHpz33u+ltdcsHbEc8IhOj8FBZp3GP9rJ1zWgPBPwaMkQmrz9mDrCySj+kT0VGfH2PPD8KY+RwFmWS4ncZnNCB/MNr3dxvcfzzaWo5VpPWO4RMK8LtpTHAqtUccfTEKaaXCXP4HHE1VJM7aWulSPm/rYtxthpYM8XGWmut6UuUTXraqOlZVQbfTxrVJgPzGqkeXNS3C6FCiF5KtogVVb06GOkqygI2yRqXYBIQYt8nubyhKCv14UXQCUk1Wuui+Rk7wmYYSCvlobyFLK8GlA2yj1iwzaDqbvp2gjISOoWlRVX8yGe0ceLqMVQYadtSAhj07VoH+B1WoXicO9A9OAvqkrzmFbwME/196WpmGfgwVrIdOor6yjSIAbpnCP0rFmcZntrs3GvFgFI05653XVHJ6OQIU4yhzTKnA9B1NWs38h/k488NwX1PtQqGX9Kf11ho1UTOdF9pgOPqOZNrAZHGWOsVE9JVrdJU+geJ2DumU4w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(396003)(366004)(376002)(346002)(136003)(451199018)(2616005)(36756003)(6506007)(186003)(26005)(6486002)(478600001)(2906002)(86362001)(52116002)(6512007)(38100700002)(5660300002)(316002)(38350700002)(4326008)(6916009)(66556008)(66476007)(66946007)(83380400001)(8936002)(8676002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: f7O2Vp1w83rEFgKm9tn1/Oe3KBWZXBJszfMxyo8zIUO0s6xa3tzy8JvVZmdUd6KIyoRyG8y+p7DTFOjQEorE/kCvaT8YcdMCzr5fs3vaD2wT4bFzViWtHRFvU0F61y46aCwZGZ0klsCZHSkKUUNn/e+qHwi+nYqqVE5barz6px45zi0L52FxUavK5rBLO/wRP1OVSegpgqRQg1+AgtAk6C9IRPMMdyUTuVPZxBze2vD9z5jbiwdXc6KJIah/QcUPsYv+3uSG1AZ5tcl/0u5H2h42173bBWjn3qSPuGsEL04s794ozU2ddcIGApm9JLW6WD2IfxoWD84GT71/qxLRYcKB1Wjc9/+iie3elE2e5QsjL+fvm4RIWlZVhjF+Xw7DP4s4w8eXMWGTpg5beXjST+mFzkPjM2SWJv0mq8BfSnIvT2zMchEs7Hbt3qdOM5CA3YodNtvs6eE+SLLFto+C5ybjMQWqJnXqImuhinbGFOFD4cxJwvKja/+wmUEXvHPVJEnnMI6u3z1jbV1tTp68pibMREgsyxqUm+qsNi92kIOmTM35HnTNw9YsMmtihqU+uOCahwPAhUedMyTRMt5CTS7m7jmwVqdNNfkmHI36wJR8R17SuP5DsYeVvvzb+N/imU3Yps0QOQyb+FpJ2fLh80dkupXIE6suVSZaG4fGw2em932WHbldUk+r8cAj1SxvXcWPjq3zz/BZuPLxAJr0zIrJ1VvlJhQU7uM3UwIBVHXh9PYcft7fNgwnu+HHSdrZ+ZCt+HWzTskkh0aVGTzG1uvgx6e6NTr+3G+sxPQJyZqPpKyc9uAiEVzn8q/G9wG/GzQlbOdRTBgrzAdkvj8SUyuId9eofMxJnOhkCyU7MHGHdmKLM2TQsGHd519gWswMxGo3v8rsGqTSmLXjgH72sy4K005aZ36tevcDWOCmNXegfATrv0ZchMYoxn/g+4NMfGBXR0Ta3/XM/SSJeIpUyQwzObVTVsAKyZKZa3gvrEu97G+df/vC9+RGMIGGYD6AxFwVqlHyzRoHmCREdb1ZMY55Jh3vJUVk2WH2LQsnxHbQec89JV4Km7oNysqtwobggGCsDwN8XOOeZ7uMtPa6XA3ri9PhtkzoXuKswhXTwiK4CZUA+sHOm7lg8UQTSZEWwc/b6sy8xJVfjNeh0Q6bnxFvtOg/9soGgU7pnUf2253630ysDJe3Q5Ek9CTZ37zfZpvBjA5eLZgL3743g+BLg/GKCPxKCL2UIjEv8NaKdpUlOe443x1knXHGrMG1igMHpKzmXwCNbEThpLT1B7mj+LzWqsCKrXN5J69ms3Lm5fWbSdVr4ULvNn8J4HE0keLv2tJAEvJKxoanD4p/M9/jf+AAWYha+iWLaCng9Dc3JPFHT/WZEMxLajhNi2uiI7/ek7O83L3lQsbLMrfLFHSfxtGLanoIkPC7O3zEkVTCKRtA0DzJArsbPkMWUV38+9pLpTOgfgpT9R4idI74TJKovQCbE2Isa0rMk/fsvK1Ms25jPiYqwJNgOBln21pxCrH7Q9aZyc51s3yd3EgYAQKl7AeIDPT78HLiZcnSlFdw2eNJHhiP9QESAWBRIyhsP+7BsbwW7QOVuZF0Ml4fqN+cwhOUNBa4xgktXYVWAmQzilU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 682bc1ca-2618-470c-40d6-08db03f819e6 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:32.5287 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QPtPp5CMM3PYYF4CJLvduwP7V2QC1WAHOn4azikXkMVc11zDjvVNkSzadMMIMnfd6lJ8i1Q6X9SJ+tjnyeM8ASzDOJMvSAQzwzie1qF5sckGIi/e25j+Nt7xN4JJ5PZt X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5444 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current adg.c is assuming number of clkin/clkout are fixed, but it is not correct on Gen4. This patch uses clkin/out_size to handling it. This is prepare for R-Car Gen4 support. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/adg.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index f937cd4fe09e..ff8e8318edb0 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -32,6 +32,8 @@ struct rsnd_adg { struct clk_onecell_data onecell; struct rsnd_mod mod; int clkin_rate[CLKINMAX]; + int clkin_size; + int clkout_size; u32 ckr; u32 rbga; u32 rbgb; @@ -42,24 +44,24 @@ struct rsnd_adg { #define for_each_rsnd_clkin(pos, adg, i) \ for (i = 0; \ - (i < CLKINMAX) && \ + (i < adg->clkin_size) && \ ((pos) = adg->clkin[i]); \ i++) #define for_each_rsnd_clkout(pos, adg, i) \ for (i = 0; \ - (i < CLKOUTMAX) && \ + (i < adg->clkout_size) && \ ((pos) = adg->clkout[i]); \ i++) #define rsnd_priv_to_adg(priv) ((struct rsnd_adg *)(priv)->adg) -static const char * const clkin_name[] = { +static const char * const clkin_name_gen2[] = { [CLKA] = "clk_a", [CLKB] = "clk_b", [CLKC] = "clk_c", [CLKI] = "clk_i", }; -static const char * const clkout_name[] = { +static const char * const clkout_name_gen2[] = { [CLKOUT] = "audio_clkout", [CLKOUT1] = "audio_clkout1", [CLKOUT2] = "audio_clkout2", @@ -424,9 +426,14 @@ static int rsnd_adg_get_clkin(struct rsnd_priv *priv) struct rsnd_adg *adg = priv->adg; struct device *dev = rsnd_priv_to_dev(priv); struct clk *clk; + const char * const *clkin_name; + int clkin_size; int i; - for (i = 0; i < CLKINMAX; i++) { + clkin_name = clkin_name_gen2; + clkin_size = ARRAY_SIZE(clkin_name_gen2); + + for (i = 0; i < clkin_size; i++) { clk = devm_clk_get(dev, clkin_name[i]); if (IS_ERR_OR_NULL(clk)) @@ -437,6 +444,8 @@ static int rsnd_adg_get_clkin(struct rsnd_priv *priv) adg->clkin[i] = clk; } + adg->clkin_size = clkin_size; + return 0; err: @@ -470,8 +479,10 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) u32 req_rate[REQ_SIZE] = {}; uint32_t count = 0; unsigned long req_48kHz_rate, req_441kHz_rate; + int clkout_size; int i, req_size; const char *parent_clk_name = NULL; + const char * const *clkout_name; int brg_table[] = { [CLKA] = 0x0, [CLKB] = 0x1, @@ -555,6 +566,9 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) } } + clkout_name = clkout_name_gen2; + clkout_size = ARRAY_SIZE(clkout_name_gen2); + /* * ADG supports BRRA/BRRB output only. * this means all clkout0/1/2/3 will be * same rate @@ -571,13 +585,14 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) goto err; adg->clkout[CLKOUT] = clk; + adg->clkout_size = 1; of_clk_add_provider(np, of_clk_src_simple_get, clk); } /* * for clkout0/1/2/3 */ else { - for (i = 0; i < CLKOUTMAX; i++) { + for (i = 0; i < clkout_size; i++) { clk = clk_register_fixed_rate(dev, clkout_name[i], parent_clk_name, 0, req_rate[0]); @@ -587,7 +602,8 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) adg->clkout[i] = clk; } adg->onecell.clks = adg->clkout; - adg->onecell.clk_num = CLKOUTMAX; + adg->onecell.clk_num = clkout_size; + adg->clkout_size = clkout_size; of_clk_add_provider(np, of_clk_src_onecell_get, &adg->onecell); } From patchwork Wed Feb 1 02:00:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 649207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B53FC38142 for ; Wed, 1 Feb 2023 02:03:46 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id C9A2D84D; Wed, 1 Feb 2023 03:02:53 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C9A2D84D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675217023; bh=Xurj5brCBY7BWbMIQ9l/quobrCR9Dn/nc6otInZZgo8=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=mcIerYpOSYzvnnNk6aYmu7U4UdMlhoJhKPVmyu/JYDgBS89UeS4w5tARdjPrBo5DA IkkfpcO7ocYrlzKrzTVmELsM2Hj4Lr53AHwikrod4vfeWkAZGmW7O4ssw7fMZzuvUX 3hV7CZuG8Tlz9VStF4dlUIdIQmIf2kFuf4Vxk8l4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C9CC8F805B2; Wed, 1 Feb 2023 03:00:54 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 30686F805B3; Wed, 1 Feb 2023 03:00:54 +0100 (CET) Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on20711.outbound.protection.outlook.com [IPv6:2a01:111:f400:feae::711]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6CAE4F804C2 for ; Wed, 1 Feb 2023 03:00:40 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6CAE4F804C2 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=LZqFxgBn ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bfpFx6OAQGtiVrdrGkbuPOpR3Liub+jXRS522pYyzw3OPDPh8a/2/xv/3tPebE3P8DEBNvguwgi25Z17zgqPK7BQJQnwTxiqyvLwScxOfAAPCYb7yVEouQ1YA4LeQ390cvv9XUkagq74ngdpbYIUGjdVjEDsPOIpzjlnARgrt/LoNW5kb3gDUCEo7EO7kS49I7/hah/aRW7c0bspMtDO+RVyKbQZextt/Fgkljp5yLxmMEC6iEJVAis4275QkCZmW+tXLd1xd+6+55JOvgDlYmVVJr/t0fVu1AyHcYDCZEA1OJw9DuQ81lEBqZ7zIfMQrUjb5MKMnEIZ7fDsH5Et8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=G4WwqfzlsBRfWDVsGxKQrx5KuSKnLyesZZWnNJetVMY=; b=QIQ+5s4XixKVonCoHzGhzzjibvCD/ldAQkZZHn87MI4VHdjOvb/mXH09aVcWSxQrIqEX+4NCsfNSqlXumVwW5YyizRxeE5l2dp/JZQcJQ8g+a4w+qgk98uR5rxMTY623D5ORoraS3QwvxoT4HYCCAhZpNdkTwn1A9TBWOZ0PN3U9N1WEf2ljc/kD6rUhUZH27vjK6UEdSDmd25mKRIqGERx/yWohn+KRyRG7GBhRqYoa906ox09AH13TTrZKSmsBSTyHgsOuY95R3MBDMmatdhjC6izDZZQIPtBYwpOe2ui/2z47eL4Y9h41wIAIxr6ds7wIFDG/JSBmodZbVyiAUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G4WwqfzlsBRfWDVsGxKQrx5KuSKnLyesZZWnNJetVMY=; b=LZqFxgBn8S/7JOck3AMKWlHNeO7WTbE6zoARyJhOiXPMPAPty+C+UyxKKm5lH2RRkI/qCAmpn+9hx/mt6pp5amrlzK93d5ydAxL1K0mE5SiMfgamHC9H2ScIe24AIp6kGMf1CbsGtVIwsiiutXTkPrLVEbAKqemVtZaHMd6I5Ew= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS0PR01MB5444.jpnprd01.prod.outlook.com (2603:1096:604:ab::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.38; Wed, 1 Feb 2023 02:00:37 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:37 +0000 Message-ID: <87tu065em3.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 11/15] ASoC: rsnd: use array for 44.1kHz/48kHz rate handling User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:36 +0000 X-ClientProxiedBy: TYCPR01CA0172.jpnprd01.prod.outlook.com (2603:1096:400:2b2::9) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS0PR01MB5444:EE_ X-MS-Office365-Filtering-Correlation-Id: d73f20fc-304d-454a-11b0-08db03f81ca6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H/w51HuFqee3Lpj9dThYlVKaF0fFdSC97KN1G3ul29gVq4oyWC4jY44p+lvLz60lC1E5HNQ9xne7P2FW4AxUBKRyDM8Dgaci6SSTqODn/C2TQDGakF/aDnjQvVP6hxwOoX+akFWCjfWknZ1sAaNX6jFawv3GAje7xINbBp7ockKSDNTik6eyDh8HL7pGQWOt5v2rrVTjpLKrox6bHMh7AnUmMbTrn7gAzyVCq3ekk4SJlpUm5SPtjXbpJ6wsEMXamq3QlUjgLI5IuOU52YmX8mBMxTpnAzgqD/RzMBn6cjny/y+CLOnvgAK8Z260Ay8VuFZ7OJLLgLv0ZDxy4wbGXNnFVIlX3idweEVS6fvtR5dIYrPe4cfkU+ACw65Y0wYA/8vJr0Ffyk1ALSbver03WhS9V+lMEgZjHAdaEh1tB7/Fg5pYSUr6+gfH7yIB2yOpQ0aym0puRtIMmcOBKG9AGUwr+ELuWbTENyoO+SrLSLefHrxD9UJ3ZYllpzkg8dQBMo3ORd2qIIaYTsnht4ujEIXlehvhq3/lYWqi3qg3Fg9iS6/lvLvvUbXmF4NgxoAu9pF7WIFLUcf9m1+kpdp3B0BuxZJ4+fgVSnckIi6T5mTUaxrAvrAHx++NrdvlaS3A43ci9hvjOdXiGPUqw3FLps38JsoJ4dTfpOE6OYvFfKnF4irwPWX32VQyoaM7Oh3qtUTeAe5ahP6qs2gTFlXF6Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(396003)(366004)(376002)(346002)(136003)(451199018)(2616005)(36756003)(6506007)(186003)(26005)(6486002)(478600001)(2906002)(86362001)(52116002)(6512007)(38100700002)(5660300002)(316002)(38350700002)(4326008)(6916009)(66556008)(66476007)(66946007)(83380400001)(8936002)(8676002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OgytsNERo3vyzjhSZPeue3TprzV050MywuiM9ony95u1311mUju0/lrvmG1GBM5ewja1k2l3OchiKrT9OINQYMac2+Vfyvdh1WKjyJO362mebQUDcy5OC2pt1OHM4zQMskwfcsRkHYL7iX7dBj/AuWAWE2lwEbLe5uso3/MKujhwvjzeb4ArTAQifHcaj8QNE5ASjoJ0e+U/gxBONlATlvVDtVNMTtyMDsbCf0W/Cnl6LCMchxOkjlWAqOudV/vvR9bPpOIPoIhDblvvUJSQix3onapOVWURA+Oh9in7TFfrK4GFM5i2eOFNkIAJGRcbwTOPo5a/V12XRPcooylcmiDtQoBWDTXpbx5SksXOUrVDhHZvbWQFXhWBOnbyhAEp0Ieeqqi7rkAauvulLHGo3MNvL001Hew313T+azm1S6F9IX6wfOK+C+lY7Phf2x2S6h9r1xM8+m8D/VY2RwSsG6BFLBwSxQWOQxatQzs/QjXiPXSirC0epCAkhdVC73z8KZZNiaxd2rn6LXYWL9M0pDRadAuFl5RWIuaKAPtwMk6jZB/karhhpmXIoq+fr5kHdTZsmmo1SftitQbSGe+ZoUqVpKCy9Sr0bU6ozSP3XawvXCGP4FYDZ1ktjpZj/uTU0BxWM1SzpCIL+V8QPYpG1NKbBKsCin7FzbcrDUaOzdqnXH5vcY5jsftasvRYfz0/+/7nGj2xmJ0qLYogj+M+XK1buGXo+iBY5NmMzwPnyrNxRb3+5kBakt865RBe5p//QSJHaYX6ivjpw2TVBtm5vPUTUvgxGA5yPbcQcT+iwgzYvgLAoj5VzFsVSEyGwVYUqz0cC97NX4Wj5V5wuE5oUlHo2k+5cq5ktJ7HNTi78VnRy8WTkCHpg6W7JoO0j3iQCCZpwTRTL+wibCK+JIQY5S4ieYyL2Ea+3ELbAlAkUV3Dz6MlOdBJa8Mm/yxjPKRzTqKJMwYXimJ+zAvYsLsJjuNioce6ztvWuAO0Ll5x976klGc9YI87AUE4v5ZC1UGWP0iSD1hqY/g/E8R/zZI7PvsH0yVG06W7j8cV0FGIID0s86Mf4eDvFx1iHezI0QOMKdGmBjJA8YVLoWqSQRGyIMf+3HSVwP5e1jG4/IL7s4S8fJ6a/SyyiHhLexmmxmrHRu9LJs+e37uc4eziuNohZAH1t6hCPn4ar4uGQAj9ds/ztE7rbfKohp6iU+Pl+YpSBbPirMg6f6Le9P6oby3HAJ0XLNjZeHx/HqcF82xFVT5H240iOManJfg+R5XXFdu1FwLftr7dKxK6mts6SotIYWUsPyy9q4BKNS5xP49EWMcZ4Vyd4oeQkGp0ULA6pz9mBKKS1rpp/m9D3wl2UrDp6bUYWCZ8lTzqsFLOqDYct2U/NEU6ERIKZPctoVmjfn4+la4N+I0apZpnI2nO/GaGDPko6+4SAwb+8wV2dZNTykhkyLshRDEqA2xVwVttgo6Vrj5M5G/gG6vF/uNyXoaUu9dWiQiKiXwUQ4VkspXaPPkQMFJL+Ul8TblTGjEPHezwKbkwAbF2AwhwagAlPUojcxBLlclSQiq0/mC12Z1f/YF8NdMr/iaA+iow64CHu8J+IdB9GIMYbyXbShOqP1WXAOhbBiNpg9Fc07XF+ubSk5s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d73f20fc-304d-454a-11b0-08db03f81ca6 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:37.1725 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LR8qGUEUSInuIewSe+91N3JBPcoRM49iHRWOXxLDMfKIQDWQVpiimCg1lzEFMYcnUfqSwwpEfOsx6qyLmdMS8qW0BJvmhFIEQOT77vUD1SUPRuIH5y7rzA7bP5+nn+ma X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5444 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto ADG need to know output rate of 44.1kHz/48kHz. It is using single variable for each, but this patch changes it to array. Nothing is changed by this patch. This is prepare for R-Car Gen4 support. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/adg.c | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index ff8e8318edb0..00df32be4a4a 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -25,6 +25,10 @@ static struct rsnd_mod_ops adg_ops = { .name = "adg", }; +#define ADG_HZ_441 0 +#define ADG_HZ_48 1 +#define ADG_HZ_SIZE 2 + struct rsnd_adg { struct clk *clkin[CLKINMAX]; struct clk *clkout[CLKOUTMAX]; @@ -38,8 +42,7 @@ struct rsnd_adg { u32 rbga; u32 rbgb; - int rbga_rate_for_441khz; /* RBGA */ - int rbgb_rate_for_48khz; /* RBGB */ + int rbg_rate[ADG_HZ_SIZE]; /* RBGA / RBGB */ }; #define for_each_rsnd_clkin(pos, adg, i) \ @@ -124,8 +127,8 @@ static void __rsnd_adg_get_timesel_ratio(struct rsnd_priv *priv, adg->clkin_rate[CLKA], /* 0000: CLKA */ adg->clkin_rate[CLKB], /* 0001: CLKB */ adg->clkin_rate[CLKC], /* 0010: CLKC */ - adg->rbga_rate_for_441khz, /* 0011: RBGA */ - adg->rbgb_rate_for_48khz, /* 0100: RBGB */ + adg->rbg_rate[ADG_HZ_441], /* 0011: RBGA */ + adg->rbg_rate[ADG_HZ_48], /* 0100: RBGB */ }; min = ~0; @@ -316,10 +319,10 @@ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate) /* * find divided clock from BRGA/BRGB */ - if (rate == adg->rbga_rate_for_441khz) + if (rate == adg->rbg_rate[ADG_HZ_441]) return 0x10; - if (rate == adg->rbgb_rate_for_48khz) + if (rate == adg->rbg_rate[ADG_HZ_48]) return 0x20; return -EIO; @@ -356,8 +359,8 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate) dev_dbg(dev, "CLKOUT is based on BRG%c (= %dHz)\n", (ckr) ? 'B' : 'A', - (ckr) ? adg->rbgb_rate_for_48khz : - adg->rbga_rate_for_441khz); + (ckr) ? adg->rbg_rate[ADG_HZ_48] : + adg->rbg_rate[ADG_HZ_441]); return 0; } @@ -475,10 +478,9 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) struct property *prop; u32 ckr, rbgx, rbga, rbgb; u32 rate, div; -#define REQ_SIZE 2 - u32 req_rate[REQ_SIZE] = {}; + u32 req_rate[ADG_HZ_SIZE] = {}; uint32_t count = 0; - unsigned long req_48kHz_rate, req_441kHz_rate; + unsigned long req_Hz[ADG_HZ_SIZE]; int clkout_size; int i, req_size; const char *parent_clk_name = NULL; @@ -503,19 +505,19 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) goto rsnd_adg_get_clkout_end; req_size = prop->length / sizeof(u32); - if (req_size > REQ_SIZE) { + if (req_size > ADG_HZ_SIZE) { dev_err(dev, "too many clock-frequency\n"); return -EINVAL; } of_property_read_u32_array(np, "clock-frequency", req_rate, req_size); - req_48kHz_rate = 0; - req_441kHz_rate = 0; + req_Hz[ADG_HZ_48] = 0; + req_Hz[ADG_HZ_441] = 0; for (i = 0; i < req_size; i++) { if (0 == (req_rate[i] % 44100)) - req_441kHz_rate = req_rate[i]; + req_Hz[ADG_HZ_441] = req_rate[i]; if (0 == (req_rate[i] % 48000)) - req_48kHz_rate = req_rate[i]; + req_Hz[ADG_HZ_48] = req_rate[i]; } /* @@ -527,8 +529,6 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) * rsnd_adg_ssi_clk_try_start() * rsnd_ssi_master_clk_start() */ - adg->rbga_rate_for_441khz = 0; - adg->rbgb_rate_for_48khz = 0; for_each_rsnd_clkin(clk, adg, i) { rate = clk_get_rate(clk); @@ -536,31 +536,31 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) continue; /* RBGA */ - if (!adg->rbga_rate_for_441khz && (0 == rate % 44100)) { + if (!adg->rbg_rate[ADG_HZ_441] && (0 == rate % 44100)) { div = 6; - if (req_441kHz_rate) - div = rate / req_441kHz_rate; + if (req_Hz[ADG_HZ_441]) + div = rate / req_Hz[ADG_HZ_441]; rbgx = rsnd_adg_calculate_rbgx(div); if (BRRx_MASK(rbgx) == rbgx) { rbga = rbgx; - adg->rbga_rate_for_441khz = rate / div; + adg->rbg_rate[ADG_HZ_441] = rate / div; ckr |= brg_table[i] << 20; - if (req_441kHz_rate) + if (req_Hz[ADG_HZ_441]) parent_clk_name = __clk_get_name(clk); } } /* RBGB */ - if (!adg->rbgb_rate_for_48khz && (0 == rate % 48000)) { + if (!adg->rbg_rate[ADG_HZ_48] && (0 == rate % 48000)) { div = 6; - if (req_48kHz_rate) - div = rate / req_48kHz_rate; + if (req_Hz[ADG_HZ_48]) + div = rate / req_Hz[ADG_HZ_48]; rbgx = rsnd_adg_calculate_rbgx(div); if (BRRx_MASK(rbgx) == rbgx) { rbgb = rbgx; - adg->rbgb_rate_for_48khz = rate / div; + adg->rbg_rate[ADG_HZ_48] = rate / div; ckr |= brg_table[i] << 16; - if (req_48kHz_rate) + if (req_Hz[ADG_HZ_48]) parent_clk_name = __clk_get_name(clk); } } @@ -654,8 +654,8 @@ void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, struct seq_file *m) dbg_msg(dev, m, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n", adg->ckr, adg->rbga, adg->rbgb); - dbg_msg(dev, m, "BRGA (for 44100 base) = %d\n", adg->rbga_rate_for_441khz); - dbg_msg(dev, m, "BRGB (for 48000 base) = %d\n", adg->rbgb_rate_for_48khz); + dbg_msg(dev, m, "BRGA (for 44100 base) = %d\n", adg->rbg_rate[ADG_HZ_441]); + dbg_msg(dev, m, "BRGB (for 48000 base) = %d\n", adg->rbg_rate[ADG_HZ_48]); /* * Actual CLKOUT will be exchanged in rsnd_adg_ssi_clk_try_start() From patchwork Wed Feb 1 02:00:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 650161 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3EF6BC38142 for ; Wed, 1 Feb 2023 02:04:05 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D86AB826; Wed, 1 Feb 2023 03:03:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D86AB826 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675217042; bh=Aox8reNlue2u0G3b04Xyd7rznOhQ+iunZWi9tgITOtY=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=L2fwRRCLC3aIYpzXC9q/z0PYv28qKtkE5eH5NHeSLZGo6FX+dQPHQZ6BMNTi4IXzq spFb9GsK/Uc9MIJuP0HLsFaleM+8MqgDrns+Nb6hzboqPy/lTmheziHMSjbXWflFk0 fgj6ccby8fXfrm+e87jE3xeAeHc4QR3O8T7ayH64= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 57E6CF805B6; Wed, 1 Feb 2023 03:01:00 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2E1DFF805BA; Wed, 1 Feb 2023 03:00:59 +0100 (CET) Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2104.outbound.protection.outlook.com [40.107.255.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C15C6F8057D for ; Wed, 1 Feb 2023 03:00:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C15C6F8057D Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=EhmDIK3G ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jrk8DbyvSUPoo+quSf5JlrcIDX7oZhP5iD3yu8nptR4b4cBm9bBD6RrDe8NVih9uNa1DBpMp2vNGaHVZFGnw4Bc6c4VMwgQTIu8O5gncjqmDUHo2H9HZB2+YZi/xXJJg7lU/8LeqcC0wVjXUgfzPT98Dpth/UjyC1UXn6J36W6ij5t+wksQ3XTgUeApYEg4y0r0f0jU4uo14p8w/HDa295agwjNLtz2lFowOjIiWhh/WfH+gBBhfbaDpXICUavEfXIuiGUrpbj6+13CWyfpyKr8JV2EcgyX2L7NaJDXbxQR+oNMqyAc32HfYS9cT2pRF4s9z+dL7nzPFVnerL/ceFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WiML+pt5TM717176HVoXZ/EReNw1H4WoqVo/ARKvnwQ=; b=kIA3SKB+YQlISqyD1xSrPB9oZeZUELMRXMm6iW88ru+hBEZRcrwSGGo/lwMR9mYAXsuvfU3mlKzFMyY+BXoTNttDn2zidlj4J/MhHSOcOxd90BxZHmDgkNa+lrWUBwe5tRYtTIzsnecdlrJ2EbIbGEvkSFK0yeU+Y4LhmwFTFmAEfygkcjDcaKV65PzVbqzZD0wgcMXLLREeTL6OjMJiwttXPdjVaeb65teo77iYmd/ZzHHK3dUCaUMvDbyTVNigrUcISKVsTjnhjM1W0fMI2eRj8M1eKOymq6BX3GBuDYj0To++ixPL9DPGD1nHMOz8HMRMd1wKAvpVl6MA/sLT5g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WiML+pt5TM717176HVoXZ/EReNw1H4WoqVo/ARKvnwQ=; b=EhmDIK3GK4eNYVOmbE5WTa8U5au4T/58nkZr4bON+Ld6duWO98BrIZIBI9eDssQJVqGXvqpH0Yy7iYAVXca/pU0jZhBrn1PkWeja1VC05uBS92kjGxG0AGYnr9Ho3t8Hz2DGoImmcx5rKB9Mr/N3WEFcFrBH90BFK6hWQsZhtpM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS0PR01MB5444.jpnprd01.prod.outlook.com (2603:1096:604:ab::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.38; Wed, 1 Feb 2023 02:00:43 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:43 +0000 Message-ID: <87sffq5elx.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 12/15] ASoC: rsnd: tidyup rsnd_dma_addr() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:42 +0000 X-ClientProxiedBy: TYCPR01CA0091.jpnprd01.prod.outlook.com (2603:1096:405:3::31) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS0PR01MB5444:EE_ X-MS-Office365-Filtering-Correlation-Id: aa22e203-b3b0-4980-8ce0-08db03f81ff2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SQRIpaK1Vktu7fRhgP90F9bwnm2YMEQ8x50lWBLE//Ci2ivQcCLJtoeajV2J98uDRZSKcnxVhH1TgXm6RICRgvMoaKRcrgO7bMiZiTrBR4BH0LHCN6MlCDe7YtZwrHwZKRDKKLTz3ie4XAgheHAfHe/N4ff6WppQwa7l1vVO0hDoHxLsAmbdiAhWctWayzgmrsV5DWV6xdHkbwCgBjDy+HsSpv9ghcNZQiUi1XVeaEjJMoeNImBXyPJpsUq3RLo9D8YWAZeWKHdGY4cQIOnQIEzi0UrOZvIf7l67cimi2NYcGtE3pdK1vErNV85AiBj0VZr1jQWIYOKouCxUE4GovKe8nvCGogkl0dRX8fuQXQ95Yjee481cMYjAkBNEQ7x2Ulhfp+jaiFhzk9wcZts6p/Sqdr28r/5E605887Ft4NIVR9E3RKQFvDPTXJntgdfQ1nWrYeXheeQRI8UR4dvwZDmHoghfEBIIXh1cVj48odFXTWl839cZzHsBd0onC+5SVgn8fJrbbz56xdYYZdMUZGI/p0rnuGvv2hYZV9FPoKChp1dwAQAJRL0I4AgQs8JJkJIJlNBZAnyFa1qTTnvvHZAAkSaGF9WtVkjOTlcBYg9jJs3YS+GsEeOxQdmvHARBUhOKRYoR9AjYC0SLrCRkpjEx0Cmhdt4uLET//5voPOijK8RhBNDdCXz5ztgvUqXfZd6vKch38p7PDDHtoO64cA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(396003)(366004)(376002)(346002)(136003)(451199018)(2616005)(36756003)(6506007)(4744005)(186003)(26005)(6486002)(478600001)(2906002)(86362001)(52116002)(6512007)(38100700002)(5660300002)(316002)(38350700002)(4326008)(6916009)(66556008)(66476007)(66946007)(83380400001)(8936002)(8676002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2snmwnWG740giF+i9Rums8KVlrLn5pPWi+7bhYxLR0bKR2YbpbWfqVRR6tg4i/KVZ1NPddHutK/X2GH5MLWSMtEiToksreZnHHifi0wCkn9YuLxihla20rdRwvXCHDECKEt/oPvQWhkSV2onaFKtA9syIasaTrYQb3oq1vl7AsIdC5308JGABAJv89nf6X7kSWuCbeB78EOWY9/Vo+UjmLNSyBqRPjqBcsOoptIZpP/CtHjOK2QIH3S6rMszLY7++dYca1pmaEBO6PTEEj87gMSSpQvU7xHftd3B2xVPBGNXTMcMKrldm7wjgZ1T/0UjdVFYdQpXOB5yP+x94MhzDueecYweM3VT628I1WJIM9Gc0eNcKX/V+D1iaCjRF+mD0HJ18toLsm5YNkfr4R+ZtUXDOt8ijGILvlyct/48Ohh9J7ONC08Eik21TRu3C8twU9v35mvV9BJZnnslQ4m/3z8VfclKhWw+jTc07pizZ/mdeRcmzCAsBPTmJYAHKniyeQwDR9C8AZJ5bj6vszbasFbiU87ArH5lKiMfCQ1hu1pXspUlTr9bZ6Vhhqt/dSDQSlDAkyeXDGqlso00NA29Jrs9ORimyVjD9440rCaGWC0MU/Ixkr1AXNdAsR1xpcMpS7nFwv7JNbPwi/Usnh/Pj0IE/ANsKwLKTUWHbMaJdGylncVslVNC5VpBxF01knumc6HO9Pv0OBGUZwHtxBwFa8qeaxvQOJWkKRrTRcZ6Ir0XUK4hVRZjayfEveHqDz4CrmWd40RH0h6yObspoJZQPcLfAg+4Nj3q+HYUm3vrx1vDmy5D9J0VLpGjI3XO2I8gL9F2SIh7AekDE8fJwUrywEltNRl6ns7Cflvo9gpJGDAerqMuvuhweZGdlc5AhVq80tlj+nK9KzqqA0/1tb7xDCSiYN/6FHW/qI3DJTohBQsLx6Dto3hOlFstD4nDi1HxhJuZZ9S+xAJaAzndeKX2wH/0Zelf4WMCJ5F4pX4D+BthyijutHoK8dljrSEGpvb4g/R85W0r6QxxDzC4HXJesVD2xSlbvaqffKXECSlXX/HhBjzzPvfD6F0ija2w6JQKNKI9Z/hKs+/T/Mt95ggqAtWn1r6265dUHxVgu3TOvO2dKGLpLz817zcDf+gOH1aEMGcNKflmmnJpb2cT9cJZ1Na2EEM1lLFdpB6joDZ+2cxfVNGvCgID8vXJtTjx3f0No3yC1qiFwhRa+3xqd47y5zYJA/ilxNE1ACZmDueI6FERqtPsvME0kCDO8G1/DDny7Ukh1fWenWWSFS9IionbLNDIUyXTmnhBn6KrrVJrE2QQHaahv+s/QT+gBozWhYJf0PnVtxMynsEV6vG7+PNtbNf2sN2boGdQJLcx5rf/raosDwdiFI3+L4fkQQlu6pSg9LzpFAi2NbAHzWWduTlbGzwLpU5XzBZyh/m7IgB4yflk1nphjJRnLTmBVVUL16vVid0A0IIw5iN2S0ajiuTPZywCYeTXO/GtcWVXaYReX5vpSKPdJUkoqrfN8kqTWZQh0e70NpOQT2iAOfPTDzqC4wwAYzpMBp7xieJyNuz0QxdqU+4DuP/aWz3YgyNRhy3L5u8aiyB0Fx5GlFSJRvtKwRPWnINGnJPggbp2u0qQK2M= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa22e203-b3b0-4980-8ce0-08db03f81ff2 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:43.4880 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aQ45bBinutlZhedJcUC7+fgix9YOtPVC/XGS9hc4Xyw10AmfjPK4XxY1T1zkoWk9ANkjxWKhoEgfvaCXhj2AVfVGAmIsqH1vYIl1xhp5WIvUKEuOf262UI/0evg4FcQ/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5444 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto This patch tidyups rsnd_dma_addr(), but there is no effect. This is prepare for Gen4 support. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/dma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 463ab237d7bd..b422c3bd34de 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -659,16 +659,16 @@ static dma_addr_t rsnd_dma_addr(struct rsnd_dai_stream *io, { struct rsnd_priv *priv = rsnd_io_to_priv(io); + if (!mod) + return 0; + /* * gen1 uses default DMA addr */ if (rsnd_is_gen1(priv)) return 0; - - if (!mod) - return 0; - - return rsnd_gen2_dma_addr(io, mod, is_play, is_from); + else + return rsnd_gen2_dma_addr(io, mod, is_play, is_from); } #define MOD_MAX (RSND_MOD_MAX + 1) /* +Memory */ From patchwork Wed Feb 1 02:00:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 649206 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4EF5CC38142 for ; Wed, 1 Feb 2023 02:04:25 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1EA03F7; Wed, 1 Feb 2023 03:03:33 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1EA03F7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675217063; bh=6uqR5tACbc2JbNkpj0zFRwKwFEkhsW7lFOPLLOYbnXw=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=ZA9H/rhKhO6AQ26APzFdhh1CdXnxF39ByiodWTI9ETtguv27Y6yV5HLIYG+7ik/ym 2Msf7f97B/f3CDiJMPYa27EVMBIq8QFDG6e0NYfazhcAKBJ2lXPhhDKpn7X4ggZKQZ Xn67g/agkXbK7s0hXsLjtlgFqT+yNJ+QuGNUNP90= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 50AB4F805B5; Wed, 1 Feb 2023 03:01:03 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 772D5F805C2; Wed, 1 Feb 2023 03:01:02 +0100 (CET) Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2071f.outbound.protection.outlook.com [IPv6:2a01:111:f400:feae::71f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 72D99F805B5 for ; Wed, 1 Feb 2023 03:00:53 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 72D99F805B5 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=D7SO5x2Z ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dxu4WfgXmFK+ZV/876DRl2Qk+Ay+P2bOewkuQOmDGFUJIwGjHET+W/Fk8pp6U0KfpjDOi7k22WvF2FAeE2g5lEO9qEmouYoSZKNM4oSMfLPwY3401fWgzBv0wMIoTadCjIEOMSI7LX2GSh59RC/rsfmRBOx2I/mh0GhMNwxDll6kwAKYUQc1PohUUHqH3poQi/5xyUqZpggU9oYqCSAaCpKKBNuD3MwAsYuOmWWIZ0eTl9hezGTCaBu1nAp0uiITxUIUQkH89qALFMKiusS50o/Vd5z2FUxqW0BvyefVNaK11pz52/ygFCJ2U7G6qeQqXr9TbiyBmIkKUy9HfDJalA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EwH602cBiOgxqlwlXuVbOe1kRkUpaokcoM8mI6nHzRI=; b=eYPbbhalST2XC52VHNHYvaz6jJnjAX36BNq2K7ZCEXS+OK8dDavJsUS42EvQMvHRvE1MmpjNhaLLqIDJpbb+y6Q1G8AUOx2o+KpoWCtqR/ib5zNMNea/F4k8Z27tUd5f6SLCrlFwk+OhWuhJCg8cyIBOVENEkHipg7OccON99jC/vvnI4JIZA0NnAIAr9j/kpCC193INTZED/ErWsk99EeRV26C8xAH0bS0UUVIkwlS3QIk3Qxu9MMsJD78gfd28W/hgx6oIHGNGz9a99vU8bpbUrALHoa/lKTPh8GFH4pyDJ4tzoYdqyc5oUAvcx8YlmV7iI8at+I0CJkk/zPif8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EwH602cBiOgxqlwlXuVbOe1kRkUpaokcoM8mI6nHzRI=; b=D7SO5x2ZJvi3IeRjtokjO5Db0WYiONvDyo2yjgxi7tOd0ythAU9VdHv7yeX7Aty0xxY3x6IWeVrQMR41rYiC/bYTpPnmmRR4uPC+BTdDWOC0n0DgLzgJ9FCvkm2dpG4uUivFL0wZ5erxmtCvgWqVocAg8aKaqCYhtauocNPitbQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS0PR01MB5444.jpnprd01.prod.outlook.com (2603:1096:604:ab::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.38; Wed, 1 Feb 2023 02:00:49 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:00:49 +0000 Message-ID: <87r0va5elq.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 13/15] ASoC: rsnd: dma.c: tidyup rsnd_dma_probe() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:00:49 +0000 X-ClientProxiedBy: TYAPR01CA0163.jpnprd01.prod.outlook.com (2603:1096:404:7e::31) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS0PR01MB5444:EE_ X-MS-Office365-Filtering-Correlation-Id: e8db4a23-0d13-4dda-6957-08db03f82429 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tGcMPDzsrSYoHpRxEwlQzeQexMoA8mLqykI/ViwSxsSQdmy0uT7nv/trwThW20Aveu7j/YuJ4+tiWKbeTo0rTK6VprPf36p19j32JpN5TN1BKoRs8K/9+Gz3HTULBqyEJ2II3K1gkf25OBb9Gpya9vGgQ67IkncUorcniGTmBfncj388kSWAPUTFBywdGG52z7e4A6T6K3sIgZhjcn2HHEukxgEf0NEn3EIYctajfN53FVnMfwBIn+wF3dE+Fpi/n3gN2kn743M667R0UHZIyhG/MZRP7/Qx2sNK6ZnJ4G3B2A5f1mOAJUiYd5r/CP3cQiKOFOj5oR+r2B74GFdolWxFx7jpF6h4SeRWZsW6Sn3Ex4Sn2ukz1BH353IHy2GVjs2lAiZz83VM21y8v/Blz2xP4eYtZ80Tc9iE4vMa0j1+SUZFzDcaWGARP3wniW62l5yzC0qq7i26aJzOYlP6qAdEB14D8wdRxE42+V9sy0erKkSHnYzSBOxwKkcDhkABX9M4NHYsZXFVbdFMZAQrqTVNK29KJx96OzSzU6bWO+UvEAiMYUtgEscti9rsijMhQSYWAOnD0/zXducpFuXCUp+dxeSuuIGn9bHDyLeHMCfrYpNnVW48PhP9dM4uUfK56POV6PA27oZ9Mf44qvn104UxTxMCyIHy3LCeJDDmpD16JDB2AZCghV2dWxlRomGwTjbyCsVOIB2uzlkxM4mz2A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(396003)(366004)(376002)(346002)(136003)(451199018)(2616005)(36756003)(6506007)(186003)(26005)(6486002)(478600001)(2906002)(86362001)(52116002)(6512007)(38100700002)(5660300002)(316002)(38350700002)(4326008)(6916009)(66556008)(66476007)(66946007)(83380400001)(8936002)(8676002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jUqduj8wB5ICYWg8iBYpK3Yb0jJXODqnUlWJZQGggKwZ9FbPSLejwjSTI79gahOi010631/OMAYPt//Gw7TikJtzG+crz2+XTSJegGs+ZkZCSCktv2ypldg4rx8I4tdHXzUTge/ghi7gHmqB9HQ1OydveUr/B7p3lccuKrLOdAmgNXQlYfsNNfuMXPg6AEmar5maRgoP1E4Qco39PuslXDDr+YDhpFX5e3GVaqnPbriluW0gmjE0gBHSFSaQ1t7DH4ppFl/0F8/5HPRHcIrzRj439MjQgC5N1RRR0BheKU6rnHkRCGqsvNEYrUF+ynEqpRFVlpQ0YIJcw4eL4yr8WCqMds7b/tP3o0FgeIwfp4LWSwgL/q+zOFOiKslDRBUvsemW8U+EDg7z4jofRAhrCbKtHhyfnDLEuggjVK1mDCU4M6zpE423PJGMl6ultLGV2QF2HpG81pebNksCKi/Vj/4VPxCgijD4Yg+jWYZBDfHKdfLvfl14cZwvcyKpUWH680siQt/pDBKjKoQhyxzexb6NJdlMm37HPiTqMvdAKwwsAS7fz0spcRjxqXHhHOJ69A5MHeXevSv4T9+QJNkPgYz8m2gp7Xia0tSH5Yq0nJtpe8uCYBGxS57NqGK2yia7SBSDdhTYB0YLg0usba/mF3/OnRyvlnh4p5ydoVLPaV2kF2VF4XRQ8KxeULzkrLARk2+k8riwByedMACyGALeNA98L7LM6lKV+vM+J37G6bD0jHerRW/suicYAPOecbpg2+ngJkyn3L3+hUuajyl3tKc55t7XnYj5rKUZ9HmG9tDz9k68b43xzbwSHm+Agq6SHN7zm15AZ6YxkAnZ53dlEYuS99HeAmFl9PkJeZ940v+7sURZRo4F67q7wxqFMWkhj2tpbNFVs+BeZLEw85YuComrOctfdgB91+MEL5eI0D17zdJ/Y/V1p+yfqqxhgmUb+bmHtGFNgzEgScHYZH/3xv1OwtZHor05b2R9ltPup7Xo8rmm3WTlikCpDTn9dLaheS1zZlrIAhbx9ubzBvWHBlo9oGYcVLtsWW20aJcwpKmVenlf8vy4mezehz6kHXJmrE9y1tFjUerrPEq0aRpOFLG5tMHVlY8RgRBUwvZAhBNB4PJAjZidA49NSMoMfdV9Rtv+ppdnlYcQDzuughOXAPGC49vEHM4u0Qh2GIcdwM+2YbtcT+8KbDiKbJoIpVhVDvNaShzoAa/lN8Lq0s62sQP8sZMtKQjAfiSarFAP1qJhdclgnO5bAjlrT4DSAjDphW/nV3h8aJ8CPw099o2EwwDQeWoh6p6OYb5HEdkG1HvOwhcfvWffV1R+EkvpjEm1gZAcXBFPoIL2EsFfgvvN8jCtri1eHrHJSUY7aQ4rhRm4QEzlRVgHYkDTSqC3uHvVU1eFh79Cx75EOj2/KkoJ4IG7aRlvfeoL9F7eokVjfUez4AYm4ZKagDjd4nsGnwmXmcRGbF/rk81eGn8gX9SiKhvFwSA7Yr3q/mvpqoaDaFBNQ/s9y3+eJqR4pSRmeWQv3D5M63jjiRJ23wUnCUQ0E6h/Gb1Vuorr3miBpBU+769KrYrqD1yEWwx5gC8AxaBDsh1zFHrTRq0z0hSJFordaiuRK1GDL4DcHqT42ExoSN8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8db4a23-0d13-4dda-6957-08db03f82429 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:00:49.7617 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7ajvBO1sEhC9l1hNfew7Cw0+cbfyDsscu/qJEbiNuqhqt3s3WDYtm61fSdwnftjH99E9rVVn1zMMVCY8CfhXK4sEBnqhfJ4LJU9vH6JdDWa+qbJTF+GJpmGuJlT/tyHI X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5444 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto This patch tidyups rsnd_dma_probe(), but there is no effect. This is prepare for Gen4 support. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/dma.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index b422c3bd34de..9aca5ff791a3 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -885,13 +885,18 @@ int rsnd_dma_probe(struct rsnd_priv *priv) /* * for Gen2 or later */ - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "audmapp"); dmac = devm_kzalloc(dev, sizeof(*dmac), GFP_KERNEL); - if (!dmac || !res) { + if (!dmac) { dev_err(dev, "dma allocate failed\n"); return 0; /* it will be PIO mode */ } + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "audmapp"); + if (!res) { + dev_err(dev, "lack of audmapp in DT\n"); + return 0; /* it will be PIO mode */ + } + dmac->dmapp_num = 0; dmac->ppres = res->start; dmac->ppbase = devm_ioremap_resource(dev, res); From patchwork Wed Feb 1 02:02:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 650160 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E49BCC38142 for ; Wed, 1 Feb 2023 02:04:34 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D6577DEC; Wed, 1 Feb 2023 03:03:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D6577DEC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675217072; bh=XtkkJs263IEgNlVOnnEx6NWQ1K8b/T51jJLhoX9ssd8=; h=From:To:Subject:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=crXfBl2G2kkxl40ZWoDlRrnKRN2BdXiBCmbcGNnE/K3rWHRlsgPpKSHB0UoxmYMeo fNYa37vLEa6V1jwJmu2yXTIt13C2gDMPceYUCzBj+TgLvzx9Nj6GCtpylWO6LKtW6D HfKxQSE9Ocd/besDTACY2cLUl/4LGmF7nR6UPWAE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 09152F804E2; Wed, 1 Feb 2023 03:02:20 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C806CF80519; Wed, 1 Feb 2023 03:02:17 +0100 (CET) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on20723.outbound.protection.outlook.com [IPv6:2a01:111:f403:704b::723]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 8D8E8F804E2 for ; Wed, 1 Feb 2023 03:02:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8D8E8F804E2 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=H2vNxDJF ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NOTm7xC3b6gCRJ6og1Z04ncfgKhA5SuD/11aX8DXvT+frAvg9llXm2kVZCG4UX4hvOunxqr954dSwexdfWc9ih2cdDTr6VmT07fv1GXJ28Hnwudg5uChr/mT72KQcTUTHo+MJwvqcTAfXQkDU2gxdw2aKH1HotkuHUREWN/j54p0OjRwzrctHRc3InGhY6GpZc/+dTeCDKgdZInJ3jT+6I3ox6QuYhkx1f9Gne3A1dWd21Mg3UZfX7LQ2FLN0ehOyqWFej31xMhfswOcmogVyAjdg6hrWkw+y2gCLyg2AlpgFdYMQrwpLAWdj8dGtWEB7P9tzjAX1iA862nwmBjo3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jBL5GAcQu+Pqgo7PA1H2Fqcrh5tEzL9+VcyPfVvQAVs=; b=kbmIoANHXOKRwSR5Upa+Azo8MrF3h6CGlqNIbyh2SmGZDkGSGLcbHnLRA/J7JvmJJHWcNHcYqXeW98XzhgYC+FtTQdx2LDjYl4Sr3Rm4eNtZqy1bzFOZYae9BLxOZ6zIjcNDgxK70MssOD5hOOebaw7Rfa1l5PIUCtI5onx46TQnUrYK5/5M250LZzUIvz6NoIF1OkQQ3zuKhQjg37I00qpjaNp/MvwS4RJiAGuYqVF6RQiXfq/JcRwn8tpx8sKXxOW2kkeqn2wMBbG+hrvd2GECiGwfurvjkBjkM0KlbFicQ+14E3vTGvV7IINbbaPpytE2e4JE4JwZZH+K6gI7Kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jBL5GAcQu+Pqgo7PA1H2Fqcrh5tEzL9+VcyPfVvQAVs=; b=H2vNxDJFW1djmmI/+Sum9xK/AuPeHQlYE22KVbwkYKQidiya+TrEUpl15xkqMbQlEJTXCnA/8kuE8sas7T0UP4jEKLx+N5arDXDnbHULS7k9+EyDDiUJ1jJJL4NgU1AwP5zOVNI7cPT1q/YP4htQSVPSAqNjtAgaCILb9KjMoIw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB8772.jpnprd01.prod.outlook.com (2603:1096:400:18a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 02:02:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:02:08 +0000 Message-ID: <87pmau5ejk.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Rob Herring , Mark Brown , Krzysztof Kozlowski Subject: [PATCH 14/15] ASoC: dt-bindings: renesas: add R8A779G0 V4H User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:02:07 +0000 X-ClientProxiedBy: TYAPR03CA0023.apcprd03.prod.outlook.com (2603:1096:404:14::35) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: 10a31160-94d3-48a7-b9b4-08db03f852c9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: StlPahfVmJsdTDnOAmCFYCK3KI8sbJEEFmb/RczbiXz3JicQnfV/MnRFgF+a2b1olAjlEZ28F78O+UoDg8x8gWs+3/XX5SGyriMdsvO6Jr8dXDWXz3wYPImsM8w6RiPMDEmxWmd+xPexWFh+0GJO5jYvh+absBThiUMtvRBKHSdADIavU/M5rUTBfyVytO8IRtQ0WmPcGZwkHxNBJkwi5N1dIunil/KmXqDjIJrhOKjncz74Hzwow8/qSsnRJikwuajyRYo2oifs9U8/Rx0qr6tR7+m6yLiyUjQ1RH3I2COnolFYHPtcYVEoxAh1scWrVEpk9LIUO9XwpTqybPIKZSuBpfxOVqQd1IkQI3mDiczrOsJtU9mAFuCS+VBUBJXj8befWZQHUw0ah6AQw8GHMGXJZ5DmXb1IGQgSThtASLvGqsWNAYnQ1HcvSVlFFUTpO4QnlBqAst8cNt1OuRD/5rHupBuyNKLNmAAcCaxuEX34l7k7xbfR7UAh/Zrgy7FLoObnvYSuOe6MVriJ4unH59If1fa/IXUkbqIcp7BT0LBwNrR2xmfYWbp9U/HItCE0vCbBlArj64PPTcBr7Oz/28BeDUqLjuJd052lw+EgwwGN1ntdoGV8Z8xw2qUUA3ut2uvvDYzJMP4IOE9sjA/LR63LS80Tbv5O7oLtoUZ7c7SxWQy9cTKJ9UyDhkzcvrS8MAMcVr2gHvSnM+d9LLUi5wCCqi6yn3bkUubnnpFqUlA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(39860400002)(366004)(396003)(346002)(136003)(451199018)(86362001)(36756003)(38350700002)(38100700002)(6506007)(6512007)(186003)(26005)(2616005)(4744005)(2906002)(316002)(66476007)(52116002)(8676002)(110136005)(6486002)(478600001)(966005)(66556008)(66946007)(4326008)(5660300002)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: udjGesIT4S/mnGAjvH03oA2RnWcCjpO4hTDBU3U62wJYM9YQDjPq7/24+rCPPUyLAN6l931Q2G1QogxHzQjXrSnjHLvNAPx9mBKlbQFwmIdxrkCnIToDhk4/eFeLRGRBUQXnxL5oXvwk3oMv8grjC6kP7KBNhzGwe0Qek+SdlzKhVmH+NTVAS85uY/BL4dwPKLmKac+crAL/OgoTM2YZ/ahlhlO+D9Xyz6/Vv8hup1eSV73jvqEqzGxFzNV2Dr2LX4K6BpUj7sMGvgmQcj+R38KKFtubfdtlSU8zrn0VBuq7JNUW7qCiFK7Vma+olNy6o0iH/Hyy1MJYrwfEI1FTXjVr0VK2OMBrkVkKKWjRaUoqJYkx2oj3qikgWa+mIN57Idf1gfqQs0El2qAqLaM0fQpHjQTi7FCNWxmMIQYj3qtR42fbGgxdT0VIaqXuI6wgL/ETQh+Y5thDTQKlkcHfkAT4indEx/zkW9he+g0hPHC8yWTuTPpHD8R0RosaWdOwTIs6E+//hjwP6WotrjkNTJL7tnf/cwmKIsub7lHft9UoILBrT9ntY1HLlKqfv0y3/SS91KDGy6cx6x07ylAEUSTldgnuCyVTzmFx8JBc2n7952Pw1mio/bG3g3llEcBYdVe3i1xNtcbDqbXPBfiG/A8VsUSRe9R8frH/IH4yPD54BPTYE+eOI6rwGi52zOwSP9iwvIBv8X+/o/DOuhFFhYkIA567OcVeFZYS7dtuKOqmSGANcjSWcsZw6cqBgVMfCY2vOTBMnRTepLy700vHqiyEpXpubTTe1qtFaokcY37kvklRT+v2bbnfHRB2ZzCmVYqspq2AoserEvEX+qHY+7v+Fy56Kfu1ocD24Tzxc5DW1vUbn41SJDR8V7w/Aj9fDLEyUhUH5UAfKOfXQZEZeB5rcpy4pweeeAGCbDZpcQVTvB+VHUixN5CAOKgECiA/zsmsaPiIf5YcsTOPr+3o2EgXJqqUlvN1/n/8tPsJNdgf5zwvP7xbzWVtDCR3cvq66a1rNwo/3lEamlknRzucgse3VThymckoryOxIxPsfzvi4IRgwNLz85ZG8vGhVKikDzDB6yUC7M4wWOFROnypWyld1YLfB/JoJGAK9lChphWz23n0nxQZcvQeGseA2i7HXbXBylJjYRRsIeyhTNn5ARhs1OUvkXv8IQEVa3kpt5ZIY/fMl1phfGxqf1biuEWupPUXkTBv+J0vH0nRjHw95IjuBO4mylULdqlp3CvQDRHtWosuwYB3HGWODSAEd+JPmu47235C1YHbHGBbEOd1wS1qJ+NBOzf+C6npP7JI5Z9tvTxv2o1HiLcl4895E0lAzBsOawte44rUiiTHycjWjtX3BGZoE6iZJhVutau7SRGLy5ZAVXrgeK66Zy43DH7/TR0NTkz3g0ekohMwTgOmjUbQuV9wznaAUAoFkCvVNxAyHQiSuBRzrP7xvgyXEeD8cGL3VE9Yt8xKocb83bxWXux8dMKYhfZKc14VqG/k36w4n2NWr9RjjVPJA2fMqLmpaGu4OTvsAVdfgpnLclEqnzy8Y831VyZQaZ3i0bbjXC0GQpYva91PpdvH9wGsXhWJQOTpHXthxokcNnXfS81NBzp0fh+SXUGJVOafjyK+gqA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10a31160-94d3-48a7-b9b4-08db03f852c9 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:02:07.9719 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uLF3yXH1SEqlR31LAvsovlvMl7GXvC5RSVnwhr92z8olaEmvqC1DwxsvHqiNE37TispJq6wmX32YCKf2rKrU1hazQgibfz5+4nw/R9oymhSAZce0LOKzD2PB7DI3nZBo X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8772 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Document R-Car V4H (R8A779G0), and R-Car Gen4 SoC bindings. Link: https://lore.kernel.org/r/87zga6t5r4.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto --- Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml index 66175aeba7a7..d106de00c6b2 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml @@ -46,6 +46,10 @@ properties: - renesas,rcar_sound-r8a77990 # R-Car E3 - renesas,rcar_sound-r8a77995 # R-Car D3 - const: renesas,rcar_sound-gen3 + # for Gen4 SoC + - items: + - const: renesas,rcar_sound-r8a779g0 # R-Car V4H + - const: renesas,rcar_sound-gen4 # for Generic - enum: - renesas,rcar_sound-gen1 From patchwork Wed Feb 1 02:02:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 649205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 042F6C636CC for ; Wed, 1 Feb 2023 02:04:56 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D0E5E829; Wed, 1 Feb 2023 03:04:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D0E5E829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1675217093; bh=3SBifjegUCWRbwD+lx513gyGziXmluQoF+74CB2kX0o=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=KbYmuu+HAv4GtQD2yz3TTCEUvt6rSryrptc9T8/5QJwJPmw4p5keIg7LO/VP1IGL1 Lyu0KY6cie67YILAQXJKD20hNenxeWQqVM9E7V2nEd1W+ZY9wWQvTcnI/zcv1SzVvf 1xJAKOCc26Ja/0JkpJlgCuJhBniGrRhuBe7JKdp4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 902A7F80524; Wed, 1 Feb 2023 03:02:36 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E7785F8053D; Wed, 1 Feb 2023 03:02:34 +0100 (CET) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on20706.outbound.protection.outlook.com [IPv6:2a01:111:f403:704b::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 4D1C3F80245 for ; Wed, 1 Feb 2023 03:02:25 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4D1C3F80245 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=P2EuVQol ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VIsUl2nV/I3phZ7dFqzaiMIzMCx3PuYzNaK3FaiN+tNchY6E6/Ws8hD9oSFPT2w4HCzgKIJLNMoSkghkXR91bh8TMUVMl5WN6bJkBAOmp7bx2jMEIm8y7hbRi7UDKj/LX3B9NZvBv2A+6J/qeUXHpG+qRbaq6laoZ0CKpqXNAfadEtP5js4zI9zpWQeoj/NYTNn4Q3tHJUcr/bA59t17NoxjMQKGaQO9XZCWley4c7YTjnHaEMAe0tgTqCx2iJGmkbBFSaaNPMSZQcH2yMhtd2UnBkK4NrZJ77nscErsKsgiMeTsrJKbKiKdfKb6U+IRa06cYmf6jdwYre1/szyCSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zH9EK0hDHG0pSEmu5cYql1dWDArF6I43CH5X3apI800=; b=JA+4JZaT7Dzy8kQXbaKGqDM6wR7cumxWB9fSuiiPX2j1OvSmi4pzOp9h0Lwea28RPghbxA4lZvW2KJA8pygNvtFBVAdmi5vnY1D5/4rN9Ciw+y+WISbCFLK5nX7MGUdN5Adj1PWHV5U7mVhBlzXJxymw8LvKjjO/9W3/neQWs8WRIgToiKPPwN5vwHjDxPU8vN6wcQ+08xo/PvattMFEXpjvqqxHF0iFVVdyYwLrV83f83yBmzB17NP0KDTC40jgGpv1V1D3v/2TeLXSU1AKAspTCwRx8I0kYufTX8AQgJ8qbqasu2+nKhJsRpO9rPAm9NHxmY8HuN6Xm94kSMyxzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zH9EK0hDHG0pSEmu5cYql1dWDArF6I43CH5X3apI800=; b=P2EuVQolU3kn9KRKw31RD981HHhi3lQJEeIVzj+5x0wU1AnoAQVtjTfInT3faK6aqiU3L2sO6llydWqM2q2LnTXxW3sn8fvsO4KkkGQpI/cMq2dKr7lDDFCIb6AzOKEnsOsJ6mkoTON1iGSmYY3zh3YId3Sz5BzeCL9KP7iu2WQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB8772.jpnprd01.prod.outlook.com (2603:1096:400:18a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 02:02:22 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4b75:8d8e:d89a:7860%8]) with mapi id 15.20.6043.036; Wed, 1 Feb 2023 02:02:22 +0000 Message-ID: <87o7qe5ej5.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 15/15] ASoC: rsnd: add R-Car Gen4 Sound support User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> References: <87a61y6t8e.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 1 Feb 2023 02:02:22 +0000 X-ClientProxiedBy: TY2PR02CA0020.apcprd02.prod.outlook.com (2603:1096:404:56::32) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: 89364abf-0e1f-4667-fc66-08db03f85b74 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qi2oLkid8kkkLuqHwpzUnXxAaRlRNOUs7uib9KyuYNgCmUTJyiI2AreRgzrzkhCh3cVhljxtZxDF9EpYcBUBlwGl78KcJEyVBxByJt4249aGwk0WhSbxdMRtaxoYL6VjrJqbaWE/GVsgPFFe9fW156VP65/0vU+MOxvAEmbiBIGGjxh7Ne8sqjxVa/nTYS83gTTQlKZMABgjoQuIfeeheIeWC5P02yPjo+YgKm2GkLDr+aafJjK9B10OvcGRIXt28edeng18IokjvQ6PZhxseiXgwDmN8hgcVfw3ZSjHA4pq33yL9n198zgIJfxXlJ8P7zf8+w5P2AAuSZ7ldfSgRtUeCvrfI1g42KScn7KfpxBNi6Ih0cJC6REkEw4oDy3W9GhGtXYbSVljJNBndzSApIexynko/ZpNagJP0lhZGCI8IzlwhaeDis6yXP6FoPbEx2fncBmdDP+kXU0BF8bREbQ4ZyApviyF9xygydGeDIeurbiKuukVlUs2TWjF1PmlTBLwqLmwr9Ej8qHTWM2CZYF7CBbpkBKTrkSsXUJxkbNXTtyCvS0PGh/p/AzaM+VHxU+PsjZlkXcHzTYXkaQwUh51hnJObKn7zfx8JMELOyPsbQ+m/7JuSnqZgSrZvBInwVZS82U+ud/Nb/OTc4f6Io+Dv7HbZWoknjPNWD7UG+yYD+oB8R4fuUNx7cTphED0lrqVVo8VqWvEX5HTjR0IsA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(39860400002)(366004)(396003)(346002)(136003)(451199018)(86362001)(36756003)(38350700002)(38100700002)(83380400001)(6506007)(6512007)(186003)(26005)(2616005)(2906002)(316002)(66476007)(52116002)(8676002)(6486002)(478600001)(66556008)(6916009)(30864003)(66946007)(4326008)(5660300002)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aWNdk4qcKUMXttB0YQ5erHoqW5GXq6JmRd/YfA1U8VO68sfxxktK5FjhM1PsRp+LgCccLygLfxArsc7UEl5mhq+lSgKT3IgGUM2la7n7l6Vfe0TxSBtE8RLAP5SQivsxaCdD8m8V9j4091NIoYO4JD0PxsAwbS4dZEymY7dc9LffEyVpDVeg5Iegj6UbLfZHGiyjWPwS4a+YbPJ8q6R3NRkqMGaCdnVSObb52S2Hond5VOAo5ig1HwzF5bOL/Q+tPU0NfyUYBNbfR0pM3+TOHaEJBS5cmIw5P8CESK8bIYCr21emOzhD21QInjJCcGN4gYeWWRsQVJB8ykjHi+osTkOjWj7EUSTZvJOHHhZkIBBehRq+7SnxeBLtuh5otGmSqP0e8iTgXFKuoOkceSepPbt1snZXn74zEUgtNGmdchJUWGZQEADDhU3jG/cNqEmZSooukPordHujyBaf+wcBQZ6cWS1BN7vtLyMkFzeVCHgCtyNuX0wO/f+boC8tLkl/UoyjFBfiJleEw1B6gSxAKNI54xMLGuvy4D3WXUQprbKtOMQgOXyxcVTPHGqzxY3+BlWYybI+6xf7pQgQ6W4Ryn8wXszQECsf+aUvonfvVHzZAZTD9JgT6VzlS6Ql2YIxlBJPJKFBmQ8BvWuDSJSwt3d4EDtLSUKQI9bDy6I7xRKDYafMJhFgLtwaXgZVvdXxzAg01XNn7tg7C8CVVGKRnbIU55qBaxmkBhoevnLoIViHaQoRD3CaTPuetxi0h8dBSpCExKKEzSDaVM7Aqa4SXkj8+eUhRdGag0zD6R2L0vlSJHe8SrE84F/6Ki6AMjk92RZQ997Q1VJDjZI6dOPa6guARTLhaL9kliZ4iEQSBpd8EsxNQxMVvVe5XyGRqubETqBDHs1pf0UEaTezqK1z2UQFs9vyXerrKf0GP9+fAxQgskJdh7H68D6GL203TNb852vaeZrqpox7V4JDYIjvXNGJEVlPbT+WHLxXLi/TDPspjQnZmPbcvSJLzrlQxiyXnDAlWpS7zsgwUrxuAGDWa1EtfkTAcmcJ6DwsokiDprFwWt80HOAEumoHoNNtPGl42dRvNrhXcb1GWJOt9v8qKqMDjLd9uMs3EVP7AWdEK4n8QDWixbu12uPVa/4Bfs5fhNsglFriG5g+C8Xm83Fz4qv1OZORcWAycsUCgAogBmvgJczUkh2gfnbRVt9a1TB20BmGRaV/a8Y7qwj8F9XCx/fwYgO0x+BfDNmjAdT1MbQ0Rti6mKBaBgdFFWjJo9yJZHYpRuADORPfEQp5kYUvWYN3lszqaHC7nn1k4lvrNpaNTqSLeoOtwB4uzvg4PRDXvrpmMaBVhwPOU8WHOZNZgKZ6Jkw6nUJ7snLraobZMbSEMOCz0li2m5W+P6wbb00zsieHNGXGMFDnpttEYgSMPsqcb0+bCIPiPUdF+6DomRg0OwCGCIy3Bk8qWjLAqKLhZQjN8Bih58cWEFm6w0Glo2VM3tPXtj3P0fPpF9ZFdH9r40DtwMqlH5cpi353GS55+grkoJXSZ1WwA9tc9mHfo8mJsGej65qIPdPXb8GuxBJMrXDCUYHSH61nGmr9SBPmvf5Zqcu7VTQ/bOSHXBLyOxhnVwF+FLR3b2fENDAVK/k= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89364abf-0e1f-4667-fc66-08db03f85b74 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 02:02:22.5785 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qA7H/ONCKAmkKZBKw4pX97vz+eDYOLVNR05K1YqCKSAtm5u2X2z/3a4+hYsY347ORlrqIFGcDLOHsfCQysjGYvy8Q8AV/P9ndD4UbmnI81Ibw806uqvFe0RMXI5Riy7L X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8772 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto This patch is tested on V4H White Hawk + ARD-AUDIO-DA7212 Signed-off-by: Linh Phung Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/adg.c | 10 ++++++ sound/soc/sh/rcar/core.c | 5 +-- sound/soc/sh/rcar/dma.c | 38 +++++++++++++++++++++- sound/soc/sh/rcar/gen.c | 70 ++++++++++++++++++++++++++++++++++++++++ sound/soc/sh/rcar/rsnd.h | 8 +++++ sound/soc/sh/rcar/ssiu.c | 15 +++++++-- 6 files changed, 140 insertions(+), 6 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 00df32be4a4a..7bc4421835d7 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -57,6 +57,10 @@ struct rsnd_adg { i++) #define rsnd_priv_to_adg(priv) ((struct rsnd_adg *)(priv)->adg) +static const char * const clkin_name_gen4[] = { + [CLKA] = "clkin", +}; + static const char * const clkin_name_gen2[] = { [CLKA] = "clk_a", [CLKB] = "clk_b", @@ -435,6 +439,10 @@ static int rsnd_adg_get_clkin(struct rsnd_priv *priv) clkin_name = clkin_name_gen2; clkin_size = ARRAY_SIZE(clkin_name_gen2); + if (rsnd_is_gen4(priv)) { + clkin_name = clkin_name_gen4; + clkin_size = ARRAY_SIZE(clkin_name_gen4); + } for (i = 0; i < clkin_size; i++) { clk = devm_clk_get(dev, clkin_name[i]); @@ -568,6 +576,8 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) clkout_name = clkout_name_gen2; clkout_size = ARRAY_SIZE(clkout_name_gen2); + if (rsnd_is_gen4(priv)) + clkout_size = 1; /* reuse clkout_name_gen2[] */ /* * ADG supports BRRA/BRRB output only. diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 3de81af41ffc..a9125c1ff75a 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -102,6 +102,7 @@ static const struct of_device_id rsnd_of_match[] = { { .compatible = "renesas,rcar_sound-gen1", .data = (void *)RSND_GEN1 }, { .compatible = "renesas,rcar_sound-gen2", .data = (void *)RSND_GEN2 }, { .compatible = "renesas,rcar_sound-gen3", .data = (void *)RSND_GEN3 }, + { .compatible = "renesas,rcar_sound-gen4", .data = (void *)RSND_GEN4 }, /* Special Handling */ { .compatible = "renesas,rcar_sound-r8a77990", .data = (void *)(RSND_GEN3 | RSND_SOC_E) }, {}, @@ -1467,7 +1468,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) if (is_graph) { for_each_endpoint_of_node(dai_node, dai_np) { __rsnd_dai_probe(priv, dai_np, dai_i); - if (rsnd_is_gen3(priv)) { + if (rsnd_is_gen3(priv) || rsnd_is_gen4(priv)) { rdai = rsnd_rdai_get(priv, dai_i); rsnd_parse_connect_graph(priv, &rdai->playback, dai_np); @@ -1478,7 +1479,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) } else { for_each_child_of_node(dai_node, dai_np) { __rsnd_dai_probe(priv, dai_np, dai_i); - if (rsnd_is_gen3(priv)) { + if (rsnd_is_gen3(priv) || rsnd_is_gen4(priv)) { rdai = rsnd_rdai_get(priv, dai_i); rsnd_parse_connect_simple(priv, &rdai->playback, dai_np); diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 9aca5ff791a3..1c494e521463 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -653,6 +653,36 @@ rsnd_gen2_dma_addr(struct rsnd_dai_stream *io, dma_addrs[is_ssi][is_play][use_src + use_cmd].in_addr; } +/* + * Gen4 DMA read/write register offset + * + * ex) R-Car V4H case + * mod / SYS-DMAC in / SYS-DMAC out + * SSI_SDMC: 0xec400000 / 0xec400000 / 0xec400000 + */ +#define RDMA_SSI_SDMC(addr, i) (addr + (0x8000 * i)) +static dma_addr_t +rsnd_gen4_dma_addr(struct rsnd_dai_stream *io, struct rsnd_mod *mod, + int is_play, int is_from) +{ + struct rsnd_priv *priv = rsnd_io_to_priv(io); + phys_addr_t addr = rsnd_gen_get_phy_addr(priv, RSND_GEN4_SDMC); + int id = rsnd_mod_id(mod); + int busif = rsnd_mod_id_sub(mod); + + /* + * SSI0 only is supported + */ + if (id != 0) { + struct device *dev = rsnd_priv_to_dev(priv); + + dev_err(dev, "This driver doesn't support non SSI0"); + return -EINVAL; + } + + return RDMA_SSI_SDMC(addr, busif); +} + static dma_addr_t rsnd_dma_addr(struct rsnd_dai_stream *io, struct rsnd_mod *mod, int is_play, int is_from) @@ -667,6 +697,8 @@ static dma_addr_t rsnd_dma_addr(struct rsnd_dai_stream *io, */ if (rsnd_is_gen1(priv)) return 0; + else if (rsnd_is_gen4(priv)) + return rsnd_gen4_dma_addr(io, mod, is_play, is_from); else return rsnd_gen2_dma_addr(io, mod, is_play, is_from); } @@ -891,6 +923,10 @@ int rsnd_dma_probe(struct rsnd_priv *priv) return 0; /* it will be PIO mode */ } + /* for Gen4 doesn't have DMA-pp */ + if (rsnd_is_gen4(priv)) + goto audmapp_end; + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "audmapp"); if (!res) { dev_err(dev, "lack of audmapp in DT\n"); @@ -902,7 +938,7 @@ int rsnd_dma_probe(struct rsnd_priv *priv) dmac->ppbase = devm_ioremap_resource(dev, res); if (IS_ERR(dmac->ppbase)) return PTR_ERR(dmac->ppbase); - +audmapp_end: priv->dma = dmac; /* dummy mem mod for debug */ diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 925565baaa41..86bdecc24956 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -215,6 +215,74 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv, return 0; } +/* + * Gen4 + */ +static int rsnd_gen4_probe(struct rsnd_priv *priv) +{ + static const struct rsnd_regmap_field_conf conf_ssiu[] = { + RSND_GEN_S_REG(SSI_SYS_INT_ENABLE0, 0x850), + RSND_GEN_S_REG(SSI_SYS_INT_ENABLE2, 0x858), + RSND_GEN_S_REG(SSI_SYS_INT_ENABLE4, 0x890), + RSND_GEN_S_REG(SSI_SYS_INT_ENABLE6, 0x898), + RSND_GEN_S_REG(SSI_SYS_STATUS0, 0x840), + RSND_GEN_S_REG(SSI_SYS_STATUS2, 0x848), + RSND_GEN_S_REG(SSI_SYS_STATUS4, 0x880), + RSND_GEN_S_REG(SSI_SYS_STATUS6, 0x888), + + RSND_GEN_S_REG(SSI_BUSIF0_MODE, 0x0), + RSND_GEN_S_REG(SSI_BUSIF0_ADINR, 0x4), + RSND_GEN_S_REG(SSI_BUSIF0_DALIGN, 0x8), + RSND_GEN_S_REG(SSI_BUSIF1_MODE, 0x20), + RSND_GEN_S_REG(SSI_BUSIF1_ADINR, 0x24), + RSND_GEN_S_REG(SSI_BUSIF1_DALIGN, 0x28), + RSND_GEN_S_REG(SSI_BUSIF2_MODE, 0x40), + RSND_GEN_S_REG(SSI_BUSIF2_ADINR, 0x44), + RSND_GEN_S_REG(SSI_BUSIF2_DALIGN, 0x48), + RSND_GEN_S_REG(SSI_BUSIF3_MODE, 0x60), + RSND_GEN_S_REG(SSI_BUSIF3_ADINR, 0x64), + RSND_GEN_S_REG(SSI_BUSIF3_DALIGN, 0x68), + RSND_GEN_S_REG(SSI_BUSIF4_MODE, 0x500), + RSND_GEN_S_REG(SSI_BUSIF4_ADINR, 0x504), + RSND_GEN_S_REG(SSI_BUSIF4_DALIGN, 0x508), + RSND_GEN_S_REG(SSI_BUSIF5_MODE, 0x520), + RSND_GEN_S_REG(SSI_BUSIF5_ADINR, 0x524), + RSND_GEN_S_REG(SSI_BUSIF5_DALIGN, 0x528), + RSND_GEN_S_REG(SSI_BUSIF6_MODE, 0x540), + RSND_GEN_S_REG(SSI_BUSIF6_ADINR, 0x544), + RSND_GEN_S_REG(SSI_BUSIF6_DALIGN, 0x548), + RSND_GEN_S_REG(SSI_BUSIF7_MODE, 0x560), + RSND_GEN_S_REG(SSI_BUSIF7_ADINR, 0x564), + RSND_GEN_S_REG(SSI_BUSIF7_DALIGN, 0x568), + RSND_GEN_S_REG(SSI_CTRL, 0x010), + RSND_GEN_S_REG(SSI_INT_ENABLE, 0x018), + RSND_GEN_S_REG(SSI_MODE, 0x00c), + RSND_GEN_S_REG(SSI_MODE2, 0xa0c), + }; + static const struct rsnd_regmap_field_conf conf_adg[] = { + RSND_GEN_S_REG(BRRA, 0x00), + RSND_GEN_S_REG(BRRB, 0x04), + RSND_GEN_S_REG(BRGCKR, 0x08), + RSND_GEN_S_REG(AUDIO_CLK_SEL0, 0x0c), + }; + static const struct rsnd_regmap_field_conf conf_ssi[] = { + RSND_GEN_S_REG(SSICR, 0x00), + RSND_GEN_S_REG(SSISR, 0x04), + RSND_GEN_S_REG(SSITDR, 0x08), + RSND_GEN_S_REG(SSIRDR, 0x0c), + RSND_GEN_S_REG(SSIWSR, 0x20), + }; + static const struct rsnd_regmap_field_conf conf_sdmc[] = { + RSND_GEN_M_REG(SSI_BUSIF, 0x0, 0x8000), + }; + int ret_adg = rsnd_gen_regmap_init(priv, 10, RSND_GEN4_ADG, "adg", conf_adg); + int ret_ssiu = rsnd_gen_regmap_init(priv, 10, RSND_GEN4_SSIU, "ssiu", conf_ssiu); + int ret_ssi = rsnd_gen_regmap_init(priv, 10, RSND_GEN4_SSI, "ssi", conf_ssi); + int ret_sdmc = rsnd_gen_regmap_init(priv, 10, RSND_GEN4_SDMC, "sdmc", conf_sdmc); + + return ret_adg | ret_ssiu | ret_ssi | ret_sdmc; +} + /* * Gen2 */ @@ -484,6 +552,8 @@ int rsnd_gen_probe(struct rsnd_priv *priv) else if (rsnd_is_gen2(priv) || rsnd_is_gen3(priv)) ret = rsnd_gen2_probe(priv); + else if (rsnd_is_gen4(priv)) + ret = rsnd_gen4_probe(priv); if (ret < 0) dev_err(dev, "unknown generation R-Car sound device\n"); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 3e1184f56ffd..239705d52517 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -31,6 +31,11 @@ #define RSND_GEN2_SSIU 2 #define RSND_GEN2_SSI 3 +#define RSND_GEN4_ADG 0 +#define RSND_GEN4_SSIU 1 +#define RSND_GEN4_SSI 2 +#define RSND_GEN4_SDMC 3 + #define RSND_BASE_MAX 4 /* @@ -197,6 +202,7 @@ enum rsnd_reg { SSI_SYS_INT_ENABLE5, SSI_SYS_INT_ENABLE6, SSI_SYS_INT_ENABLE7, + SSI_BUSIF, HDMI0_SEL, HDMI1_SEL, SSI9_BUSIF0_MODE, @@ -629,6 +635,7 @@ struct rsnd_priv { #define RSND_GEN1 (1 << 0) #define RSND_GEN2 (2 << 0) #define RSND_GEN3 (3 << 0) +#define RSND_GEN4 (4 << 0) #define RSND_SOC_MASK (0xFF << 4) #define RSND_SOC_E (1 << 4) /* E1/E2/E3 */ @@ -703,6 +710,7 @@ struct rsnd_priv { #define rsnd_is_gen1(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN1) #define rsnd_is_gen2(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN2) #define rsnd_is_gen3(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN3) +#define rsnd_is_gen4(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN4) #define rsnd_is_e3(priv) (((priv)->flags & \ (RSND_GEN_MASK | RSND_SOC_MASK)) == \ (RSND_GEN3 | RSND_SOC_E)) diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 281bc20d4c5d..17bd8cc86dd0 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -29,8 +29,8 @@ struct rsnd_ssiu { i++) /* - * SSI Gen2 Gen3 - * 0 BUSIF0-3 BUSIF0-7 + * SSI Gen2 Gen3 Gen4 + * 0 BUSIF0-3 BUSIF0-7 BUSIF0-7 * 1 BUSIF0-3 BUSIF0-7 * 2 BUSIF0-3 BUSIF0-7 * 3 BUSIF0 BUSIF0-7 @@ -40,10 +40,11 @@ struct rsnd_ssiu { * 7 BUSIF0 BUSIF0 * 8 BUSIF0 BUSIF0 * 9 BUSIF0-3 BUSIF0-7 - * total 22 52 + * total 22 52 8 */ static const int gen2_id[] = { 0, 4, 8, 12, 13, 14, 15, 16, 17, 18 }; static const int gen3_id[] = { 0, 8, 16, 24, 32, 40, 41, 42, 43, 44 }; +static const int gen4_id[] = { 0 }; /* enable busif buffer over/under run interrupt. */ #define rsnd_ssiu_busif_err_irq_enable(mod) rsnd_ssiu_busif_err_irq_ctrl(mod, 1) @@ -152,6 +153,10 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, /* clear status */ rsnd_ssiu_busif_err_status_clear(mod); + /* Gen4 doesn't have SSI_MODE */ + if (rsnd_is_gen4(priv)) + goto ssi_mode_setting_end; + /* * SSI_MODE0 */ @@ -206,6 +211,7 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, rsnd_mod_bset(mod, SSI_MODE1, 0x0013001f, val1); rsnd_mod_bset(mod, SSI_MODE2, 0x00000017, val2); +ssi_mode_setting_end: /* * Enable busif buffer over/under run interrupt. * It will be handled from ssi.c @@ -553,6 +559,9 @@ int rsnd_ssiu_probe(struct rsnd_priv *priv) } else if (rsnd_is_gen3(priv)) { list = gen3_id; nr = ARRAY_SIZE(gen3_id); + } else if (rsnd_is_gen4(priv)) { + list = gen4_id; + nr = ARRAY_SIZE(gen4_id); } else { dev_err(dev, "unknown SSIU\n"); return -ENODEV;