From patchwork Wed Jan 31 05:06:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13538592 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2130.outbound.protection.outlook.com [40.107.114.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 103883D963; Wed, 31 Jan 2024 05:06:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.114.130 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706677568; cv=fail; b=elZdupGLz5B/UYiKYvVrwx0T4LHiBpKzOe2wJHuMA1YiGOl+Vzch/06vC+8cXcxNYLnL75ot+mTMqmlnysLcrQ+n+Y1OQP1MEEcfkulhTYzzVMih9wXRhVZFl77YO7eDPkoYPUGD54b7/ZRXwdSMN45a9ehylkvPZTI4tzA3Epk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706677568; c=relaxed/simple; bh=JrZ+1VFEKGAG14YCb4GTSsrM+zZeDREXhWmYvwiHujE=; h=Message-ID:From:To:Cc:In-Reply-To:References:Subject:Content-Type: Date:MIME-Version; b=dqH28OmY5d6qVRuabK4i3I3FSbA4bCJhNqfjBC8vE58TVz7rLs5JGutJT32Erinm4vLYngt/qrFScP/2gE+YcpVONHEW5Ult7UPYbgWHfaeWnVQFILLB6axfN0vED+B8UDlOPBJtbzLOiqqaUs46Vw7nhAev3Kjvo93N6/zpr6E= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=XcwkIIHm; arc=fail smtp.client-ip=40.107.114.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="XcwkIIHm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cGp+gQY+/FhUkyyHP1JwdmeLFecAlTr1B6hV9O2c+YvdzFMA1eSsQi/Tv+01N/La9gifVYy4ySxOA37/NkNm4WDr2+vjEKf27alZmO0C3/VaSBDQ49732h8neogNC+QRk8RgiczRgC/7Bf+JMbaUzlM+TfVmTU9yPtN1QnVWtDH/EfJykmSfL0eCrddUBnS125UziCY0X1uNZSFack7dt6mEnGE3e8n2DGmsfBIF9lkcO/izMtEGyIK0qdeHkrrsCfWhJcwzGzEK6BuFESeKkFMTE1xMObfYkqnm+psQ+TyT6J5C8rbu77YBYjcga8GuStgmg4YKYGTnAnqKl95kTA== 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=JZuZKm9q0muQXTMXS2w88pH2wU3XRLuIMFdL1Vl+CSQ=; b=JIXcz6yGTE5oSppJrctHRcYFU9ZyVhtnHzPyyfls4ryqCnNf626BZO3DOG27RvXb1sMu920ELav41tLkRQB2WHWHs/NJ350F0mXptQW46FcQKtqzoOrd59RT4DbuRV9GM+vdsqeHmyxxo+oVoYS+ADA7Jg8xmEf+rSbpqYTQP1LwCkBB5h3krZ8hns8QMDH8McUCn89WyJVm+gZzOsy6SRBg7fHUt43xZ89d/19FLYQnxwTiljsj5JJ2N4bhuQ11trUl5QvqYSxpBPB4FRQmXGwKL9yfyfzlpNG4MCAiuFapiGhMvHlY4Zy9F5FjwyPgORVcKvfSQKHRUIfwzVAO3g== 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=JZuZKm9q0muQXTMXS2w88pH2wU3XRLuIMFdL1Vl+CSQ=; b=XcwkIIHmfkI5X6ml7OImobHN11TwFe3fRkgYHddmilkC4Vm5XWE/yOLBc+o6HE7yZP5yXd4xSpq045wrkUgVqsQOUr8CbBXmSlBQWWBTeh5l8zWqWG17iCNHMoxDTiW0w9vI1y+X2UAtRGndy0FtlJVPa1Z93iHKfP/59U8MgHg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OSZPR01MB8896.jpnprd01.prod.outlook.com (2603:1096:604:158::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.23; Wed, 31 Jan 2024 05:06:01 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::ce8:8f5e:99a0:aba4]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::ce8:8f5e:99a0:aba4%2]) with mapi id 15.20.7249.023; Wed, 31 Jan 2024 05:06:01 +0000 Message-ID: <87a5om6qiv.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: "Bryan O'Donoghue" , "Lad, Prabhakar" , =?iso-8859-1?q?=22Niklas_S=C3=B6d?= =?iso-8859-1?q?erlund=22?= , =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Abhinav Kumar , Alexander Shishkin , Alexander Stein , Alexandre Belloni , Alexandre Torgue , Alexey Brodkin , Andrzej Hajda , Andy Gross , Biju Das , Bjorn Andersson , Claudiu Beznea , Daniel Vetter , Dave Stevenson , David Airlie , Dmitry Baryshkov , Dmitry Torokhov , Emma Anholt , Eugen Hristev , Florian Fainelli , Frank Rowand , Greg Kroah-Hartman , Hans Verkuil , Helge Deller , Hugues Fruchet , Jacopo Mondi , Jacopo Mondi , James Clark , Jaroslav Kysela , Jonathan Hunter , Kevin Hilman , Kieran Bingham , Kieran Bingham , Konrad Dybcio , Krzysztof Kozlowski , Laurent Pinchart , Laurent Pinchart , Liam Girdwood , Liu Ying , Luca Ceresoli , Maarten Lankhorst , Marek Vasut , Mark Brown , Mauro Carvalho Chehab , Maxime Coquelin , Maxime Ripard , Michael Tretter , Michal Simek , Miguel Ojeda , Nathan Chancellor , Neil Armstrong , Nick Desaulniers , Nicolas Ferre , Philipp Zabel , Philippe Cornu , Raphael Gallais-Pou , Rob Clark , Rob Herring , Robert Foss , Russell King , Sakari Ailus , Saravana Kannan , Sascha Hauer , Shawn Guo , Sowjanya Komatineni , Stefan Agner , Suzuki K Poulose , Sylwester Nawrocki , Takashi Iwai , Thierry Reding , Thomas Zimmermann , Tim Harvey , Todor Tomov , Tomi Valkeinen , Yannick Fertre Cc: Alim Akhtar , Fabio Estevam , Jacopo Mondi , Jernej Skrabec , Jerome Brunet , Jessica Zhang , Jonas Karlman , Laurent Pinchart , Leo Yan , Marijn Suijten , Martin Blumenstingl , Mike Leach , Sam Ravnborg , Sean Paul , Tom Rix , coresight@lists.linaro.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-media@vger.kernel.org, linux-omap@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-sound@vger.kernel.org, linux-staging@lists.linux.dev, linux-stm32@st-md-mailman.stormreply.com, linux-tegra@vger.kernel.org, llvm@lists.linux.dev In-Reply-To: <87o7d26qla.wl-kuninori.morimoto.gx@renesas.com> References: <87o7d26qla.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 10/24] ASoC: switch to use of_graph_get_next_device_endpoint() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 31 Jan 2024 05:06:00 +0000 X-ClientProxiedBy: TYCPR01CA0166.jpnprd01.prod.outlook.com (2603:1096:400:2b2::6) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSZPR01MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d4b2bd0-dd7f-47bb-4141-08dc221a51a6 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w46a299M34MICNPJ225jDyxibkxykYwhjMoRNIfIgN8nkKtjf7eFwbJL33DF/GzxHL+A5ODLIvXKHhqJXBnP3ebu1L2P1hKhGYiWLxpC3PN/EyRhkrFQZAxp/lGURD2NBrlFHvR0sBs/5KYb7DLabHx3wXamz0eo3hpbIztZKkfzjqgPoBR5B86c07JNf39SwQXLQ4SI5kNIldy0BkQEhNfaPK8Mk9CVlC7ukIxdiedlys7UAf8TPt34HectboFmuekEcIzfeGjNbIoXTdAIyMwya/Mc4HRc1zVHSKbOJqTY44+CbJDs0mMA6+ISbtDg7R0MWPkDI3qt1bZKrDvtKJOOhSw0bGOoNx5dF7csq7AvZTBiwLN4PUH46KlgMxYjxc10d6ukNiUvzBM9o5Oprip4spujs9h2L61Sy3jTA6UzJwsbnTAHEmMeplB6LdTrlwLASrfz2AFB2QVjgFm1rhGFvZfKX8VyDplFXJGG3EQdtR4+a4nep7dTF5M5FT73WbUm6eDE+1Il35cpzG+/kuz0gzTdGjqc6zdl7+Ou2cqM/mGLW1ZNnfh/hvWUSqFLfgSOmDYUBu9kQ1mhrbP0nnv2KHAWQ1BDcArT1532ijLMa6j7tlHsRVriJLuco3SMEURsbHihWY9Rk0NHXNfF9Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(366004)(136003)(346002)(396003)(376002)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(36756003)(7336002)(7366002)(7276002)(52116002)(7406005)(7416002)(6506007)(38100700002)(6512007)(5660300002)(86362001)(83380400001)(38350700005)(41300700001)(2906002)(2616005)(478600001)(6486002)(26005)(1191002)(921011)(66476007)(66946007)(66556008)(54906003)(110136005)(8936002)(8676002)(316002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Qhah6vZlGbrxZfarsMCmrCrLJBrmZVHbc1XRBmLFIOM5raCSbFSp3o6xd+zWy4BizdiRQVM7ahCK0ZF8QSzLoy3xwEF0b/sgtNLP9Ii9d4AEUUkWohDT4e+tI9pUiMu2itrXvcH7V9NmLM/OCQqxn6+jGhKWfbHcwN2u8d1/vX9w3wDTkkUrvoeGpVUl7+90GTndyAeQlJbHhG2hO1VdtsQZbB7kDthFX6rLEJNiGj0TvFoEIm+pOIMcr4S+oU9OjZVgEEv94YVokZkOD1vZSmi7wDTixF2D1ATzphKeYXciJBG2EnkaQCN92/It3Qd2oBV16R6eqjS3VlErKJGpMVDJkkJFcW08R/cK6QO7TzaXZqkJUGIdohnKnvBK5N0kle+sl64w5uh71jQqur7Eor1GeTHzeu4M8PgLoNTQ64SIApFOtR36peTlGkOX0MYcMX+PaRXZfV4XJV7wUS3hnpw0AvCnNfI82QyMWpk4m+F0EmF1cKgFi/JVw1s1ppzGhZtnOZkJTKagdTBs7VC3fxvNehhlxE0in2BBqs46OoHWer+qjRyiKHHH1exAYAgWhFrRB46BVfs8NpsvYs50c0r498xvizO6ooY7fjhjZUdApustc/7T3WmllOUSAOTsZjDGxwtHZjNGA8BQo9TVX0d9n2t3dXZPMuJ2dl8AnAcC7diDhyAbVZCl4Qs86sbrhvv6nXrqhqqTXsbuXdEBcYGcwofyeE0XO8NFM82obb3uIvtUV6WkhzAfFHEOOd6+sUjot/y625YjcbEHDJzLmgSTQFsPmql3Om50tGXL/Xn2Bhk4EBRoo2UG7xAcO9pr8CP/NX6Pu2RG9sksWkNQc6yvQvBucDZIXEx7ZRWOdIvc7GXmKZsrq6xYKo85aapXVJOibAjrqPa12YAJ80p3gYOScJzYvnL1jZIU1+3ZI+ODDHUXckUnDUh8ZxpOLxcQHDHttgOJNt/SUpMSSYMdrzm+muDQJl0nwQyA8Mae81CDSAhQ6KaMMKwDbOp1JmaThW7GJFJdBZOU/Cwb2ypj4nKVO2oQh8Ohe2qFbVdDerLcCHliAhhd75rCk2JeWMay3RMsy1MOQ3obp99RGQ8rat4rJ8x8YNShZ99dk+nwgjnKZsusokrdJHcfZeTixz1tY0OCKEuL600IWAy73oHHQLoltLbGBJSvvI/RXJi4kt7YXtoOS1oqcbDcH3wjN0TBLETBVkGwXS109k9qxmC5DMdHNe1ljy+noNDw7jxumOWX0A2qP13Tnp8PIJ2253T5WKuN8CxmQsg22jDMbqvyjLRinM2QHgZnNYGG9bmKB/joLuWE3Og88SCzYNZZsQz5V2oC5l8XU9cw2Mbpjo/1ODLxjauNFbX2Y2kOwf+XXglVFfH2hhKrWIjEYGbKPGz4INacwfQApB+11YC6b5Y6CNQ/v4cRTuVfMloxJbZ3VZ6uTKKXGR8A1pC/ZVesj5awAqnMoN30dG/nTejhuTr2AJFHdZ7R/9SeNb/kwOQ8CemQWWbq4s3tn4YVqGW3+64fukwLqe1fhT9xqMG8HgaPWTNcNrYn9CrqOYnQnJtqbqg1S5gTxOpnNP9JtwE6wLjCnN3qdM7tFqc1Hl5PtuWNtpdrY+YzkGBvkJlYrNN8Yk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d4b2bd0-dd7f-47bb-4141-08dc221a51a6 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 05:06:01.5116 (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: l6qAWpbEz4kDmUz1B2EI06rdiwhWSs8JbzyGqhIQkW3XuY51M3nKA8oCdKME77irKJ7tal7MZfzO75Qy7+AA4AEcGOdwUg2vn569OUm52mM3eBH+Jz/PMgTGlMj4p3K/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB8896 of_graph_get_next_endpoint() is now renamed to of_graph_get_next_device_endpoint(). Switch to it. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/ak4613.c | 2 +- sound/soc/generic/audio-graph-card2.c | 2 +- sound/soc/generic/simple-card-utils.c | 6 +++--- sound/soc/generic/test-component.c | 4 ++-- sound/soc/sh/rcar/core.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index 73fb35560e51..1e1d9c7abdc7 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -870,7 +870,7 @@ static void ak4613_parse_of(struct ak4613_priv *priv, * TDM support is assuming it is probed via Audio-Graph-Card style here. * Default is SDTIx1 if it was probed via Simple-Audio-Card for now. */ - sdti_num = of_graph_get_endpoint_count(np); + sdti_num = of_graph_get_device_endpoint_count(np); if ((sdti_num >= SDTx_MAX) || (sdti_num < 1)) sdti_num = 1; diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 62606e20be9a..c3763719a69f 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -1104,7 +1104,7 @@ static int graph_counter(struct device_node *lnk) /* * CPU/Codec = N:M case has many endpoints. - * We can't use of_graph_get_endpoint_count() here + * We can't use of_graph_get_device_endpoint_count() here */ while(1) { port = of_get_next_child(ports, port); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 81077d16d22f..2c89b711b1ea 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -1049,7 +1049,7 @@ static int graph_get_dai_id(struct device_node *ep) */ i = 0; id = -1; - for_each_endpoint_of_node(node, endpoint) { + for_each_device_endpoint_of_node(node, endpoint) { if (endpoint == ep) id = i; i++; @@ -1093,7 +1093,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, /* Get dai->name */ args.np = node; args.args[0] = graph_get_dai_id(ep); - args.args_count = (of_graph_get_endpoint_count(node) > 1); + args.args_count = (of_graph_get_device_endpoint_count(node) > 1); /* * FIXME @@ -1122,7 +1122,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, parse_dai_end: if (is_single_link) - *is_single_link = of_graph_get_endpoint_count(node) == 1; + *is_single_link = of_graph_get_device_endpoint_count(node) == 1; return 0; } diff --git a/sound/soc/generic/test-component.c b/sound/soc/generic/test-component.c index e4967540a2e1..0ebacbcddee3 100644 --- a/sound/soc/generic/test-component.c +++ b/sound/soc/generic/test-component.c @@ -538,7 +538,7 @@ static int test_driver_probe(struct platform_device *pdev) struct test_priv *priv; int num, ret, i; - num = of_graph_get_endpoint_count(node); + num = of_graph_get_device_endpoint_count(node); if (!num) { dev_err(dev, "no port exits\n"); return -EINVAL; @@ -600,7 +600,7 @@ static int test_driver_probe(struct platform_device *pdev) } i = 0; - for_each_endpoint_of_node(node, ep) { + for_each_device_endpoint_of_node(node, ep) { snprintf(dname[i].name, TEST_NAME_LEN, "%s.%d", node->name, i); ddriv[i].name = dname[i].name; diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 0b1aa23c1189..d0581232063a 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1298,7 +1298,7 @@ static int rsnd_dai_of_node(struct rsnd_priv *priv, int *is_graph) if (!of_node_name_eq(ports, "ports") && !of_node_name_eq(ports, "port")) continue; - priv->component_dais[i] = of_graph_get_endpoint_count(ports); + priv->component_dais[i] = of_graph_get_device_endpoint_count(ports); nr += priv->component_dais[i]; i++; if (i >= RSND_MAX_COMPONENT) { @@ -1510,7 +1510,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) if (!of_node_name_eq(ports, "ports") && !of_node_name_eq(ports, "port")) continue; - for_each_endpoint_of_node(ports, dai_np) { + for_each_device_endpoint_of_node(ports, dai_np) { __rsnd_dai_probe(priv, dai_np, dai_np, 0, dai_i); if (rsnd_is_gen3(priv) || rsnd_is_gen4(priv)) { rdai = rsnd_rdai_get(priv, dai_i);