From patchwork Wed Dec 14 01:48:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13072683 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B454DC4332F for ; Wed, 14 Dec 2022 01:48:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236551AbiLNBsH (ORCPT ); Tue, 13 Dec 2022 20:48:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229870AbiLNBsG (ORCPT ); Tue, 13 Dec 2022 20:48:06 -0500 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2139.outbound.protection.outlook.com [40.107.113.139]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E9471AF23 for ; Tue, 13 Dec 2022 17:48:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CLFPN3sKQjaY/4jfyY5IMcLelUNTry6ANZm1hqohaKz2jjOGI/FZuwDyP68Y4Vmqz5rBfbZLR80Q8zUHJU7zOAYKUPPXgl0xzWzATuRekRvOoH7wQ1euchRsKSbib1+ZvHvBBWtxWqJZ7faShaVvsAW+EyeWi4SPcyeujigoSMwzKwk6s+kacqPzgvLVJsjt67LZnqKfyGg+4pglQ2x0Z+DXD4OXUWfTZkICwfAbmZIoFCBqFnRrV6PrWHMDAORTt81DLqgpx6f9NOE8XWLK3ZfIwO4T+W4UX/AVRrhmsNrUj8cPjtjW7shYFqefALggIXCe2JWeIE4fWs2Sz9dl3g== 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=tDxkabEa81042dTAZOVqBL5VH+HJrtFRhpsb2sdpJio=; b=d4TLcEuAALUQZ87KCb6L8UcGGDl6JPlW2Umznetjd1YP57ONaQTO4qqxvzwAsO0ng+Ky/30iujQJJrMcKhLvIIM30qLDve+ITZGF92CSfpW8SokCTWKoBPlTqt0JAbTYdfpR/70BmEI/Td5V55ercFaDqHYHE04diRmulKO6VcqS+fe/ksPHeqL7d3nFFStA1JCnyZ8/WjnWOQx8XbeNVguP7R3/DZlKCaXayUib7g4CL0YkB9hzhEz9ub/d2/iptj7SqAKj89ZZA6YEUBJ9sPEmTbT5npZJwFDDt6EBkS9Zx4YLxQWAypRlqobiNGB0pr0KvMGQ+400zmO+n3VRdQ== 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=tDxkabEa81042dTAZOVqBL5VH+HJrtFRhpsb2sdpJio=; b=R8PZPwkwYPUFfZJdBUsPwInJjJ/28EpqLFh1EH4f+ZXuj/eROsCMdqfs606WWb6lGeEh0XfnPCAqMPsXjRiJPt08EkyZCADTw80iu0euOeA9yNlN+2RM1ygvfEokr0Nvccb/NkZIuV3U7hLLk/Xkb8j8L1gXNy1WON4mm+6Cl/M= 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 OS0PR01MB5860.jpnprd01.prod.outlook.com (2603:1096:604:bc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 01:48:03 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431%8]) with mapi id 15.20.5924.011; Wed, 14 Dec 2022 01:48:03 +0000 Message-ID: <87cz8mpxgt.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 1/8] ARM: dts: renesas: #sound-dai-cells is used when simple-card User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Geert Uytterhoeven Cc: Linux-Renesas In-Reply-To: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> References: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 14 Dec 2022 01:48:03 +0000 X-ClientProxiedBy: TYAPR01CA0074.jpnprd01.prod.outlook.com (2603:1096:404:2c::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_|OS0PR01MB5860:EE_ X-MS-Office365-Filtering-Correlation-Id: 6653def6-7f60-4688-ddab-08dadd753d15 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oLkDTE0W2C+u4vyufdQTLHCom6oxCWTihAps3UfckmNuDP5gRwSmsetFj5C4LXH0JdJygGfC0tSpTzIRqm8hOhsAswbLVy/8Oms1YgG1qluMcMs/PEE0Ok22PglGIb+23Kr+mpbQaDYQrpacwnnZYybLYJ34Au3RMVjjnFweQzDwAjO6xa6j5euAdd7rTiHLigbsHm4EBSPn9ELg9jz0QPCj3jeVdRXwU9Off+Wln9nDFJPEBLfaEhkhnJzJ6WmZ76zZEsPU91OwK4ZGPF7A9NXfxC3yf2zueVVk5wmAMd/YCnTkWgPZqloOItvyBmku+PnFIC06E+33T27YrYpZHfOG7/WTGW3opURAoKxGXMxNas7TE6mwcYnhbgjK00LZs/9OlXjSHxQUkxgooscdHF2Z+bPNrOffJyFVyxZ49aqwkaPKToA6huvJFVfIpRirtqsKc73dSDzA6EQSLT38KZE0KmXl2JzEqhaUTbrSXU5jGySEmZQVdZta6RjXzqZunsh/I5al2Ci4AGjc2me+dDEBnLq0blQUyNNhXykn6EkF4V5SRgCbomnMD10bTg32+buSZrg9MO2ctm3ld5ieUx4CIr5srtjapxi/7iTIj++z0/QfzHRQMG1+KtkVBTsm6t5//sINR1OwTN4mFihdW/9uY655kltI/o+fk93NdiEz0pPZ0BOKMyy5oSEoY3N2VhdFkdsRuq5u2jtympDViw== 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:(13230022)(4636009)(346002)(376002)(39860400002)(366004)(136003)(396003)(451199015)(36756003)(66476007)(316002)(4326008)(6916009)(41300700001)(8676002)(83380400001)(38350700002)(38100700002)(86362001)(2906002)(66556008)(52116002)(6506007)(6486002)(26005)(66946007)(6512007)(2616005)(5660300002)(8936002)(186003)(478600001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5raw5IPdy2FRMv6H3xigW5IB4ZXcoUrEGvWt6bhz3eDpE9ogebu3XK3R57RO8L3eGjPl7dQzys2sTBKcmdTtg5Cg6BbxupZQQYMXM43RSg6vOl2eB2Zcj82lSUnd5CfSAPPlHeV2tMqRWAnjDmWm1L1fttckhcStwM3Z7pKw5fjnLlNBVLhDdyKFr776+zUFdRU+Bh/JVcutXRY34fd/5WNaOiXAt72xBFCop7OPAELkDjlLeZqgPmZwyk6yGQQkooyeW12eeJMs6guoyqPngfmIJ/f7T2Hp27A4DxhaGVDq0d+uUJEdNvSqr86DXk8ztPYKdpMN3Zf6Z4M9SYL2xh+x8IwQ4lepycqi9aS4GujS7FqdtTpWbS+GV0BilwnEx17bUIzO1i3FGBsvpERLkIfwm30+nz8Z0x77yIPHfzV1U2xTh1nJDj/bGfPSCdt4eVbVQAXseb43mUzO4ZxMSDYR9xmrncBJthNjTvAqT9HEGECki7cJUFYJrjYYfevs3PGW3WMyJjRuOkJmUYbVFkMZI2QVtbPACQWnJdwPdO0Hf9cYuagdx0e26Kn5m2n61LHp4ssY7BJQC5OLW5sO6Bg/cMlSp0usn+wvnvDY/jt8UJiARsKU+bBZtzqfw/yoUFL3SOqj9xfTa3Uya4jjusJZL9YqDALJbbOp9wMcb9BoTkTnvO+K4Fgk/bUfIXk+OBRW37K4mpy/IRKQWRqrqt8faUpPtxelgi/8bPmu3FW7/kIElMCHlZEGX9LURQpYMoY5EHOcuGiOjd3CG4wHUcmO8Cp+3xI34joo1z2xURXBjerowO8lrsRqEAGrN98ggXeilRPjfpL5MxaygJBfD/msEZUpLk3e6muLfD+azGPReX3Ns4ho6HGvCcGXa3iVX2fJvUj6ltHX5sFUDL5Zuyo+2A156a/KQi9h54pq3GILdw2iB4G1aGy2DFQb7wmPo83VG85mK5Slu0x/ZAKTT0NJUIF3ARIFODsgks0nfatQgFvef1RU+EUTVAwfgnflIQbq4HBbkGvwWjBqvxhl/G5X/PFKZqScefTS2V70QT5618RKdeFGxWKY0UANMhitOefqOc2Qe29daEB3cJUzVu3x2h27mAlshlpC8ho/oPj6YO0jEU1R7uRLXXBn9xQoWL/eCfkFaVM8hCmxokwMa3lGIDTlJSWckzFuWdZwD6zU6E3WtmfJLHUU1SENpL2hAlYp1kTLbKrRnpiPh+Qb4ojLwrx8JQQ//H0+39hH7fA32YykIzxG+oM1t2tByMbOiGD8VT4Xg1SbQ3pimHXCPVFIJRLWt5/Itn+D413QqtIaaPZTjZpGYRYI6+6D71A4eW9Dk5EWbCpyAD3Cr/2Uyv/BDpmonxb0cjJk5VfMBir0/0qGJAqzYmhNrzgogUuC62yRs0Xkhq30aH7Is/TC8j6jK6fM7U7pC/OSwNcghkqbcGul3oFg3vcKfbb2F+4hjyGajGErl4nC34+tuVmTQ4+ekqjP7qK+S3/sO4dJF0ALFCKVsF2Jc45V2CGKsFrEPYoLGF7B2MYsoJopJWZrC14SG4iS0QAn5cTuqN8+FZdSchmPWihB7RtBy62zZpAVnJ3608exNFypd1zQ/MJj1wR0HBedtIeV1kdJUtkOuYM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6653def6-7f60-4688-ddab-08dadd753d15 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 01:48:03.3039 (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: e0wDiCOxzDTswETE4hO49tHjYByrI4qUfyJmQB3bpX2Ra02TxGfXGpgDOpbbscPXpxSfmsc5xIAEek7NqBvDWHfhN72JIKlpHVyw2GM/fM9E8Rd7WQdCc2jAztkj+BxA X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5860 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Kuninori Morimoto Current sound comment is indicating that #sound-dai-cells is required, but it is needed if board is using simple-card. This patch tidyup the comment. Signed-off-by: Kuninori Morimoto --- arch/arm/boot/dts/r8a7742.dtsi | 2 +- arch/arm/boot/dts/r8a7743.dtsi | 2 +- arch/arm/boot/dts/r8a7744.dtsi | 2 +- arch/arm/boot/dts/r8a7745.dtsi | 2 +- arch/arm/boot/dts/r8a7778.dtsi | 2 +- arch/arm/boot/dts/r8a7790.dtsi | 2 +- arch/arm/boot/dts/r8a7791.dtsi | 2 +- arch/arm/boot/dts/r8a7793.dtsi | 2 +- arch/arm/boot/dts/r8a7794.dtsi | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/r8a7742.dtsi b/arch/arm/boot/dts/r8a7742.dtsi index 758a1bf02fae..d1c256d8bd56 100644 --- a/arch/arm/boot/dts/r8a7742.dtsi +++ b/arch/arm/boot/dts/r8a7742.dtsi @@ -1155,7 +1155,7 @@ vin3: video@e6ef3000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi index 20f1d98a048d..2245d19a23bb 100644 --- a/arch/arm/boot/dts/r8a7743.dtsi +++ b/arch/arm/boot/dts/r8a7743.dtsi @@ -1190,7 +1190,7 @@ vin2: video@e6ef2000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm/boot/dts/r8a7744.dtsi b/arch/arm/boot/dts/r8a7744.dtsi index 96b2d5a4e8f6..aa13841f9781 100644 --- a/arch/arm/boot/dts/r8a7744.dtsi +++ b/arch/arm/boot/dts/r8a7744.dtsi @@ -1190,7 +1190,7 @@ vin2: video@e6ef2000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi index afc902e532d8..44688b8431c3 100644 --- a/arch/arm/boot/dts/r8a7745.dtsi +++ b/arch/arm/boot/dts/r8a7745.dtsi @@ -1120,7 +1120,7 @@ vin1: video@e6ef1000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 95efbafb0b70..8d4530ed2fc6 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi @@ -241,7 +241,7 @@ tmu2: timer@ffd82000 { rcar_sound: sound@ffd90000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index db171e3c62f2..b5e362fab418 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -1109,7 +1109,7 @@ vin3: video@e6ef3000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index d8f91d9f42ae..853eef9e031d 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -1223,7 +1223,7 @@ vin2: video@e6ef2000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi index 9ebe7bfaf0ed..8bc3e19f8adf 100644 --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi @@ -988,7 +988,7 @@ vin2: video@e6ef2000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi index 7aa781ff3bff..371dd4715dde 100644 --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi @@ -955,7 +955,7 @@ vin1: video@e6ef1000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; From patchwork Wed Dec 14 01:48:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13072684 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95EB2C4332F for ; Wed, 14 Dec 2022 01:48:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229870AbiLNBsQ (ORCPT ); Tue, 13 Dec 2022 20:48:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236930AbiLNBsO (ORCPT ); Tue, 13 Dec 2022 20:48:14 -0500 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2134.outbound.protection.outlook.com [40.107.113.134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53904193D9 for ; Tue, 13 Dec 2022 17:48:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n1+TdPa+2gPkMWgFaddj7u3eUGdQUCk5Mxehjxw1FVfsoiBS8g3TyYN632d0dy70WrkoviA7hA9YbgdWCdS+zbfubwQ3BpulkUc3Q3iccqvnru+fRlULqtAEXSst3wUSkgv+htfwL6/9bRTBQNgS0fvQXdkHaun9dc0/Hw2zA7EvIiWxyHHTPfAu7RoJFlTnxoB2uuaWrNoQYnsRPe/7kPURL9SNRVQnfCxl71mDRRw4jFo1CCySvtz1ccE7/arTSIwmW1/ElIfdOq354so80D8y8Oaa+oYyu1s76gJyceA3otUxRfftOmB7Fhwx8zC61i/reh0RP+96IKzPDIh65g== 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=iAWKYxkA+4RprhjL1LhJPBYsCLCP8k4bj7MC4plUjU8=; b=ESmAtokNbYc8JfdJOcI32pPYBQeUq6O/Nl3VwSERC31N2UXpak7HU/u05m1ZspTFQ3AegT5hJ674PoOz9EyLV0dx5vWqxTfYu9+dzLqo0Be7nOh4m8UCuAQRhRbmdr88LCAJGrPwW/BLOoW5EwmMFdo6xB3fBx3h0rI3aIOywAKkwAsMVRWDmqDMl5R1erul3f7MrTaN5dzHE+h17lUYJnpa6KV3VKQxepFqeZeMPRF3dBVOBG9sb+sOoqhwXtBMEnIgm4uTntjwkQ30PmO9J+mZyjfKozmRM/AxXp4yo7zMxY+mkNkh5KuwwwJ0gAOk0xmJ8AcGZ4+tTdAo0F+atA== 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=iAWKYxkA+4RprhjL1LhJPBYsCLCP8k4bj7MC4plUjU8=; b=e/kYEX6E9VM2+h7ulHtvPA2iuANic8nRUfaP3gYhQCVynFJCn6Wz1eISpCFKVI1SJyHlbeyjJ4K6zGc/SFj65sXPtqVoOUWhDWbb/LMOa/u1ih2xduyyNzWrYeysuGomKWTAOFbdBzmfW1euye3u83rTLblA1JJhwYKO1nZh+sw= 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 OSZPR01MB7819.jpnprd01.prod.outlook.com (2603:1096:604:1b7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 01:48:10 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431%8]) with mapi id 15.20.5924.011; Wed, 14 Dec 2022 01:48:10 +0000 Message-ID: <87bko6pxgl.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 2/8] arm64: dts: renesas: #sound-dai-cells is used when simple-card User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Geert Uytterhoeven Cc: Linux-Renesas In-Reply-To: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> References: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 14 Dec 2022 01:48:10 +0000 X-ClientProxiedBy: TYCP286CA0149.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::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_|OSZPR01MB7819:EE_ X-MS-Office365-Filtering-Correlation-Id: 286786ac-84ac-4f8d-e071-08dadd754195 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ye/cdbO9k/T5XIwBiUbcqzwAYEAT88DbHx8RInoQ3x/3/dDW53nO3Tqg6Jj6EiNY7qOl5M3v2LjbVs1e8CmrRnxoz523jyf+w4zCJwDUQrM4+R3WdowCZEF5bEcgrcO4a457uhOgChory5zmd7AHh2yicmOYD99v6dS2NUGa13b1bbHnTuOkJP3dhe9CFcpyNShjaFubIIjjcH2Z7eEemNugeICYR2LFrnDNxSszeQDaYphPcWoHIxrOyVpCS4M2PjXlXIJ18x3mOtVHMvsJHcVv/6RDTICdiHD2lPfjhA4xUVtvhH9KIhSSSsk/pIBcg5LOJjNJLDofXcqCaVNn3CZ3uBlHSiILlmPeJQg8CXuzGMM0PjamVHexiteVV5CrDxTs3g1HvRTUymPDRST6PdjI4lOosWmXgciCJSbja7EykdL+1ASoxLMsb63SHHS6JcmrniNkoWv6bU9NsmqJCUzrvkzsForzdF1oOZ5rhjHN3Qo1qVaqiR3z6OtQE3RTktky1qgjFer+yPvn75xRcKGvEtyvrGqONcV+y5S44k3XeycDl7P3wmCGGO26fJzP4hGZxr2jJsSrajH+83v4moYQ/HheaFpcquIQQDDeYQl3wCMDGwGuUDErA1xydlOlSn3zToj2lUAPNThN0quAZEjo6WEiLIkPpoh3bNy8zHsT4FIpFnNoep959F4wDQvB6JVYUS1u8b1brX5HzJQc7w== 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:(13230022)(4636009)(136003)(366004)(376002)(346002)(396003)(39860400002)(451199015)(83380400001)(38100700002)(36756003)(8676002)(41300700001)(66556008)(38350700002)(4326008)(66476007)(66946007)(86362001)(5660300002)(6916009)(478600001)(6486002)(8936002)(316002)(6512007)(6506007)(26005)(186003)(52116002)(2906002)(2616005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dHS09lCvIqAl/4hLdqAbD6sMUE29LqmJvuLz8Fag+sDDQXeKgOv4D4d9nrP0T8xD8dmSTdfV9K05UafZror+nW71mMlO7OllaumEvVVnAOtbOYhbCpGsedXvtnsX5ghKJag/yb9PnXPbeOtwCYqRPOYGFHeFMO/azGxZR31TtXfIGo2a6nHUkgr3F69xU4avvef2LwVnxUBP1oylcRbOAsBNTZ0Kp8ioXfEdfkT/31M+0D+WdFmGtl+54VzcipvvqWSjK+sjqYNRcojPra6rH/gf2ESYdVq82z4zqEBGNi0rv+bHdMFbq7kN8dus60v9BN+M+0MR/8fgKnqpKZE3PbpXn8Q8U2ZMPLuW1RQr+AXTvacHTYFpUd8dngOA+okkKQlqh/yHzsMaNJQsD4Day+iYgc9wkuL4L4cuGY4g3usCt5M4/spc4IZIg7ECmMwsrdxo/g1HZ5N59NCMYerDJ61eOY3uMznsq5f8yxcTnwyYY4RzLpBG74GpZZQnryK5hb1iP/Kq1qMbuubo/6z6fd51fGwV2MT3OWHcnpmb3OtFY2ovjVyLFrMFjL65QkHqnH780UJfUaZIbPr9YnIfCbDu0o2I9UYVMQb2UUDiN1v+ajrXJQtWG2qPiqu3kMJpuIJh2Id7k0qp0zVrHO55IwaFg/HOXabpomb4N/G/asne7KjNbBA4jreXLQi+RiZCRPnha9/ecfT1RxW/rn5xB5B2oa84d8fWdfHtE9aX6mJGo+wlWP9XNA3TIlZ4d79C/GWK/oQUIZ5hphWHuq7xAljx1Ah6UrZho+ulTu3pJKrjXVaxJtgD2Zmg/kZq2zbCiY587Or8stIupXEqUOLUCZ3G0Beedo4MJq0tAs1Q78YViQ7Hlphx7RWn6rY99Ua2UCr508EEDfKZK1Rkv4+QPqNkFtFKybN1U/2Xn5Asd3eiNF1nWkHl0gigkkJv3x4WaolLhWkoR9GHcpSGe8gAdvwTuEGSjwe6qEQ0S3JuBWkHHkAr8ipathO65K3cq890m1ye9BDCKsiZX94CwjuuD/iOUIL8Czn0cX6208auv4GdRS5PwlfE7hmVHx1EkMl69fHp7vNnzv5uuTcLWBY3wrXq5PYLm3A/5S4LRLWaHaAVmGrlBxRbclnnmuUayDCem/Vtqxzb+gjyRfvsTd4B79FRduyrzuVLzo4EQhT6TuBortda7f74nt5fNjDTg8n57RQGB3e5Wydi+JOyIr8i0C8vAuVrCQHTq5odUxd0DJVtaTXRqPDt/jCTlt3CKB8fb705ohhZorX3BIQTEqnSQjqjThiQzto/a8mjYRM6a7o1Z4r46k7f2vslNfd3O/8HsT5C7yX6lbnC0mPqwTYnupibSquNDn7n5Ja+DBFP5fxqF765ybqPsk96YxtMCo3q1l7WtqBHnfsaT+EsyD65ShD3YQpeVNBX1l/QLzskQTxLuDoHqEp2HwV72FK2Joo9Lpip3ldrM48xTONWzyJ7/Q89aNVjxRgI+yI6LodqOIj9RHHS1xI5T6tbXgaFFi8GtbmSXkDqmr48SR8lLTNhfafVozWqD8/DPXEoLMhgVLWPoMgPKKcEwtUvKKvf+aehy0PqC6rNKUCfG3/+MLXiPdCxva6GPtru3BWpz4m42gI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 286786ac-84ac-4f8d-e071-08dadd754195 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 01:48:10.8693 (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: nBtwCiIije3prYBlrc8WAecSlj3oGQEhpYVqIfwrz5+CnnOL8vkwLjGCmF8ISU0N7Ekeb4MaZwNkBvBo6PxAqLkTCnLE80XhEkJ+D4O2tem15FmTLUExwXg8432WsjWl X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB7819 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Kuninori Morimoto Current sound comment is indicating that #sound-dai-cells is required, but it is needed if board is using "simple-card". This patch tidyup the comment. Because it is already using "audio-graph", this patch removes unneeded #sound-dai-cells from ulcb.dtsi / salvator-common.dtsi. Signed-off-by: Kuninori Morimoto --- arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a77951.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a77961.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a77990.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 3 --- arch/arm64/boot/dts/renesas/ulcb.dtsi | 3 --- 12 files changed, 10 insertions(+), 16 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi index 7e643243c3be..c21b78685123 100644 --- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi @@ -1678,7 +1678,7 @@ vin7csi40: endpoint@2 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/r8a774b1.dtsi b/arch/arm64/boot/dts/renesas/r8a774b1.dtsi index d541b48c7e38..82216ce7a92a 100644 --- a/arch/arm64/boot/dts/renesas/r8a774b1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a774b1.dtsi @@ -1562,7 +1562,7 @@ vin7csi40: endpoint@2 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi index 151e32ac0368..e21653d86228 100644 --- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi @@ -1317,7 +1317,7 @@ vin5csi40: endpoint@2 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/r8a774e1.dtsi b/arch/arm64/boot/dts/renesas/r8a774e1.dtsi index c5a0e7866b2f..2828e05b40b3 100644 --- a/arch/arm64/boot/dts/renesas/r8a774e1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a774e1.dtsi @@ -1774,7 +1774,7 @@ vin7csi20: endpoint@0 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi index 07c8763c1e77..f770d160e948 100644 --- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi @@ -1998,7 +1998,7 @@ drif31: rif@e6fb0000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi index 1424d4ad941f..09c61696f7fb 100644 --- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi @@ -1870,7 +1870,7 @@ drif31: rif@e6fb0000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi index 3c744b7d0dc4..59a18dfcb8cc 100644 --- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi @@ -1750,7 +1750,7 @@ vin7csi40: endpoint@2 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi index 997f29521f66..9b4f7ad95ca8 100644 --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi @@ -1733,7 +1733,7 @@ drif31: rif@e6fb0000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi index 3053b4b21497..d4718f144e33 100644 --- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi @@ -1469,7 +1469,7 @@ drif31: rif@e6fb0000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/r8a77995.dtsi b/arch/arm64/boot/dts/renesas/r8a77995.dtsi index f040d03e0a87..e25024a7b66c 100644 --- a/arch/arm64/boot/dts/renesas/r8a77995.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77995.dtsi @@ -1037,7 +1037,7 @@ vin4: video@e6ef4000 { rcar_sound: sound@ec500000 { /* - * #sound-dai-cells is required + * #sound-dai-cells is required if simple-card * * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi index d97473401819..4a3d5037821f 100644 --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi @@ -799,9 +799,6 @@ &rcar_sound { pinctrl-0 = <&sound_pins>, <&sound_clk_pins>; pinctrl-names = "default"; - /* Single DAI */ - #sound-dai-cells = <0>; - /* audio_clkout0/1/2/3 */ #clock-cells = <1>; clock-frequency = <12288000 11289600>; diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index 29cedf4dc1a9..4b6562fc1bdf 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -381,9 +381,6 @@ &rcar_sound { pinctrl-0 = <&sound_pins>, <&sound_clk_pins>; pinctrl-names = "default"; - /* Single DAI */ - #sound-dai-cells = <0>; - /* audio_clkout0/1/2/3 */ #clock-cells = <1>; clock-frequency = <12288000 11289600>; From patchwork Wed Dec 14 01:48:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13072685 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EAA9C4332F for ; Wed, 14 Dec 2022 01:48:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236983AbiLNBs2 (ORCPT ); Tue, 13 Dec 2022 20:48:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236962AbiLNBsV (ORCPT ); Tue, 13 Dec 2022 20:48:21 -0500 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2126.outbound.protection.outlook.com [40.107.113.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CB691DDC5 for ; Tue, 13 Dec 2022 17:48:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d7pf3HH2x2A9xafy4TJBc2HiKDRe5SS2o3htCq5Ddz1imoASaQo0keHVMJvq042rw3m+/lNlOPW+xqHzoM9CkDySbGqmsD/vG3jBoofL9Ja7Ako9wZosIt3BDF33YkgGK1LzgIaiIYD2L4D1taqE799t4Wj8gSDTlMgbPmG/FLnWLg62dbKe9CnFaAoIB07sXpDOXu3fSwgU/5cyCEq4rr/uO7vkukOSxjw5aCtppy8HTp5WK+uUrO0tDwHzHAi+ilU+Vb5wo1yS8jzesb/nstmbWH91f1XxFf9GsjsO+vvANU7T9NU9axSi6Vym/sAW34G7NmkmD+VX9BDi1bPnKw== 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=YRXVWwuuod293FfGfxDv+njm1KJigk0UEZ1Q/C7Wj7s=; b=YwqXqFCeKuL0wOY3BdqQWjvu1ncyX2FFCOHIHR9C4t/KYuj6mpVO4nE2YhBeYUl6X+NCE8QH1AUDKQXd6K9BtPQiqjG2KqitwKE7iYkeiI4Femf5yRtxaxa4WWdM8o8DB2OPkfu9//p297ItLLqPswy4uHVCwzoOx239YCmbahzJQKRqPyHJMVXO4dky5QnXv7ASAcI6eTmxtGr5tLm/9X4wLMaV8IcqzY2ZWZWLkJI9bmAzepqREuT2SDuIzV+5fQPmeTcPJfsWy3TGASYDTN/hZAJOvvtqwoUHAF2ySIXYzVP/f8qIgU6b5ZHatGa1Um5KO2RnLskXmX/A6lzvzA== 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=YRXVWwuuod293FfGfxDv+njm1KJigk0UEZ1Q/C7Wj7s=; b=lKj/D9iPxiNISA1TP4j5U9/1hfEHBfiljb5z7cH954sX7xPmlFMiIhQ50E5mvfFrN9EeF3FYG9G/AF3fOY3eLFCh+MYyFRz4Ha/KT9aqzyvY0RXR6QPujhh9sNiMSZ00+lrMZJbTHogGmGVpYnrSSJwv2/0us5rgzhkS4kG1ozk= 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 OSZPR01MB7819.jpnprd01.prod.outlook.com (2603:1096:604:1b7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 01:48:18 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431%8]) with mapi id 15.20.5924.011; Wed, 14 Dec 2022 01:48:18 +0000 Message-ID: <87a63qpxge.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 3/8] arm64: dts: renesas: add ulcb{-kf} Audio Graph Card dtsi User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Geert Uytterhoeven Cc: Linux-Renesas In-Reply-To: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> References: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 14 Dec 2022 01:48:17 +0000 X-ClientProxiedBy: TYCP286CA0193.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:382::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_|OSZPR01MB7819:EE_ X-MS-Office365-Filtering-Correlation-Id: 93a0904d-331b-4017-0e71-08dadd7545e8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MxY87IU7nBVPL+aU2D/suswmWVwKNy96TZhu8xoTHYij8dwdSaz7CKheeYz3hfgkOxrJT73SVtIi8z43i01IDYQCYnRkQDSJS4zeRfHRZ/XQBeS3FhPVjNBWrmy7j0CtpVAtFn/Zt3THB9JARzCm4etPQ2lmLW7FLcrbkXMKqdOHLsU0Xw5bIwM2hbCoj7buaufF5HkUCQMcL/WsGXBEX1tUU+RAWWJpT6GLTtWkasp9jEG3cwuXO8gRSmpmcOvBpQzmTtYrmSDEm+xSKIRmg8fuUGez4JQ/OTEzh3LtHLaODRqfbpG6IxYEpqPq+89BGbwYmWnP8iZmjXEKryq4Hf5s/BK6vTTFwaBg7Dw35BoT1A1qKI7eIb0Ik2QnHEMVqWYnRKx56H53QIsH+GjJJEpl14EfQtmk7jWFUSH4pwRwrlxGzwShfz7qKcczNjT2z8qGbjhsdJfLuoGcd2OUCf8sGqkF/e9faLdjjMMoAPJYFNRxhLLFzuNuYd5GUhYV4dvMwGCYynfwm+4eQt3hjwISYwM0vLtLzO4ekXy46kgX/ppGhoJxtDI9+X8ufEi0cDge+DzINmYUWF1Q4lKl2s7ACCRUp9eXWy5P//lnpqD6KZ8KwPHFP/o/alya9haK3HhAp3hD12uylh3bf/4bGEf4TyipEb+Zw+9Mt5iXwuzuqIGhbMcVVL56oMc0WtoHkn+d7m2XGrwZrdUmhF0EtgsmVnDJGl7Xa6lc2U/g/OI= 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:(13230022)(4636009)(136003)(366004)(376002)(346002)(396003)(39860400002)(451199015)(83380400001)(38100700002)(36756003)(8676002)(41300700001)(66556008)(38350700002)(4326008)(66476007)(66946007)(86362001)(5660300002)(6916009)(478600001)(6486002)(8936002)(316002)(6512007)(6506007)(26005)(186003)(52116002)(2906002)(2616005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dAWNLJwDii1RGaS6kCFjbhDOV5NfcFrw1Ociw5U89ncdfWao0Lh9OlaefkX1AOUh7GHPNmcRoBNfe7LUxMTNOLVVycX3LZjQtF1YCpFpMIZqFFsrkDKWIyoScKQWK+dyBUixYnjnC4SQpl3+1HtRzChrMjxeWGUP7dle6Yd7B2wduC0BQpKRv/5D/IH7/NLAWSitgzePnVYIfdNgenDRBkzDujqpGOkOJZECH6SXTBDfHLcDekqL9te4lRCJkdM8kp4Z6tnALYgip4wCITkhQZbhM6IzeQc4Aqb/PT56Hw7WL1bnKMGvp2sK4gJLp4LOETqm5aTc6cB+zwSMo65ZCLrWy6VIUCLFtl7ig1zS5q9NKCLeHAC73TYfAiYv+l8EG9EIB+haDq2lMSS43WlsvhnmdSEwRYcnoEMEIpf1jbI4GM6j1tY5pP2EcgfnyQeaXJnJtNZ2ALIxHGuf4Aty16Uq3wHcq4ITBT7FlLgMapIUBWezDa/L1K2QXpXLZiZwE8tquIcAATXDee3TcmOemmMBbjMWhLyxdpAAdr9onn7gq1/X5ghR4njCIhXqp7ZK+aZMBQtdlFm+LvXJzThbjAqjoiXHIIsVvRmsYn5rOtlzTRTLTgY/yNN/3UlTQY2mhB8cQJb+t1SWdCgjYizAm1dg4UH7vaqwuLzlv5fSA2rIbisfd1ciUfApZIPsOOZlW0D9HFDUru4WafizRnPQx1zwQvOVAJqaVVo4jJAocDFAJNTI3Ot47kx54HtWsVoW+rI6wgS7UuuN/DFDPytHek19n21nRfBoAQcUdnfds29ceEIZlSzSz/a78QtiQCQDkiNrrVtG08WX00kt48wKsv2HA51aIlJDtwazu6b4xz1K8A4eCadMQyuvdEkxTXicF0jT4tEOZEM0TUqXupyhPgXgum2eWrOHCInFPEMEVUSN19V393nkkvE1Wd8cdwbRpV//IYF5u70ZMDPZUeAyFDI46elEvvwH2UEDUeV8mTbT848Mg/7mEPlbfVM2N+3NMgL0QLkA82xM+LFGPen6/+P3FPVzUQaw+XZ3SgOpPW6Zk9GIRPVDwIpKUhxEtYwzMfCjeeebfNMNgfGjufGfBjWAEocYCDSSIpK5nVkb5fM9uFnUHxGCsbScwm5dA2KRwsn2Dpf0aqTNQbhRvoDbp8kxZWD0+SKcQOMZQvKalYm2uYHf8fJXTRZQ1ZxsPS63i7t1c3r8Nm0wAlJjufX5pxtDLfU/b/NcZHgMf3HNYYgjeNsg7PRMNwQLBNoxt8T1meLcop5J543sa7Aos+OVW9H4FpauglijGpwhuejpX3pygynfP9O6B7xgwwEcsyIq8Fpejji0tKjoBo/2R4lZVwDmNz3clOBZtdockYgVp20Gl0qD3MQSe8rDwBPgy1w1n0FtmRA4OLrxOV0zsYbgemqTEETs+P0rjhxg2Cr1A6CkQs8P7skzwpsOQm0CWaBG8Vyss0WXIf0djsk5N2tzM+oPCjrSv/PWMjWGbKm2C/2WcRpTEwXIXlShp/7SfLwkTXNYn7ZFoMenPTbPHVBJ/2GFexhOKchoPIXGgg8ZaPFAEH2gaLYK6WBvOKXKbFnlKliZ6bWanNKLGqfmx1xic2jSnRYerVzbcnB+N+KL4Tg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93a0904d-331b-4017-0e71-08dadd7545e8 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 01:48:18.1188 (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: oyck1VrEY9MuSn8pJAGuw44sx2p+M5GjY24HFg6LEirKaAhV8DUkOkJM9MGBRXOvQjnx96Lro4KGG4J4sIeOkrJxC1xVOlgOSNIkzEoN63JiaJtWcrlcPvZ2hH/h+DZI X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB7819 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Kuninori Morimoto ALSA SoC has many type of Generic Audio Card driver (Simple Audio Card, Audio Graph Card, Audio Graph Card2), and Renesas/Kuninori Morimoto want to test these. Generic Audio Card driver had been requested on ALSA SoC. It has many type of device connection method, and historically, requested connection support range of generic driver have been upgraded. Upgrading connection support range itself was possible on generic driver, but could not implemented, because we need to keep compatibility on Device-Tree. This is one of the reason why we have many type of Generic Audio Card driver. ULCB/KF is good board to test these. Kuninori has been testing these Generic Audio Card driver by using his local patch to switching drivers. But it is good idea to upstream these from information sharing point of view, because DT setting is complex. It can be good sample for user. This patch is one of them. From normal user point of view who don't need to test the driver, it should keep as-is, nothing changed. This patch adds "Audio Graph Card" DT setting file for ULCB/KF. We can switch to use it if ulcb.dtsi / ulcb-kf.dtsi were updated. Because it needs "switching driver", not "add extra feature", it doesn't use Device-Tree overlay. Signed-off-by: Kuninori Morimoto --- .../dts/renesas/ulcb-audio-graph-card.dtsi | 85 ++++++++++++++++++ .../dts/renesas/ulcb-kf-audio-graph-card.dtsi | 88 +++++++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card.dtsi create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi diff --git a/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card.dtsi b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card.dtsi new file mode 100644 index 000000000000..8a1ca100cef8 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card.dtsi @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Audio Graph Card + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * (A) CPU0 ------ ak4613 + * (B) CPU1 ------ HDMI + * + * (A) aplay -D plughw:0,0 xxx.wav + * (B) aplay -D plughw:0,1 xxx.wav + * + * (A) arecord -D plughw:0,0 xxx.wav + */ + +/ { + sound_card: sound { + compatible = "audio-graph-card"; + label = "rcar-sound"; + + dais = <&rsnd_port0 /* (A) ak4613 */ + &rsnd_port1 /* (B) HDMI0 */ + >; + }; +}; + +&ak4613 { + #sound-dai-cells = <0>; + + port { + /* + * (A) CPU0 <-> ak4613 + */ + ak4613_endpoint: endpoint { + remote-endpoint = <&rsnd_for_ak4613>; + }; + }; +}; + +&hdmi0 { + ports { + port@2 { + /* + * (B) CPU1 <-> HDMI + */ + dw_hdmi0_snd_in: endpoint { + remote-endpoint = <&rsnd_for_hdmi>; + }; + }; + }; +}; + +&rcar_sound { + ports { + #address-cells = <1>; + #size-cells = <0>; + rsnd_port0: port@0 { + /* + * (A) CPU0 <-> ak4613 + */ + reg = <0>; + rsnd_for_ak4613: endpoint { + remote-endpoint = <&ak4613_endpoint>; + bitclock-master; + frame-master; + playback = <&ssi0>, <&src0>, <&dvc0>; + capture = <&ssi1>, <&src1>, <&dvc1>; + }; + }; + rsnd_port1: port@1 { + /* + * (B) CPU1 <-> HDMI + */ + reg = <1>; + rsnd_for_hdmi: endpoint { + remote-endpoint = <&dw_hdmi0_snd_in>; + bitclock-master; + frame-master; + playback = <&ssi2>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi new file mode 100644 index 000000000000..fcdd2e949b5f --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi @@ -0,0 +1,88 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Kingfisher + Audio Graph Card + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * (A) CPU0 ------ ak4613 + * (B) CPU1 ------ HDMI + * (C) CPU2 ------ PCM3168A-p (8ch) + * (D) CPU3 ------ PCM3168A-c (6ch) + * + * (A) aplay -D plughw:0,0 xxx.wav + * (B) aplay -D plughw:0,1 xxx.wav + * (C) aplay -D plughw:0,2 xxx.wav + * + * (A) arecord -D plughw:0,0 xxx.wav + * (D) arecord -D plughw:0,3 xxx.wav + */ + +&sound_card { + dais = <&rsnd_port0 /* (A) ak4613 */ + &rsnd_port1 /* (B) HDMI0 */ + &rsnd_port2 /* (C) pcm3168a playback */ + &rsnd_port3 /* (D) pcm3168a capture */ + >; +}; + +&pcm3168a { + ports { + #address-cells = <1>; + #size-cells = <0>; + mclk-fs = <512>; + /* + * (C) CPU2 <-> PCM3168A-p + */ + port@0 { + reg = <0>; + pcm3168a_endpoint_p: endpoint { + remote-endpoint = <&rsnd_for_pcm3168a_play>; + clocks = <&clksndsel>; + }; + }; + /* + * (D) CPU3 <-> PCM3168A-c + */ + port@1 { + reg = <1>; + pcm3168a_endpoint_c: endpoint { + remote-endpoint = <&rsnd_for_pcm3168a_capture>; + clocks = <&clksndsel>; + }; + }; + }; +}; + +&rcar_sound { + ports { + /* rsnd_port0/1 are defined in ulcb.dtsi */ + /* + * (C) CPU2 <-> PCM3168A-p + */ + rsnd_port2: port@2 { + reg = <2>; + rsnd_for_pcm3168a_play: endpoint { + remote-endpoint = <&pcm3168a_endpoint_p>; + bitclock-master; + frame-master; + dai-tdm-slot-num = <8>; + playback = <&ssi3>; + }; + }; + /* + * (D) CPU3 <-> PCM3168A-c + */ + rsnd_port3: port@3 { + reg = <3>; + rsnd_for_pcm3168a_capture: endpoint { + remote-endpoint = <&pcm3168a_endpoint_c>; + bitclock-master; + frame-master; + dai-tdm-slot-num = <6>; + capture = <&ssi4>; + }; + }; + }; +}; From patchwork Wed Dec 14 01:48:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13072686 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD84CC4332F for ; Wed, 14 Dec 2022 01:48:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236997AbiLNBsc (ORCPT ); Tue, 13 Dec 2022 20:48:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237001AbiLNBs2 (ORCPT ); Tue, 13 Dec 2022 20:48:28 -0500 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2100.outbound.protection.outlook.com [40.107.113.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F5672253B for ; Tue, 13 Dec 2022 17:48:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k/91BIKCA1tr/ZC9C3SX9daW0oZxuTGBIPBGEipE/55GMKRt+Of+v3dkoLpoOk8asShcg9EsdwHcOV+LcrpQIoPtGta2GP66v+Qs/XEroyXVG0Vtsmeb1V3vyrV/Y+UgX0bslR6zcqMCrZ0XWfbqyD7H3GOXQldg9BJbQ7/4knB4RZCnvAs886rPs/jilrC1ftl1elYEsJ1UNullVb3poe8IfCnljcSwub6CMylehC1sOT1fEC4TjoGPdagH8J6CDBMJkGA88nUYpoQ13U+cER5WI1Qjj6GW9hclwPOB95CSw0fTMdy+uUwNmJ85DdcCVfthK8VTWZbvXKi19iN+8A== 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=YxCWmSzPcqf0x8yVIqa2NivdAg+dQ8x+f0+vfSEKFvU=; b=Dv2GryNcIHBRHPrr0yhtFGq58VTiYJNsOh3WiUz0Zf/DWk6qR0prvHqVA0XC9PBJ/M1O2v4Cpbd96N9Iw3FKWQUuZiL258strQLQxWnwo1NwkcsJc4EeA9kP+aEouQxlNCbytSEtDx2PiAl5p5XLqJF4Y8Z9F+BsbEstruCXO969ulTMIhTQRRkeafGRzFPzlfOuhaVZQt2BWMWN9Uf4RUegPT1ylfBFEhOX4cpj1nBs6q9dziRnn/81/KA6fbWpRn2eh17uZUAABA8nKFJrm36IDi+LFyomnlxskBucQCYwO43Q5TJ/RPsD75Fyu7k6+pg2GOTGSaoxzHqr7QtR2A== 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=YxCWmSzPcqf0x8yVIqa2NivdAg+dQ8x+f0+vfSEKFvU=; b=LgByTJozVX/e/GsqongT4To63+XSq1Gi6+i4VIb1zE3Ibn6ZRZbx4oJhOUdQKTKlXxocdPt2HI0sVK3iBWwxmWIt/3u+EGx0jq92rHDSvZAzDqTyC23M9EQ8uAsKk3iWBYCiaxCz4gg73r+K2vNFm3A9QcVbmjlmTZkYZ4juF6g= 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 OSZPR01MB7819.jpnprd01.prod.outlook.com (2603:1096:604:1b7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 01:48:23 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431%8]) with mapi id 15.20.5924.011; Wed, 14 Dec 2022 01:48:23 +0000 Message-ID: <878rjapxg8.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 4/8] arm64: dts: renesas: add ulcb{-kf} Audio Graph Card2 dtsi User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Geert Uytterhoeven Cc: Linux-Renesas In-Reply-To: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> References: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 14 Dec 2022 01:48:23 +0000 X-ClientProxiedBy: TYCP286CA0181.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:382::19) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSZPR01MB7819:EE_ X-MS-Office365-Filtering-Correlation-Id: d087bea6-b735-4f13-c904-08dadd754950 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f6sa1iA568Ljab1ju6Bqrv4+BmqTB02hHURhY/xmNM921qbQCDGWmjJHCic+tZuSj/sAyPQ9rrr6Xp+NratrYSBlyIUJrckxtpTfHES7qCItHkZxcrrn40hHBFuS80kVR4U8feBqkNEFKqZG4LEtB2S3JC+OV2r2l9m/vffAKiP8x1V3ve7vJupQlpW9h+XeKhUUhtvIdNKcUSIMYoASz/VUlSKG00UhrJNzZgXKVyUSFmLdvImgQgk3xfkOkTaewi/6zcSjVoSQ1RKonvGTKLpSEmfqDfszASU1/XD6zW8UMwO5Lf8AwW2cqU4DB4L4kFx8se0YtCy3cRyfAP3eQGsKD6VNk2bv2RruBn+VpIz2EfIDmknoqmYp6NJalrulirK9Shit6w2tTdTwT99i/LtmPAECEZr0AVP7H9P5VoqEGx/s2ONA6wjcJtj6cjvWvE+ud61dvbd8fWuRL+qX/Ttzp/DlefAHAtgLvHdB3N1qHcmnw0HhzIfbbS3J0AJ1pit3UH3DKZsrq2bVwV6Rn5lSFxijvfeAu/HQHjgzCuzM6SOSQNVU6dZ0wXmRloKyeDq7jK0uReAjMfJNRYP6FQKte8dwOHxT/oscbgaN5JNAHwdsHiMUpvx49ICX69Qst/JdgoLnOVTYe95j95LyzjOIgTqacH207PnfinQYc9Fus+KGlAJj8CEv+lvQNCk9yUjF0d/Yy/fZ6Z3fjugAv4gO/rsvDC51KAo7I22y4VA= 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:(13230022)(4636009)(136003)(366004)(376002)(346002)(396003)(39860400002)(451199015)(83380400001)(38100700002)(36756003)(8676002)(41300700001)(66556008)(38350700002)(4326008)(66476007)(66946007)(86362001)(5660300002)(6916009)(478600001)(6486002)(8936002)(316002)(6512007)(6506007)(26005)(186003)(52116002)(2906002)(2616005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TlnNiQWlIUE1AMAUju8R2uvqiKz5lSBCrMd3OWMdgM6LR1188pyIvvgIZxVBg/ZEX32iEM7qr62KtZNsvvyPXpQeR0+w6M1FzzZhqJzmVK9YYmPJfGOpXuJUgQqEfpaBwsLdfGJsTQ7NzS17VKCsSn3tc9ZMyIYTod9POM2UOlwKUHgN21piESYmZ+BDuR/lwKqiQwbyszWSbD7iue7ISf7H0DGyqK7XR2SvjVwwjPJkvjkSaew+gh6U+4qzIZdtE7R6DLnoI3GmIOgWVF5hT5bVNpJKwD/dXwSQHPxBOgW6boS3lLkaiUXwt1K+naDsn1JSuzQSo+9hkosNpg97RaRxQ7S81i09Vgj4eiAeNPFsQYtAsa7MLUw2FnjJJ6IzGEaIG0xaFg6o10e+HfDK4zEsHKp87R8X0d0vOXFJYcZm8l0TEDZrl+GGrdaEIfCh9lX6jCNO89q+7ocft2QYEOMD/GcrpGN6cFZ0XRTLyaQoFjen2o/54byEfyRCvanyoAZOlSWiVIhdunKs3BDN4ebqZEDBV3SPzD9SGJ7S2yqRQbK1rq43j3PGRe4VlNVJzU4RTCOL9ilvufMzXsgywblWmYL8uH94btvvgDv392oAlISKQKN7c1aHIna3q05ZyXhiIWg1ZJH/anSQYSEGWhfj59bi6I0g4Niep9uJFUOr8ihTfMJy6MAQwqq2XgFytJY7jzxr5Ti3FxwBX+XXzY/XIJH9YlbIqsfxd2xqn1noQsQuHOs0CKH3a8PhOGkHHDPWqX/j8fQxuk5oBrPuVQstpAzXioH4JPoTka70bTrzU0CWgXQZF6aTcdVu5IJAicsDtWED9eGdq+OBgpwA0R6gsBIE43O+suXCYcazOcYp4q1lcevHO42hQIOLCjDjDjZshwSxvzbB/89g7y+ndYderVz+X9EX4NhyZlSM5FZxRj9/nA/FAEP2iwbw68Y71957MdibKQrynwNEDiPKIbVShKoPY5RdyCeX1yI3qcVY2AXPCUgCJR7p5GQUF9+bXKlSL4bXoFOhJE/YRztTOoTzlrVlGZi7lMsNp3inR8yNOUK1NDWfcTc4Ij3q1mniEkiJMRfeinu8QQwc9s7F6ha+SeR3Bu7S+4+mS5n97vVLwMRLHbziJg9V99NyO6UfJBBIhR5ahezWALbzRxdXuKNd8GjK1z/dhG0/9rF/BcgR1TvBdW+wMMtLW+Zl8pd3RH2RODMTXtLb0otkTsuQWpNJvjZCTPCPIMvb7/Xw/9l4nVwnBMUZhjmHOpHLF9FrfChBMi0YlO1abw/cXLSY8+qjn7OFEK1+bbHmJPssfsTnxD1DcDjAwYoI5ke2s6hfirCTl3Dss0rvjqw/12RvyRLxdvsc3vRhh2BRpOkHIORwqtCkq5Ab3iFVHN/5Moam5thHIs85yJKAOyECa4gSLyEvU/OlESFxUpdYIVcH55/b6WyY4WFgnRCqKem1zaPJpUBLrcZSAB+7zty2wy5bfAi/qDFmrSGhgWOM08owv3AmOpLoyH614Lp9ElElnoQHiP1eyuxq1YqbmWmqlIxB1uam7LN8vVfIXxETD/cw2gwfwtE1Nvd2CpdktpIX3lGqQMBf6vJlVnXk4z5dU28xcP35vlcrq+U0NpZmsLlzERE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d087bea6-b735-4f13-c904-08dadd754950 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 01:48:23.8070 (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: ww/oc15b2Rb+XI1xy3DghDT5M3dQlbUABiYigE9L5ABKulgWJbsFdq12+ciRMF/KhRX2CEV2ykV6fu7AXxko25i7zTu6hoUIXwVl+0yBVQ7bqOe9hIzgYMOk9GwzC/Be X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB7819 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Kuninori Morimoto ALSA SoC has many type of Generic Audio Card driver (Simple Audio Card, Audio Graph Card, Audio Graph Card2), and Renesas/Kuninori Morimoto want to test these. Generic Audio Card driver had been requested on ALSA SoC. It has many type of device connection method, and historically, requested connection support range of generic driver have been upgraded. Upgrading connection support range itself was possible on generic driver, but could not implemented, because we need to keep compatibility on Device-Tree. This is one of the reason why we have many type of Generic Audio Card driver. ULCB/KF is good board to test these. Kuninori has been testing these Generic Audio Card driver by using his local patch to switching drivers. But it is good idea to upstream these from information sharing point of view, because DT setting is complex. It can be good sample for user. This patch is one of them. From normal user point of view who don't need to test the driver, it should keep as-is, nothing changed. This patch adds "Audio Graph Card2" DT setting file for ULCB/KF, and switch to use it. We can switch to other Generic Audio Graph driver if ulcb.dtsi / ulcb-kf.dtsi were updated. Because it needs "switching driver", not "add extra feature", it doesn't use Device-Tree overlay. Signed-off-by: Kuninori Morimoto --- .../dts/renesas/ulcb-audio-graph-card2.dtsi | 26 ++++++++ .../renesas/ulcb-kf-audio-graph-card2.dtsi | 30 +++++++++ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 62 +++---------------- arch/arm64/boot/dts/renesas/ulcb.dtsi | 52 +++------------- 4 files changed, 75 insertions(+), 95 deletions(-) create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2.dtsi create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi diff --git a/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2.dtsi b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2.dtsi new file mode 100644 index 000000000000..4668ee5383fc --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2.dtsi @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Audio Graph Card2 + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * (A) CPU0 ------ ak4613 + * (B) CPU1 ------ HDMI + * + * (A) aplay -D plughw:0,0 xxx.wav + * (B) aplay -D plughw:0,1 xxx.wav + * + * (A) arecord -D plughw:0,0 xxx.wav + */ +#include "ulcb-audio-graph-card.dtsi" + +&sound_card { + compatible = "audio-graph-card2"; + + /delete-property/ dais; + links = <&rsnd_port0 /* (A) ak4613 */ + &rsnd_port1 /* (B) HDMI0 */ + >; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi new file mode 100644 index 000000000000..7b4ed8fc8cc2 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Kingfisher + Audio Graph Card2 + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * (A) CPU0 ------ ak4613 + * (B) CPU1 ------ HDMI + * (C) CPU2 ------ PCM3168A-p (8ch) + * (D) CPU3 ------ PCM3168A-c (6ch) + * + * (A) aplay -D plughw:0,0 xxx.wav + * (B) aplay -D plughw:0,1 xxx.wav + * (C) aplay -D plughw:0,2 xxx.wav + * + * (A) arecord -D plughw:0,0 xxx.wav + * (D) arecord -D plughw:0,3 xxx.wav + */ +#include "ulcb-kf-audio-graph-card.dtsi" + +&sound_card { + /delete-property/ dais; + links = <&rsnd_port0 /* (A) ak4613 */ + &rsnd_port1 /* (B) HDMI0 */ + &rsnd_port2 /* (C) pcm3168a playback */ + &rsnd_port3 /* (D) pcm3168a capture */ + >; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi index 408871c2859d..b5877120ab46 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -212,26 +212,6 @@ pcm3168a: audio-codec@44 { VCCAD2-supply = <&snd_vcc5v>; VCCDA1-supply = <&snd_vcc5v>; VCCDA2-supply = <&snd_vcc5v>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - mclk-fs = <512>; - port@0 { - reg = <0>; - pcm3168a_endpoint_p: endpoint { - remote-endpoint = <&rsnd_for_pcm3168a_play>; - clocks = <&clksndsel>; - }; - }; - port@1 { - reg = <1>; - pcm3168a_endpoint_c: endpoint { - remote-endpoint = <&rsnd_for_pcm3168a_capture>; - clocks = <&clksndsel>; - }; - }; - }; }; gyroscope@6b { @@ -418,30 +398,6 @@ &rcar_sound { pinctrl-0 = <&sound_pins &sound_clk_pins &sound_pcm_pins>; - - ports { - /* rsnd_port0/1 are defined in ulcb.dtsi */ - rsnd_port2: port@2 { - reg = <2>; - rsnd_for_pcm3168a_play: endpoint { - remote-endpoint = <&pcm3168a_endpoint_p>; - bitclock-master; - frame-master; - dai-tdm-slot-num = <8>; - playback = <&ssi3>; - }; - }; - rsnd_port3: port@3 { - reg = <3>; - rsnd_for_pcm3168a_capture: endpoint { - remote-endpoint = <&pcm3168a_endpoint_c>; - bitclock-master; - frame-master; - dai-tdm-slot-num = <6>; - capture = <&ssi4>; - }; - }; - }; }; &scif1 { @@ -476,14 +432,6 @@ wlcore: wlcore@2 { }; }; -&sound_card { - links = <&rsnd_port0 /* ak4613 */ - &rsnd_port1 /* HDMI0 */ - &rsnd_port2 /* pcm3168a playback */ - &rsnd_port3 /* pcm3168a capture */ - >; -}; - &ssi4 { shared-pin; }; @@ -498,3 +446,13 @@ &usb2_phy0 { &xhci0 { status = "okay"; }; + +/* + * For sound-test. + * + * We can switch Audio Card for testing + * see also ulcb.dtsi + * + * #include "ulcb-kf-audio-graph-card.dtsi" + */ +#include "ulcb-kf-audio-graph-card2.dtsi" diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index 4b6562fc1bdf..6196494452c9 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -102,15 +102,6 @@ reg_3p3v: regulator-3p3v { regulator-always-on; }; - sound_card: sound { - compatible = "audio-graph-card2"; - label = "rcar-sound"; - - links = <&rsnd_port0 /* ak4613 */ - &rsnd_port1 /* HDMI0 */ - >; - }; - vcc_sdhi0: regulator-vcc-sdhi0 { compatible = "regulator-fixed"; @@ -201,9 +192,6 @@ rcar_dw_hdmi0_out: endpoint { }; port@2 { reg = <2>; - dw_hdmi0_snd_in: endpoint { - remote-endpoint = <&rsnd_for_hdmi>; - }; }; }; }; @@ -218,7 +206,6 @@ &i2c2 { ak4613: codec@10 { compatible = "asahi-kasei,ak4613"; - #sound-dai-cells = <0>; reg = <0x10>; clocks = <&rcar_sound 3>; @@ -230,12 +217,6 @@ ak4613: codec@10 { asahi-kasei,out4-single-end; asahi-kasei,out5-single-end; asahi-kasei,out6-single-end; - - port { - ak4613_endpoint: endpoint { - remote-endpoint = <&rsnd_for_ak4613>; - }; - }; }; cs2000: clk-multiplier@4f { @@ -405,30 +386,6 @@ &rcar_sound { <&audio_clk_a>, <&cs2000>, <&audio_clk_c>, <&cpg CPG_CORE CPG_AUDIO_CLK_I>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - rsnd_port0: port@0 { - reg = <0>; - rsnd_for_ak4613: endpoint { - remote-endpoint = <&ak4613_endpoint>; - bitclock-master; - frame-master; - playback = <&ssi0>, <&src0>, <&dvc0>; - capture = <&ssi1>, <&src1>, <&dvc1>; - }; - }; - rsnd_port1: port@1 { - reg = <1>; - rsnd_for_hdmi: endpoint { - remote-endpoint = <&dw_hdmi0_snd_in>; - bitclock-master; - frame-master; - playback = <&ssi2>; - }; - }; - }; }; &rpc { @@ -538,3 +495,12 @@ &usb2_phy1 { status = "okay"; }; + +/* + * For sound-test. + * + * We can switch Audio Card for testing + * + * #include "ulcb-audio-graph-card.dtsi" + */ +#include "ulcb-audio-graph-card2.dtsi" From patchwork Wed Dec 14 01:48:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13072687 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 910A0C4332F for ; Wed, 14 Dec 2022 01:48:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236998AbiLNBso (ORCPT ); Tue, 13 Dec 2022 20:48:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236970AbiLNBse (ORCPT ); Tue, 13 Dec 2022 20:48:34 -0500 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2107.outbound.protection.outlook.com [40.107.113.107]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFC642253B for ; Tue, 13 Dec 2022 17:48:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kw922x5DvEjrdCffXguBnCyXJaPAIAFi6uxBq+fG3pQxmBZT1FyX6LpsMDFP9wPm54yrSpa5vCTh/pgW2Gch70XXl9aK0oV3uTtCXM1lqeQvKcpSRuIa0lYLaASUsL6Pby008N+diL3B2g7Lh1cbnY1W+Iq8Vp//Co0I0Ge9FibsYJ42DKlSigxM5m1aUFyo9hEvTY6QlJFOqk43AP/BbtipYRzph2YxyzkL7CWiuny8LaDE1JR9g8yb9ktr2Wg6305573rquJkg2IPx7pM7rP/BDP/Zc0HqZuMYWhVIb2nEq1jm6x7L0qW8PVpesFXTHcuDKUCLXwaG76qxMHVDow== 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=FFPRiTk41l+g3WrH8hZcGXbY6294uvL7WPD0/a3xuN0=; b=fjGqwgKRHHaarMudfIsLYLovokUV4thB8swb4K1yj5rOM7ZNXMkHqvT1xAeeFX4HWlhwC5nrAZZJsqcnZJedgoh+1/EvJPtQMa+ioJB5LTr56GhAe3IH0hmG5f0OIvAH/WrSK2570z//EfVPOFyoObLzp20paO3KcVpWeESYPCvLeXwR3ymLuCIS/XvoMiu3WWiJRAQi/tTuwMXAEVJlnOOCBZzBnx6WZWJdxplalN5HBuN3Ycm5HqJwYpO5jLxAQQc6AaU8us2W04SqwlaFyvyFgNg+TnUQWzHnNV6eOT6MPFMMPOBZc1JHgBpZrB3ZCYyyfDwRO1Yg7Vox6FPKjA== 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=FFPRiTk41l+g3WrH8hZcGXbY6294uvL7WPD0/a3xuN0=; b=L/cn+5JAa517YNeS8l+9sZcGxDk6W4bC2wpWs6IeHtNGas6eFKZ3caipO4vvkUU0Zizr74zc9hXmIAez0Eg3dE7SlZlCc2ZjhaRAa01ZOh6YuD5OmoqwOD8L0JMYYMscjHIZl3QMv+dbxVSF98eedphQTnHPVznmltraiLafvDI= 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 TYAPR01MB5626.jpnprd01.prod.outlook.com (2603:1096:404:8054::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 01:48:30 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431%8]) with mapi id 15.20.5924.011; Wed, 14 Dec 2022 01:48:30 +0000 Message-ID: <877cyupxg2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 5/8] arm64: dts: renesas: add ulcb{-kf} Simple Audio Card dtsi User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Geert Uytterhoeven Cc: Linux-Renesas In-Reply-To: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> References: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 14 Dec 2022 01:48:30 +0000 X-ClientProxiedBy: TYCPR01CA0072.jpnprd01.prod.outlook.com (2603:1096:405:2::36) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYAPR01MB5626:EE_ X-MS-Office365-Filtering-Correlation-Id: 00fcc653-7ada-4c33-d2b3-08dadd754d41 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: emEILek8a7/ilbKDkpI7j6zJ32S2niJKCgM6W8T4sXXMob68WLS82sg64XLHjyG35eFT1YWesA+hrN/jUUT8iH0dMvOC33Afkd9OBqia1HPUVPn5o5lCthuBJiaD5z8mCag1CBkHoAKYuaZdoKVvS4TK/miey+C9MFWJ++qzn5Hu4cTO4J04faX5oOCqdHMcgR8RyGf6l9UgtOygd8MoaRb/MLlqGspQ37PAdC0FyK3A83PcRw7rmz8nl1gaIDc9IVfWbEZa/DtrbMKgOclrd0ifS0/VqCE7sYsfNvLszO+/dxGLj663Io7XWvV/okXRiDXXHsnouy7EUmhRh9HWtOoNjsXc/ugDUV707nF/Ehec2dK0Fy1X7YgqakK9K+RHRsTh4OzXRZwR4zZo1b3w/oxOaseE1ZAGIW8+KzLr3zpyKvKr30P9OJl4ek2t58J9oLRnw5Iec7xtUpUv/qYPTV8/E6jZy+wd2wNC0me6SMsQ1cfVOr8pKlihrms2NqAcsb6pYN4bzzh7vouz714IRe20DiTqC+7R2jp/yjKyjj/kc2MMVzyZ8pzW9ed4e/IN6eEzRC/Brv5wZNDnfpvA9MS21m5HQWlfMDPhbvp+3TpvM+Ry8mJyObqZ8OYfSD6XD689tz6N7+P+x7m+cGoIBEb57HoJnargJxqkZ4WtZDla8DPj0mvr+piA/AtS+jCMknMeccOnojxk96kiLHfeuM33p/mkECTGjsktibAzsTM= 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:(13230022)(4636009)(376002)(39860400002)(396003)(346002)(366004)(136003)(451199015)(36756003)(86362001)(38350700002)(83380400001)(478600001)(186003)(52116002)(6506007)(6512007)(6486002)(26005)(38100700002)(2616005)(2906002)(41300700001)(316002)(66946007)(4326008)(66556008)(5660300002)(6916009)(8676002)(8936002)(66476007)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AGVWQAD+mTa4kUuNhPU0L+tDxvi058w7ngnKH3PBEJF6mOQ+cbYcueztnsxTmuzVlVYutd11DNYhVgFsY68u2en9JQBAhz+TyJjqrYHkPATItq/E3lTAN7HuJ2KTHUYwoJ3OQNlXtP0EOzh9G4X5/fTQFvziE3Ty70oV5ALZOm56/j9TEh+yYMVTXXLH5exsQky21WbJGgD7OW55OquaDVY9A1p/KBA5TVB+v2EPl5ytJf/xeUiJCPda133I1+A/JM2BaxlnmH4kC1K11aggw2Zk5+3AsldPF6yE0frGDBVI4IMRdcZJ2N/bQdW1dMzlYA4PDoxKlwgj+83WgZLrPjXrWCeWes5MRwqmyixdsJtZnjBsr+tPWXkggXHMaQ/KtgqHdTtFZ3ZxwAxSKeIlBf3UMFvB2DysfSgEmTpku7+JSSQvUFKqUI1oBdBHWvZMXEcaHsgYSVOR/hQvvkKo3jUTBLYFUV4eskekqrM7swgqfdrXrSWP72f9yb4xJXvOqunEBaASJoZy+SWViSbpRaJcuhzOcc8/bFSSwP/tc6TOe07rPVMtYYUQMImqAW75LA2kbEpcSM6VRcuCDx6Tlk1PFi3SZWuLyv3eU4n8fUFbrH3qG/XD0Ks3oTqKpHDFgETyIw6pjn8WkIK/yHxMPGR4Ao5vgD1NQ3ncOeBXzaDfppJqDIk5hDpBTNm0/NHcn4neF/3B1rUgp1p5o+W0ddjhJIJ5JztvmTfWm9C1S3TvF26xfjG0i8V2QDBocoTexYwlHrm7N5WkFUnBd0w5KyetxN3RsvtCBbbowKZmVDbbH9X3suMLFULVt3p5aQ55RYuAaDFloLql98fSNEyyM8S7QIJ60O24JGl8Tr+AQMxjC+IdXiMJV2yCPL/2Koda0E+3lN+zRouHcDmVikmj0gwTjuvYoPmlCTZSIBSzFXctESEC5+7uILekvN7lDg+g5AB9nibMgTcgaMWsmszl9OPv+Ur+An//EUf1OnHum7hYzHJdm+1Dp3iAJD+EENGuVKAXbRIjs7RKDqtBFN86oQyfk9e/EFyiUgHbn7tEnT7X8Tc2Aqq1L5AlKYzNTLyfvMB8SReqJSI5QBZX48WVrMJ3SUMWCLVVlRh3ht0Od/WVUYdVjpyL3wHa8ih4pWYlpktT6PZR/M+LwyzqxWXX6oq1QQMpIbZbUNdkofwvSeq51iI1UswKFMdETnxsfdW5OErHfbXXxXBOCk9tcZaYVlzQ4jnDrNT/N7Fj+B1PIuTPMbcJRzymWyerEa6aDvzR16PyOcZ0oILIIUnzvrAngyeVQUsMt+j7FVqZXt+GlyPWW1E+HDKXl/N7V1mu8IBnfKhWfp1xHNJ2dioY7H9woDSV2f9DRBa+13IKEziO3kn8EaZgTBXs6izkSRKycK8ltskavtmcps1aq5nPMO2MklCCd4MqlIzmBIG40dkzoJKFBLEqQ/uHg+9Q4pxzqmnmoW8RJ2AUK9AgJXRp92two3diK4o6T/REoUZtVXF9SgEyNhJw/e6pvjBslZkKnk2Gu8uI0DXDUTcXXJAe+6xSotiGT3NrUTqeQFYeXvQo2wyrxm2aTCAG2vIY08SAoxe61K9dlMbGiQ0iGsqgFK/5CSPqoyv5zSnDBzfQTuOcJTk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00fcc653-7ada-4c33-d2b3-08dadd754d41 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 01:48:30.4511 (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: yB2I66fJDCSmH5vaBRR1b/7ihUU4+G1eLq26KkpCgsja6dDaNtaxO3h/2nMUJfmKJzFngGl7IBHE52nuzaDB83eJGc05CSV8f/SIGUBWLhmoclOV7IdQpPwnZoTyhFfg X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB5626 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Kuninori Morimoto ALSA SoC has many type of Generic Audio Card driver (Simple Audio Card, Audio Graph Card, Audio Graph Card2), and Renesas/Kuninori Morimoto want to test these. Generic Audio Card driver had been requested on ALSA SoC. It has many type of device connection method, and historically, requested connection support range of generic driver have been upgraded. Upgrading connection support range itself was possible on generic driver, but could not implemented, because we need to keep compatibility on Device-Tree. This is one of the reason why we have many type of Generic Audio Card driver. ULCB/KF is good board to test these. Kuninori has been testing these Generic Audio Card driver by using his local patch to switching drivers. But it is good idea to upstream these from information sharing point of view, because DT setting is complex. It can be good sample for user. This patch is one of them. From normal user point of view who don't need to test the driver, it should keep as-is, nothing changed. This patch adds "Simle Audio Card" DT setting file for ULCB/KF. We can switch to use it if ulcb.dtsi / ulcb-kf.dtsi were updated. Because it needs "switching driver", not "add extra feature", it doesn't use Device-Tree overlay. Signed-off-by: Kuninori Morimoto --- .../renesas/ulcb-kf-simple-audio-card.dtsi | 85 ++++++++++++++++++ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 1 + .../dts/renesas/ulcb-simple-audio-card.dtsi | 89 +++++++++++++++++++ arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + 4 files changed, 176 insertions(+) create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card.dtsi create mode 100644 arch/arm64/boot/dts/renesas/ulcb-simple-audio-card.dtsi diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card.dtsi new file mode 100644 index 000000000000..8949145d447d --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card.dtsi @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Kingfisher + Simple Audio Card + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * (A) CPU0 ------ ak4613 + * (B) CPU1 ------ HDMI + * (C) CPU2 ------ PCM3168A-p + * (D) CPU3 ------ PCM3168A-c + * + * (A) aplay -D plughw:0,0 xxx.wav + * (B) aplay -D plughw:0,1 xxx.wav + * (C) aplay -D plughw:0,2 xxx.wav + * + * (A) arecord -D plughw:0,0 xxx.wav + * (D) arecord -D plughw:0,3 xxx.wav + */ + +&sound_card { + /* dai-link@0/1 are defined in ulcb.dtsi */ + + /* + * (C) CPU2 <-> PCM3168A-p + */ + simple-audio-card,dai-link@2 { + reg = <2>; + cpu { + bitclock-master; + frame-master; + dai-tdm-slot-num = <8>; + sound-dai = <&rcar_sound 2>; + }; + codec { + mclk-fs = <512>; + sound-dai = <&pcm3168a 0>; + }; + }; + /* + * (D) CPU3 <-> PCM3168A-c + */ + simple-audio-card,dai-link@3 { + reg = <3>; + cpu { + bitclock-master; + frame-master; + dai-tdm-slot-num = <6>; + sound-dai = <&rcar_sound 3>; + }; + codec { + mclk-fs = <512>; + sound-dai = <&pcm3168a 1>; + }; + }; +}; + +&pcm3168a { + /* + * (C) CPU2 <-> PCM3168A-p + * (D) CPU3 <-> PCM3168A-c + */ + #sound-dai-cells = <1>; +}; + +&rcar_sound { + + /* dai0-1 are defined in ulcb.dtsi */ + + rcar_sound,dai { + /* + * (C) CPU2 <-> PCM3168A-p + */ + dai2 { + playback = <&ssi3>; + }; + /* + * (D) CPU3 <-> PCM3168A-c + */ + dai3 { + capture = <&ssi4>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi index b5877120ab46..6913d778a40b 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -453,6 +453,7 @@ &xhci0 { * We can switch Audio Card for testing * see also ulcb.dtsi * + * #include "ulcb-kf-simple-audio-card.dtsi" * #include "ulcb-kf-audio-graph-card.dtsi" */ #include "ulcb-kf-audio-graph-card2.dtsi" diff --git a/arch/arm64/boot/dts/renesas/ulcb-simple-audio-card.dtsi b/arch/arm64/boot/dts/renesas/ulcb-simple-audio-card.dtsi new file mode 100644 index 000000000000..ae1ea872fd11 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-simple-audio-card.dtsi @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Simple Audio Card + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * (A) CPU0 ------ ak4613 + * (B) CPU1 ------ HDMI + * + * (A) aplay -D plughw:0,0 xxx.wav + * (B) aplay -D plughw:0,1 xxx.wav + * + * (A) arecord -D plughw:0,0 xxx.wav + */ + +/ { + sound_card: sound { + compatible = "simple-audio-card"; + label = "rcar-sound"; + + #address-cells = <1>; + #size-cells = <0>; + + /* + * (A) CPU0 <-> ak4613 + */ + simple-audio-card,dai-link@0 { + reg = <0>; + cpu { + bitclock-master; + frame-master; + sound-dai = <&rcar_sound 0>; + }; + codec { + sound-dai = <&ak4613>; + }; + }; + /* + * (B) CPU1 <-> HDMI + */ + simple-audio-card,dai-link@1 { + reg = <1>; + cpu { + bitclock-master; + frame-master; + sound-dai = <&rcar_sound 1>; + }; + codec { + sound-dai = <&hdmi0>; + }; + }; + }; +}; + +&ak4613 { + /* + * (A) CPU0 <-> ak4613 + */ + #sound-dai-cells = <0>; +}; + +&hdmi0 { + /* + * (B) CPU1 <-> HDMI + */ + #sound-dai-cells = <0>; +}; + +&rcar_sound { + #sound-dai-cells = <1>; + + rcar_sound,dai { + /* + * (A) CPU0 <-> ak4613 + */ + dai0 { + playback = <&ssi0 &src0 &dvc0>; + capture = <&ssi1 &src1 &dvc1>; + }; + /* + * (B) CPU1 <-> HDMI + */ + dai1 { + playback = <&ssi2>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index 6196494452c9..497d07df6944 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -501,6 +501,7 @@ &usb2_phy1 { * * We can switch Audio Card for testing * + * #include "ulcb-simple-audio-card.dtsi" * #include "ulcb-audio-graph-card.dtsi" */ #include "ulcb-audio-graph-card2.dtsi" From patchwork Wed Dec 14 01:48:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13072688 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BA75C10F1B for ; Wed, 14 Dec 2022 01:48:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236970AbiLNBss (ORCPT ); Tue, 13 Dec 2022 20:48:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237033AbiLNBsk (ORCPT ); Tue, 13 Dec 2022 20:48:40 -0500 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2103.outbound.protection.outlook.com [40.107.113.103]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB00F23EB3 for ; Tue, 13 Dec 2022 17:48:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cesLzRm23a4sKAEQqXyfLQiquOAwYEvV2pIDpDlo4fC3LCaPx4rC02oJpehFl0EvWir8eOiAg49juA39Cy7ONiW4Ay55cXAbT0seZvcMYtGVgLngjHDf7dBf0RSELCH+hqNO6fAzrwXw0SGlx8JhAHQ6tJa/bA2tMo46JDK2+tjgG+yNv8zDSZYgoC60DgtsZoAyuEFpEtIh9jCgxn9WF57a+UM5zlvksbC2Y/6DlhFB64QCkl/ZDsBJyRdkZqjA+wkKH2aXuoxzVzxMhEewypE4wKGyEp1nPGt6C+9ZcqYfFCbdi/qSkpw26V8rPXmZh2wffVS3PeFTo592DNfiRg== 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=ExFXat3RYR2oBc0NQ6tVBCmdrAdfzF8v0Rf8xaRDwIg=; b=DYs/YqzfymJpPXgMSfgSkGrkYsFgw4T6SDX4t1i8m/z3zA7loyEwMYwru1jQt5fTE8rmyc3nSHVfwEwrbky4FxVEN+EhahfOwY37Y6dxERP90004bAgQRShansY9sYdFda1hUJM8tYoK1Nq3W+zekbOkde2HNG3NFbZzqpNREyDaEHQbxg2wkDSfY3HzgDY4dsKBfCHPpm/HK3S8H/6u9sHCw1nVquOcB9Qn726URAS47htyjMYLi4sSKGn9VU5unH9CNsRgUWNfCLde9LdXY5agyv0NKq8sC2XAeiibpEt6l1qkLpu21f1Y45WPGUh1YyYRcTZYpimtBoLasBge1Q== 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=ExFXat3RYR2oBc0NQ6tVBCmdrAdfzF8v0Rf8xaRDwIg=; b=VzvAMOLlm8ANYRhBrBUhyqVZ/qB/VF4W4hSOFB7sYrxh8WZf2dONP9cIjU7TQpdcuYrqUE4dF+0mFxuZhfxzWlvGNXat2YdYWvYTuvifv2LGqFHGdnwTfGqRhMEde6JhHOFEZLjeNqMtphqxc0Y2ecpUpMEmPqyylotgE+mhlLI= 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 OSZPR01MB7819.jpnprd01.prod.outlook.com (2603:1096:604:1b7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 01:48:36 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431%8]) with mapi id 15.20.5924.011; Wed, 14 Dec 2022 01:48:36 +0000 Message-ID: <875yeepxfw.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 6/8] arm64: dts: renesas: add ulcb{-kf} Audio Graph Card2 dtsi MIX + TDM Split dtsi User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Geert Uytterhoeven Cc: Linux-Renesas In-Reply-To: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> References: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 14 Dec 2022 01:48:36 +0000 X-ClientProxiedBy: TYWPR01CA0041.jpnprd01.prod.outlook.com (2603:1096:400:17f::16) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSZPR01MB7819:EE_ X-MS-Office365-Filtering-Correlation-Id: 74802998-70c2-4bed-2816-08dadd7550bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5qdivCElmi0iM6g2ghfJiz89cD4T0Uw2bMn/gdPCvO3vKYtAn5A44bKR/YovwI90wrPeLN7dAhuBXEeUzy4/DIToxiix7B0WnwTiZ7N4t6oWVqcqT7reGQKMKn/CibMgsc72O69OatA/bMfTPSJ6MCBzTK3Spw8i4nXI+5+spxevrwIlgKc/KwN/WmVXSVWi9xroDmDquUeCdzALZ4qH9/9OSYNVEFUjXGYUocCOefKA2g5+1tt/NaP388dy52HYYOhr85act28BlF2nhvjXPLDUS9caPmqlukc1UG1QdoWeAoAb3PG0PMUtqStUiJagXnLHVevNzrGeSup5r3hP1cOFH/vnVKUQfpUlA1zEw24HtoR0GbnMEeo7NpBVo80jR4kC5KHYi1nZyF2OD5kH6W6QY/Cs5NqUgIIQqGgGALK7DKnqbJuTe7BTlT9If3GexoHQndJ9E9VwBY06KOKxG4UwsdGZQ76Oyb09skL+CTCvkW+hurPEt4mEbePokRZWQMWkjo65gCnq1pr20uRWNQ8GInCdpjod5hVrHf4qOv/jJkfXKQ4VZnGgDr434f+eW6D7Byf+4GYR1TNxsqKC0wYhX16OEqTel6Xl4ucz4oSfSMNzHwXQxBsCQr/0DBWRfFz5S4faYzveX+PMmfSpcKHD5NiU5czlz3TXav5/vKcUE4+VwY8AfZ260fns0CMF/jfhovMPsieU7yI+X/iHt6QIMyZXQHqUZiekzh1EOjc= 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:(13230022)(4636009)(136003)(366004)(376002)(346002)(396003)(39860400002)(451199015)(83380400001)(38100700002)(36756003)(8676002)(41300700001)(66556008)(38350700002)(4326008)(66476007)(66946007)(86362001)(5660300002)(6916009)(478600001)(6486002)(8936002)(316002)(6512007)(6506007)(26005)(186003)(52116002)(2906002)(2616005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lZlqk8IFMg79EvlD9Gn27vHz9H5CH7Fd50Umm8bxdiWw+Zm8UbnE6nlfahIEhOMSVemd+rKdD853tUbSgb0+bRmUU1hv153YTNNu66FDDzFJZCYZZoEgp8kdpWefD1vloRAT+7jM9LvotSXQIl6mB6DPiBhASCIYftBezqO7TxFNzc+yscYkm4jDOhGiJUNDY29403psIlkx5MugCEcwoAB/zYhiA5sPW1cZ5EuKpcw1L1hoZh/+i/wRevbtfFghUv39oxaGqZfhV6yjo43N5/XtKaXNL89E4rmWjzeCulW3Ww7Ok5YcU7+xc6nOUoi6sy2EuvJyBO6Zg0EWGeF2QqKQptfnyyb3pNJkMpCpQHekdkAv5QwXTBvgsgnX9zeNvKbKhgVWcN3hsEJ38NRJeQ318iPOddB3eS3/HEmkuXaXJEFM+Je4zJfWG7W+xx/t/LFrXAIsoUmmgItyrQC6DmsLvuxA5E6690c6spZ6srDKTz+Wq0EckKxve0a49K7gKFJzRHPrR85SG9dS41hEmFrWUES1hLc3GhSA15XWiLDPk1+Myu47QbOO+tAweYKdKR5HR670k9C2P9IMeciBRFZuWrFyGQHnNlcUFFJFpecsapmlDTpo5GODmVfCO7r4ufD7VgZZ9UzwWzqks0HIQIUzGUrYcXjZiOD7xqzkSvHExwv1XO6vd09qiLWgJoFexlyXn+xgKcuIzNi2c6193rfldVDvuitAbOc+aFoMjFToPRsghtsRbEBC3E8UEY2eb67zIrB3GcYHKaoI5J59q3u+FOWB4LTlX3CQVEjsHQ9H8n9Pr/aMfhYUVbGFKOt4NooEFGxRPMf+9gbna/VqM2vPhu/s6mv4Ed4mXruKIXhiJxQeYglTV0SVg3s7lpv0xrEi4C8t2UtXyELQsQrRLbNJq1lDAPQGstyHM2bWEwOiYMXB7UjDE6m1tbx4GCvNn5tag0sLMEwBPmDM3ApEJfwkqF6qOowDepbROM4vOFfJyYnXflb+jtfx8peDJrq08nZthdqmgjU43qeUcsw2g23gEf1DPwAfX8A3Ptkz/Fc9L6UW8xWmG4owy7b6OI+exnA3VPzgqUXIKylwncPeymn2g/+YBYNUazdmMbWJnkkpgUgJvmziwdvLu4tYJX4AtKO/I80V0aAkd7Kmxsa23QGu6jPps0/U4yGFbBas+CpVVzGNyjDf/BQvCUBq80Z0SPXtrBerqJQ9nl1JOCRdf9JI988FD4CORt9qkhZ5VRXE/86wxCpqP+hHCmsU2XTruuOf81JakYB6+s1ZeHRqhUpfP0CMFqPnHQFiIhr5//ca/5gVw51OPSGIbQyeIxxp4aLXD67HDjRA4Uyx650RspJHvMOvWHmvbcF4B2G+SewX4gcx42+A6M2WYJ2pJja8RQTFm8Pg0LM8OQn+5P7YrB2eyocObNUrfP62P3yY8jBlIr//HzP5R7qsrsCOPJj5M4hcwcJTlG2UDs4beInluK2nfnYdKBbsuQSrUPLaJ1i9C7bJu4l2NcsKW1+R9s3iI51SrqnC47cMJPv+6eM489fvMCIsbVMd43djHfU4rlL9b4IL4tAQivnKoQkzA2A/5gz8spLfKydHOc3vWZ6ngzWdlja+qZfjSQxHzeS38b0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74802998-70c2-4bed-2816-08dadd7550bf X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 01:48:36.2950 (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: RBHzGMaS37qTujYivCi/peUMVmlekY8IEZpica/CdpGgOlBXt3iyUh7FFoSjp3LsKsYI+FNoueAf0kaOWCMwjs5TyOPp7YpKZZ73hs9R0QlI+WSC/zpt91UbuaJoYqsw X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB7819 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Kuninori Morimoto ALSA SoC has many type of Generic Audio Card driver (Simple Audio Card, Audio Graph Card, Audio Graph Card2), and Renesas/Kuninori Morimoto want to test these. Generic Audio Card driver had been requested on ALSA SoC. It has many type of device connection method, and historically, requested connection support range of generic driver have been upgraded. Upgrading connection support range itself was possible on generic driver, but could not implemented, because we need to keep compatibility on Device-Tree. This is one of the reason why we have many type of Generic Audio Card driver. ULCB/KF is good board to test these. Kuninori has been testing these Generic Audio Card driver by using his local patch to switching drivers. But it is good idea to upstream these from information sharing point of view, because DT setting is complex. It can be good sample for user. This patch is one of them. From normal user point of view who don't need to test the driver, it should keep as-is, nothing changed. This patch adds "Audio Graph Card2 + MIXer + TDM Split" DT setting file for ULCB/KF. Because it reach to subdevice maximum, it ignore HDMI. We can switch to use it if ulcb.dtsi / ulcb-kf.dtsi were updated. Because it needs "switching driver", not "add extra feature", it doesn't use Device-Tree overlay. Signed-off-by: Kuninori Morimoto --- .../ulcb-audio-graph-card2-mix+split.dtsi | 111 +++++++++++ .../ulcb-kf-audio-graph-card2-mix+split.dtsi | 177 ++++++++++++++++++ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 1 + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + 4 files changed, 290 insertions(+) create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2-mix+split.dtsi diff --git a/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi new file mode 100644 index 000000000000..af84b03c2a94 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Audio Graph Card2 (MIX + TDM Split) + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * Note: + * Because there is subdevice maximum, it will ignore HDMI output + * + * (A) CPU0 (2ch) ------ (2ch) (X) ak4613 (MIX-0) + * (B) CPU1 (2ch) --/ (MIX-1) + * + * (A) aplay -D plughw:0,0 xxx.wav + * (B) aplay -D plughw:0,1 xxx.wav + * + * (A) arecord -D plughw:0,0 xxx.wav + */ +/ { + sound_card: sound { + compatible = "audio-graph-card2"; + label = "rcar-sound"; + + routing = "ak4613 Playback", "DAI0 Playback", + "ak4613 Playback", "DAI1 Playback", + "DAI0 Capture", "ak4613 Capture"; + + /delete-property/ dais; + links = <&fe_a /* (A) CPU0 */ + &fe_b /* (B) CPU1 */ + &be_x /* (X) ak4613 */ + >; + + dpcm { + #address-cells = <1>; + #size-cells = <0>; + + ports@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + /* + * FE + * (A) CPU0 (MIX-0) + * (B) CPU1 (MIX-1) + */ + fe_a: port@0 { reg = <0>; fe_a_ep: endpoint { remote-endpoint = <&rsnd_a_ep>; }; }; + fe_b: port@1 { reg = <1>; fe_b_ep: endpoint { remote-endpoint = <&rsnd_b_ep>; }; }; + }; + + ports@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + /* + * BE + * (X) ak4613 + */ + be_x: port@0 { reg = <0>; be_x_ep: endpoint { remote-endpoint = <&ak4613_x_ep>; }; }; + }; + }; + }; +}; + +&ak4613 { + port { + /* + * (X) ak4613 + */ + prefix = "ak4613"; + convert-rate = <48000>; + + ak4613_x_ep: endpoint { + remote-endpoint = <&be_x_ep>; + }; + }; +}; + +&rcar_sound { + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* + * (A) CPU0 (MIX-0) + */ + port@0 { + reg = <0>; + rsnd_a_ep: endpoint { + remote-endpoint = <&fe_a_ep>; + bitclock-master; + frame-master; + playback = <&src1 &ctu02 &mix0 &dvc0 &ssi0>; + capture = <&ssi1 &src0 &dvc1>; + }; + }; + /* + * (B) CPU1 (MIX-1) + */ + port@1 { + reg = <1>; + rsnd_b_ep: endpoint { + remote-endpoint = <&fe_b_ep>; + bitclock-master; + frame-master; + playback = <&src2 &ctu03 &mix0 &dvc0 &ssi0>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2-mix+split.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2-mix+split.dtsi new file mode 100644 index 000000000000..505ed1e3d2bb --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2-mix+split.dtsi @@ -0,0 +1,177 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Kingfisher + Audio Graph Card2 (MIX + TDM Split) + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * Because it reach to subdevice maximum, it ignore HDMI + * + * (A) CPU0 (2ch) ------ (2ch) (X) ak4613 (MIX-0) + * (B) CPU1 (2ch) --/ (MIX-1) + * (C) CPU3 (2ch) ------ (8ch) (Y) PCM3168A-p (TDM-0 : 0,1ch) + * (D) CPU2 (2ch) --/ (TDM-1 : 2,3ch) + * (E) CPU4 (2ch) --/ (TDM-2 : 4,5ch) + * (F) CPU5 (2ch) --/ (TDM-3 : 6,7ch) + * (G) CPU6 (6ch) ------ (6ch) (Z) PCM3168A-c + * + * (A) aplay -D plughw:0,0 xxx.wav (MIX-0) + * (B) aplay -D plughw:0,1 xxx.wav (MIX-1) + * (C) aplay -D plughw:0,2 xxx.wav (TDM-0) + * (D) aplay -D plughw:0,3 xxx.wav (TDM-1) + * (E) aplay -D plughw:0,4 xxx.wav (TDM-2) + * (F) aplay -D plughw:0,5 xxx.wav (TDM-3) + * + * (A) arecord -D plughw:0,0 xxx.wav + * (G) arecord -D plughw:0,6 xxx.wav + */ +&sound_card { + routing = "ak4613 Playback", "DAI0 Playback", + "ak4613 Playback", "DAI1 Playback", + "DAI0 Capture", "ak4613 Capture", + "pcm3168a Playback", "DAI2 Playback", + "pcm3168a Playback", "DAI3 Playback", + "pcm3168a Playback", "DAI4 Playback", + "pcm3168a Playback", "DAI5 Playback", + "DAI6 Capture", "pcm3168a Capture"; + + /delete-property/ dais; + links = <&fe_a /* (A) CPU0 */ + &fe_b /* (B) CPU1 */ + &fe_c /* (C) CPU2 */ + &fe_d /* (D) CPU3 */ + &fe_e /* (E) CPU4 */ + &fe_f /* (F) CPU5 */ + &rsnd_g /* (G) CPU6 - PCM3168A-c */ + &be_x /* (X) ak4613 */ + &be_y /* (Y) PCM3168A-p */ + >; + + dpcm { + ports@0 { + /* + * FE + * + * (A)/(B) are defined on ulcb + * (C) CPU2 + * (D) CPU3 + * (E) CPU4 + * (F) CPU5 + */ + fe_c: port@2 { reg = <2>; fe_c_ep: endpoint { remote-endpoint = <&rsnd_c_ep>; }; }; + fe_d: port@3 { reg = <3>; fe_d_ep: endpoint { remote-endpoint = <&rsnd_d_ep>; }; }; + fe_e: port@4 { reg = <4>; fe_e_ep: endpoint { remote-endpoint = <&rsnd_e_ep>; }; }; + fe_f: port@5 { reg = <5>; fe_f_ep: endpoint { remote-endpoint = <&rsnd_f_ep>; }; }; + }; + + ports@1 { + /* + * BE + * + * (X) is defined on ulcb + * (Y) PCM3168A-p + */ + be_y: port@1 { reg = <1>; be_y_ep: endpoint { remote-endpoint = <&pcm3168a_y_ep>; }; }; + }; + }; +}; + +&pcm3168a { + ports { + #address-cells = <1>; + #size-cells = <0>; + + mclk-fs = <512>; + prefix = "pcm3168a"; + + /* + * (Y) pcm3168a-p + */ + port@0 { + reg = <0>; + convert-channels = <8>; /* to 8ch TDM */ + pcm3168a_y_ep: endpoint { + remote-endpoint = <&be_y_ep>; + clocks = <&clksndsel>; + }; + }; + /* + * (Z) pcm3168a-c + */ + port@1 { + reg = <1>; + pcm3168a_z_ep: endpoint { + remote-endpoint = <&rsnd_g_ep>; + clocks = <&clksndsel>; + }; + }; + }; +}; + +&rcar_sound { + ports { + /* (A)/(B) are defined in ulcb.dtsi */ + + /* + * (C) CPU2 + */ + port@2 { + reg = <2>; + rsnd_c_ep: endpoint { + remote-endpoint = <&fe_c_ep>; + bitclock-master; + frame-master; + playback = <&ssiu30 &ssi3>; + }; + }; + /* + * (D) CPU3 + */ + port@3 { + reg = <3>; + rsnd_d_ep: endpoint { + remote-endpoint = <&fe_d_ep>; + bitclock-master; + frame-master; + playback = <&ssiu31 &ssi3>; + }; + }; + /* + * (E) CPU4 + */ + port@4 { + reg = <4>; + rsnd_e_ep: endpoint { + remote-endpoint = <&fe_e_ep>; + bitclock-master; + frame-master; + playback = <&ssiu32 &ssi3>; + }; + }; + /* + * (F) CPU5 + */ + port@5 { + reg = <5>; + rsnd_f_ep: endpoint { + remote-endpoint = <&fe_f_ep>; + bitclock-master; + frame-master; + playback = <&ssiu33 &ssi3>; + }; + }; + /* + * (G) CPU6 + */ + rsnd_g: port@6 { + reg = <6>; + rsnd_g_ep: endpoint { + remote-endpoint = <&pcm3168a_z_ep>; + bitclock-master; + frame-master; + playback = <&ssi4>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi index 6913d778a40b..0690c1b1b5e9 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -455,5 +455,6 @@ &xhci0 { * * #include "ulcb-kf-simple-audio-card.dtsi" * #include "ulcb-kf-audio-graph-card.dtsi" + * #include "ulcb-kf-audio-graph-card2-mix+split.dtsi" */ #include "ulcb-kf-audio-graph-card2.dtsi" diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index 497d07df6944..b357267a9083 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -503,5 +503,6 @@ &usb2_phy1 { * * #include "ulcb-simple-audio-card.dtsi" * #include "ulcb-audio-graph-card.dtsi" + * #include "ulcb-audio-graph-card2-mix+split.dtsi" */ #include "ulcb-audio-graph-card2.dtsi" From patchwork Wed Dec 14 01:48:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13072689 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17125C4332F for ; Wed, 14 Dec 2022 01:49:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236969AbiLNBtB (ORCPT ); Tue, 13 Dec 2022 20:49:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237055AbiLNBsr (ORCPT ); Tue, 13 Dec 2022 20:48:47 -0500 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2104.outbound.protection.outlook.com [40.107.113.104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08659275F0 for ; Tue, 13 Dec 2022 17:48:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PAzWSEJyQmN9cv1J/wkfRJ4jZS1j8ejxfGSr8K1JjUcgDPmyfEBDcz8JRDeFKbmSkjUjJIoINjluJRSq2tHKhFSk7xc1nWqGp2nbdzW/SjlppDNAEniVavE1Px/lYQFiAPyKKVVVLTdXPYO/D3i2NdVPNv8X7DLhATCqv3JmaPyJri0n4uHsrclN7+Td2O6ARcrHofeh/h9TvQSXoQnNbeDGpnm9MA5A03IwGQhT++x1LkWVOOKyQsMC2Eybs39uAlOJ4SqRg1Je/v73Q5uhppi8UlIqT50KP8oFLHkmPcrl6zt+kzW9rdWherBW+zKCGeGyBCzPnA6fE+pXISMmZg== 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=+fijaRE9GG/7PPvXlw2SVWU9PzhGU5xzxKOME07rGgo=; b=TAQY8qi3irdd5jtP1nw8t48C7z0sPuOcKvpnmqh0LsMl8RisgK25X555HjVIK6WZAs/32rVjMF8B2Th/BMVDeo+B0cSw1tCLWI0lJvADceqadqw+CSWvjZV2f4Wc9NSmpFhPBAQ/V7CbRoyDUZgRpYpfDB+TdKta5zJ9R8g6cW5eX1EVwast2IkM8mqM6mlKCEa6IFb7kBxsNthK0e9Wvw0NNZBThKEp3gl777nBnKQ4KZIZnKnF3iICuriyjdUZq06EWaNz9ZtVRULAEXVn2OCQjoWKWZKHEldLXkXlMYo6vYeeug4qWEavwqQJPb1NRTyP9DXWvHvxsir7aPpwLQ== 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=+fijaRE9GG/7PPvXlw2SVWU9PzhGU5xzxKOME07rGgo=; b=cB2Xjn7VUrdmI6YBFQ2zhXOtzgwXBLgL2f/R6eJC01fS5WAGkjiPuoyBQaAtXfMLYdtdMEhh45Mn/WQutJ9+R06wOyb2VTJumnzN3/J4vQG1IW2tHbscxNCrUz8XqWa9hYoXgQ6YtOLFzgQIXEeAF0ZrF3OQYY+qyQ1aEMVYouA= 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 OSZPR01MB7819.jpnprd01.prod.outlook.com (2603:1096:604:1b7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 01:48:42 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431%8]) with mapi id 15.20.5924.011; Wed, 14 Dec 2022 01:48:42 +0000 Message-ID: <874jtypxfp.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 7/8] arm64: dts: renesas: add ulcb{-kf} Audio Graph Card dtsi MIX + TDM Split dtsi User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Geert Uytterhoeven Cc: Linux-Renesas In-Reply-To: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> References: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 14 Dec 2022 01:48:42 +0000 X-ClientProxiedBy: TYCP286CA0144.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::8) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSZPR01MB7819:EE_ X-MS-Office365-Filtering-Correlation-Id: fa2951b7-b42f-4189-a3af-08dadd75548a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JyPdEhw5UqAgXUJRD5g7akJR8sqhDiAbyJRSD1+jPQoqF+iSTrml1+OogOBEGHJNdLzSxRBVnORfeYEjJVgQJYesV1fEoErboM25NAEDWzDjCDVfOKgEmrxyvupizEZLP1bkXhKknFifySoedkQjwV6MeOQqL2iMypuGUl4BB01PJED9zwRrCb0ktTD6YnWe06WhNhc1YxVExDUQ0aTEOLzAAYJk9EJgRzFCAK34m6YIs3/bYZH15rFq6JmByIQ0JdoMbBpHlH20i+9/ILFUxRvRAxWDHwZXtBT6ZJaSdVA1zm+QbwUv0YH6o82BJnDCnnmRD20medpAELMsvjAGANoDo7n87RUNRXn6UF4aBsNloerLmx9Q7RJvloxSlNcNht4Tut06peJJkE2YZdV5uD1Q+1m0zmy2mZKL+CH/vB+pRZaXnBZXdvMh6pWUHRkJPVHEY4dNQ439IYsuYXwuQSPukxsuIBO8VdNJ0qYLqO0wBT9PRijIqCDhxHiEFUnzfSJDJPyZ44OuX1x/f8QGIsGjYb7xSOZrwQx/UBBZZ7QXFdoGzlbRQvHbFjLDv35/S88IsnCrGQsk8M92T7ocICkAwARGjfgfqyOuck9NAhTuxGp48HIgyJtYkSTpxkOlXnhZ3AM5lQvoZ4nrlvfLQZUQjBUCPamnA9HL3Jpbiikks9q1m1n7buHoe5Nw0v08II5CiIVTh/iTfIRksrisZ8cbuIjZNukT0ltZ31Ln8Iw= 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:(13230022)(4636009)(136003)(366004)(376002)(346002)(396003)(39860400002)(451199015)(83380400001)(38100700002)(36756003)(8676002)(41300700001)(66556008)(38350700002)(4326008)(66476007)(66946007)(86362001)(5660300002)(6916009)(478600001)(6486002)(8936002)(316002)(6512007)(6506007)(26005)(186003)(52116002)(2906002)(2616005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0MhQbLDbfpC1tm+W8aJIZ2M171l0TdMOxC3PRvU9yHvQt+EyV8Ic3FhIFL63A8HYLjsgCfYtyG9stZT08VTr4cCAe+02QrNCO+UVgBUXySzbv3s3YL5CzBDn7YFjvkUC0JDfFqzlKY2CZewfC7BtHBXZlkiMNhYV223J3F3fZsaS19Mbnz4CZ0aeVMvsTUTw2r0LRjLRIXe7l/G4by2TO5JTv6MI5SKc4WkKeCyhaWCLVTxv5kAW7uoaNquMRIPR/DplAD3AZbvdWH7YYTCqrRw1WofhgeG0WNHNx1HgBrqeadTLdGI2/8zqTmELl4Xda6GH8bf8RAaJIShNzaKX9bgkvvEK2dM+D1OI6RRfUWpj+ywkD0NJfObFInhp+xBae9p+w6A8/OXkE8/vqo+5SME1qa/8WtGPXOc9FPvOaVuM3uK5OXihG7RJdKrDv4/2ntdkL6m/rWXmN0/u5wUej5JI9o4RJ/pvRgYQi346x9RInDiafu/P+5q/5BEYevqRb6n6R/c0OgO4XHajeBT0zmg2iz870uuoImW3ilsDsKLFrs0lNhaQ0bgQrNwxt+a9KUKkYoeWZ72DRKYFlRbLPREStmA0yJoTuwA9uq5zCwNVIcHEknxMuFvQgOhnTw7tGVWzw5UCRGA/W3tJgQwrmP0Bmzpovf0kQAYO5vR+jCiWMr/o87r7ia1/p5g+AlK4S/qGawvOqL1QcWvlDTDg9E71ApqihRNFz8Ke4PCNXhnj5w2MiH9s+OZecC/UmsPEBzwBfkVNCrc2RFZPuhPBr322KXe767iMHhnC3/cWqLe14nCYQPs1u5SclcZzjWiBl0U3f+l/UFOWqrvl9FROAFNPu0Z1fhUGSZP8WV3f3DIMZroZHsgVe9vcnU9FBHmr/Dd0hmBLkgdXCOXlPuR7cIcSGGSJfHzGNDTWkeCfj57RJQDoS0gKaJqxXaTv/WSOESWKP1/tNUnAH14Zkt9gYO40yQf70VSY/sDgCUvBGH5eQHufUOIz95nvQuNraucgTR4iBTKC5sSh4kEDbHrsl0artvXRH9IunI7DvLK0nFHa1sh5g5GgougWWpBz+/mz33ksZjPsCzsro35CpauxvBGxs5s2gIweuYKaf30PXrNEB+5Dinnmo5QW7nZn/ImJd69eL2PghGd0F5547xTzn21Zepzq5DuS818kiVGmXYZ9pNQp7K7qor4HNvUELvgQfmrJz2P9gzs9Py+Pct2F8UghelAaq1SMdhu6k6VuK2RYM+azpZmAWVeZAXCNGd1zBTiym9KQ61eInkvrH3lfC0C1UiRN+l8uy+p/Hitqv9hXkxi4aR209Csm8WNm4HqR+qMa58TFEidmrWIqyDZOzObK4z3PhZa5UCgoQV/c1q+fe48bmwrJM0iJAbfu8aEuED0xS0mC5HvwryMm3uIeIGToMke/Hjpyio9pcE7CMLTABAGXN/KDtsR5J+vqXtUhJTwxEzXyRKC1w0vtey8CzWmugL4NhXQ3ZkrvDeIWVHdb9CH4Y/IbcZDoR2ryfNv37yA8Tv6RedtFat3tFlRiu7OwqHczDozU5CdldPfrHeNVei6ouUNS0yKtw9AZ8pqoI01k0lGXDCGTALuIqFc5Hd8uzhjOrKU/Z2k88/j9xss= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa2951b7-b42f-4189-a3af-08dadd75548a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 01:48:42.7505 (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: tAH8cPu6pazM2Xse2cSCScsbvJbvnu1CoHgFHUwV/2FA5OkGogXpLSH1ypKQ0G0GdBATYlVCXfcKPISVOtHohuc/FPC6zlZTzfNhjQ4yPW/y8ihJGto29Ya09ZlmFHLZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB7819 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Kuninori Morimoto ALSA SoC has many type of Generic Audio Card driver (Simple Audio Card, Audio Graph Card, Audio Graph Card2), and Renesas/Kuninori Morimoto want to test these. Generic Audio Card driver had been requested on ALSA SoC. It has many type of device connection method, and historically, requested connection support range of generic driver have been upgraded. Upgrading connection support range itself was possible on generic driver, but could not implemented, because we need to keep compatibility on Device-Tree. This is one of the reason why we have many type of Generic Audio Card driver. ULCB/KF is good board to test these. Kuninori has been testing these Generic Audio Card driver by using his local patch to switching drivers. But it is good idea to upstream these from information sharing point of view, because DT setting is complex. It can be good sample for user. This patch is one of them. From normal user point of view who don't need to test the driver, it should keep as-is, nothing changed. This patch adds "Audio Graph Card + MIXer + TDM Split" DT setting file for ULCB/KF. Because it reach to subdevice maximum, it ignore HDMI. We can switch to use it if ulcb.dtsi / ulcb-kf.dtsi were updated. Because it needs "switching driver", not "add extra feature", it doesn't use Device-Tree overlay. Signed-off-by: Kuninori Morimoto --- .../ulcb-audio-graph-card-mix+split.dtsi | 89 ++++++++++ .../ulcb-kf-audio-graph-card-mix+split.dtsi | 162 ++++++++++++++++++ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 1 + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + 4 files changed, 253 insertions(+) create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card-mix+split.dtsi create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card-mix+split.dtsi diff --git a/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card-mix+split.dtsi b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card-mix+split.dtsi new file mode 100644 index 000000000000..55acfe6c1268 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card-mix+split.dtsi @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Audio Graph Card (MIX) + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * Note: + * Because there is subdevice maximum, it will ignore HDMI output + * + * (A) CPU0 (2ch) ------ (2ch) ak4613 (MIX-0) + * (B) CPU1 (2ch) --/ (MIX-1) + * + * (A) aplay -D plughw:0,0 xxx.wav + * (B) aplay -D plughw:0,1 xxx.wav + * + * (A) arecord -D plughw:0,0 xxx.wav + */ + +/ { + sound_card: sound { + compatible = "audio-graph-scu-card"; + label = "rcar-sound"; + + routing = "ak4613 Playback", "DAI0 Playback", + "ak4613 Playback", "DAI1 Playback", + "DAI0 Capture", "ak4613 Capture"; + + dais = <&rsnd_port0 /* (A) ak4613 (MIX-0) */ + &rsnd_port1 /* (B) ak4613 (MIX-1) */ + >; + }; +}; + +&ak4613 { + port { + #address-cells = <1>; + #size-cells = <0>; + + /* + * (A)/(B) ak4613 + */ + prefix = "ak4613"; + convert-rate = <48000>; + + ak4613_ep1: endpoint@0 { + reg = <0>; + remote-endpoint = <&rsnd_for_ak4613_1>; + }; + ak4613_ep2: endpoint@1 { + reg = <1>; + remote-endpoint = <&rsnd_for_ak4613_2>; + }; + }; +}; + +&rcar_sound { + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* + * (A) CPU0 + */ + rsnd_port0: port@0 { + reg = <0>; + rsnd_for_ak4613_1: endpoint { + remote-endpoint = <&ak4613_ep1>; + bitclock-master; + frame-master; + playback = <&src1 &ctu02 &mix0 &dvc0 &ssi0>; + capture = <&ssi1 &src0 &dvc1>; + }; + }; + /* + * (B) CPU1 + */ + rsnd_port1: port@1 { + reg = <1>; + rsnd_for_ak4613_2: endpoint { + remote-endpoint = <&ak4613_ep2>; + bitclock-master; + frame-master; + playback = <&src2 &ctu03 &mix0 &dvc0 &ssi0>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card-mix+split.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card-mix+split.dtsi new file mode 100644 index 000000000000..92cc06353746 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card-mix+split.dtsi @@ -0,0 +1,162 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Kingfisher + Audio Graph Card (MIX + TDM Split) + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * Because it reach to subdevice maximum, it ignore HDMI + * + * (A) CPU0 (2ch) ------ (2ch) ak4613 (MIX-0) + * (B) CPU1 (2ch) --/ (MIX-1) + * (C) CPU3 (2ch) ------ (8ch) PCM3168A-p (TDM-0 : 0,1ch) + * (D) CPU2 (2ch) --/ (TDM-1 : 2,3ch) + * (E) CPU4 (2ch) --/ (TDM-2 : 4,5ch) + * (F) CPU5 (2ch) --/ (TDM-3 : 6,7ch) + * (G) CPU6 (6ch) ------ (6ch) PCM3168A-c + * + * (A) aplay -D plughw:0,0 xxx.wav (MIX-0) + * (B) aplay -D plughw:0,1 xxx.wav (MIX-1) + * (C) aplay -D plughw:0,2 xxx.wav (TDM-0) + * (D) aplay -D plughw:0,3 xxx.wav (TDM-1) + * (E) aplay -D plughw:0,4 xxx.wav (TDM-2) + * (F) aplay -D plughw:0,5 xxx.wav (TDM-3) + * + * (A) arecord -D plughw:0,0 xxx.wav + * (G) arecord -D plughw:0,6 xxx.wav + */ + +&sound_card { + routing = "ak4613 Playback", "DAI0 Playback", + "ak4613 Playback", "DAI1 Playback", + "DAI0 Capture", "ak4613 Capture", + "pcm3168a Playback", "DAI2 Playback", + "pcm3168a Playback", "DAI3 Playback", + "pcm3168a Playback", "DAI4 Playback", + "pcm3168a Playback", "DAI5 Playback"; + + dais = <&rsnd_port0 /* (A) ak4613 (MIX-0) */ + &rsnd_port1 /* (B) ak4613 (MIX-1) */ + &rsnd_port2 /* (C) pcm3168a (TDM-0) */ + &rsnd_port3 /* (D) pcm3168a (TDM-1) */ + &rsnd_port4 /* (E) pcm3168a (TDM-2) */ + &rsnd_port5 /* (F) pcm3168a (TDM-3) */ + &rsnd_port6 /* (G) pcm3168a */ + >; +}; + +&pcm3168a { + ports { + #address-cells = <1>; + #size-cells = <0>; + mclk-fs = <512>; + + /* + * (C) CPU2 <-> pcm3168a (TDM-0) + * (D) CPU3 <-> pcm3168a (TDM-1) + * (E) CPU4 <-> pcm3168a (TDM-1) + * (F) CPU5 <-> pcm3168a (TDM-1) + */ + port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + prefix = "pcm3168a"; + convert-channels = <8>; /* to 8ch TDM */ + + pcm3168a_endpoint_p1: endpoint@0 { + reg = <0>; + remote-endpoint = <&rsnd_for_pcm3168a_play1>; + clocks = <&clksndsel>; + }; + pcm3168a_endpoint_p2: endpoint@1 { + reg = <1>; + remote-endpoint = <&rsnd_for_pcm3168a_play2>; + clocks = <&clksndsel>; + }; + pcm3168a_endpoint_p3: endpoint@2 { + reg = <2>; + remote-endpoint = <&rsnd_for_pcm3168a_play3>; + clocks = <&clksndsel>; + }; + pcm3168a_endpoint_p4: endpoint@3 { + reg = <3>; + remote-endpoint = <&rsnd_for_pcm3168a_play4>; + clocks = <&clksndsel>; + }; + }; + /* + * (G) CPU6 <-> pcm3168a + */ + port@1 { + reg = <1>; + pcm3168a_endpoint_c: endpoint { + remote-endpoint = <&rsnd_for_pcm3168a_capture>; + clocks = <&clksndsel>; + }; + }; + }; +}; + +&rcar_sound { + ports { + /* rsnd_port0-1 are defined in ulcb.dtsi */ + + /* + * (C) CPU2 <-> pcm3168a (TDM-0) + * (D) CPU3 <-> pcm3168a (TDM-1) + * (E) CPU4 <-> pcm3168a (TDM-1) + * (F) CPU5 <-> pcm3168a (TDM-1) + */ + rsnd_port2: port@2 { + reg = <2>; + rsnd_for_pcm3168a_play1: endpoint { + remote-endpoint = <&pcm3168a_endpoint_p1>; + bitclock-master; + frame-master; + playback = <&ssiu30 &ssi3>; + }; + }; + rsnd_port3: port@3 { + reg = <3>; + rsnd_for_pcm3168a_play2: endpoint { + remote-endpoint = <&pcm3168a_endpoint_p2>; + bitclock-master; + frame-master; + playback = <&ssiu31 &ssi3>; + }; + }; + rsnd_port4: port@4 { + reg = <4>; + rsnd_for_pcm3168a_play3: endpoint { + remote-endpoint = <&pcm3168a_endpoint_p3>; + bitclock-master; + frame-master; + playback = <&ssiu32 &ssi3>; + }; + }; + rsnd_port5: port@5 { + reg = <5>; + rsnd_for_pcm3168a_play4: endpoint { + remote-endpoint = <&pcm3168a_endpoint_p4>; + bitclock-master; + frame-master; + playback = <&ssiu33 &ssi3>; + }; + }; + /* + * (G) CPU6 <-> pcm3168a + */ + rsnd_port6: port@6 { + reg = <6>; + rsnd_for_pcm3168a_capture: endpoint { + remote-endpoint = <&pcm3168a_endpoint_c>; + bitclock-master; + frame-master; + dai-tdm-slot-num = <6>; + capture = <&ssi4>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi index 0690c1b1b5e9..131846dde002 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -455,6 +455,7 @@ &xhci0 { * * #include "ulcb-kf-simple-audio-card.dtsi" * #include "ulcb-kf-audio-graph-card.dtsi" + * #include "ulcb-kf-audio-graph-card-mix+split.dtsi" * #include "ulcb-kf-audio-graph-card2-mix+split.dtsi" */ #include "ulcb-kf-audio-graph-card2.dtsi" diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index b357267a9083..d8b0b07404ca 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -503,6 +503,7 @@ &usb2_phy1 { * * #include "ulcb-simple-audio-card.dtsi" * #include "ulcb-audio-graph-card.dtsi" + * #include "ulcb-audio-graph-card-mix+split.dtsi" * #include "ulcb-audio-graph-card2-mix+split.dtsi" */ #include "ulcb-audio-graph-card2.dtsi" From patchwork Wed Dec 14 01:48:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13072690 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8D25C10F1B for ; Wed, 14 Dec 2022 01:49:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236955AbiLNBtF (ORCPT ); Tue, 13 Dec 2022 20:49:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237018AbiLNBsz (ORCPT ); Tue, 13 Dec 2022 20:48:55 -0500 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2131.outbound.protection.outlook.com [40.107.113.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85A8B2250D for ; Tue, 13 Dec 2022 17:48:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MHNb7XbrAZTcx7b6c74OpVDmjEay99weF8BuHyrK+pUU2nC+T6+G3TRmKXxW5HXPT0yY0Gpuy0G0jgoHqaQND3iHZZhM9YLqdeRzqNgYqHzqmZ2STBfPayRHE3osmnGhXI5Sui8REC6ncTZ33qifHuOCAqYHTV7VDeubsRToCo9oxv+wQErYmYtrvdB4kNyaVrq5S1mrUfI0Rbk0hyWH2wxqZGVmh67DEW9b04HxBp5M4Rlz/PrSYtyBEGpDv54r05R5WHPEW8aO056xqSk/l/Jb2d44zNK7ZmEy2iT5zLwlEIKByOM4bOuv/2qECpEy+bqmntmVU6Hjj27ge4ZIRA== 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=/tTcxXYNVuTZbD3VbJ1LIGmxXNziZCqNMuESMyo7SZI=; b=P4utkrh+usUeaRNXKUMZRl+FAJiNzc9jSw88lRJQL5y7aq9IlK7UJXMRSC7itSoGzQjIJleLGcNjv1NMP3onKZ+mDE69UF8aZsh/9WvNGS3bO/KNKzNxVLgyiB5MYVGSA+vMOPLd00tKC8phYwRG4jBejJoTYF5AKiQGOwMbN/3bibh0gEyqk4TpLXbn++SL6XCMzR0pJow/m3XVSiq5FuTQ0R3SwS7aDtZJF25Hb4pf/U33OR5qKt/aWhACqubAnGK2eAbicQ0/xGWfvDt5EMi4s+8ZVnGpDUDkKqXBboBj1cilo+Ab7jKcMj3JhwPlWERuhTNEtdJIRA776rJp0g== 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=/tTcxXYNVuTZbD3VbJ1LIGmxXNziZCqNMuESMyo7SZI=; b=UhJb6PYmLLVfahg2RZteHkpWN5CcRt7WyJxSzlQDao07zV/Osx+Gx5Vyhn73G/vMz35WCjyZYztidKritmqDqK380XmTUfV7R0p04hB+LkEgvd+rcyabnLMCxg1/oTjhT/n9K3sMLQhRNJ1FLzWwT0KiHyQBu8BBqX797/KNUyA= 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 OSZPR01MB7819.jpnprd01.prod.outlook.com (2603:1096:604:1b7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 01:48:49 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::a5a6:2344:db9:431%8]) with mapi id 15.20.5924.011; Wed, 14 Dec 2022 01:48:49 +0000 Message-ID: <87359ipxfj.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 8/8] arm64: dts: renesas: add ulcb{-kf} Simple Audio Card MIX + TDM Split dtsi User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Geert Uytterhoeven Cc: Linux-Renesas In-Reply-To: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> References: <87edt2pxhd.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 14 Dec 2022 01:48:48 +0000 X-ClientProxiedBy: TYCPR01CA0113.jpnprd01.prod.outlook.com (2603:1096:405:4::29) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSZPR01MB7819:EE_ X-MS-Office365-Filtering-Correlation-Id: d00c148b-9f23-4a1f-6ecb-08dadd75585a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7c9sqzVpgFFCw82OXlyeRPsjep4w7Fv5JENnfyAEdzXuRD0LqK2dCYqya0qmf6zrI1PRH3jsjJkqiR3nzdrbNQBwltlIWqoQ6lCIznj213nDQBR1tPhZv/k4/lMlb+8MP4Fj8AsuUtOOUeCc4uDlrxNEBJ8lEds8/vfLCeAEv2ZPbYqvzD+v4UkfsAy9GnRiSXiLtBtazSsfuJE2QZEuJUPpeCa7w8sf8UoYJvKQRbwyRxS7izWC1JGvvt+Nkpb7iLEgA2v1XbAy+YqyOtcAt6eEgYncmFtXqoNx0QedhK2UAV76f9/NqolbHl7l56PxLJSaKhBH+/36iQ9xzw1VOhqyKgBeJT9MAuzJjCmm2RCFJEVIPjdF53jl/bf0FlWoT8eEp6TzW8frvRVZfgVNqoXg9f84e44K63asVLgeMDJSzLQwocPG1JWwJGsm6v29dEI4nc9y/6nv+uaBP4xce99OvAefWksJ+QZpIbtiOMTwtCXlVtHo9r9CXoL2KjadmFRMc0CPt1Nm+i+75iKjmIpANO9m6cqBVHHBhexvNCLtG1R1YDkkea7I0hYouvXd9KruPnxFOnVKIaiLNIQDN5yt9+SGd8bcxs2laK9R1cn7g1ZHYLKpjRh7ljAh4MRM+RajlCCfu3ru++EyQw85AgkeX0atjJlMpjfSGLpWXRq2otvnzPs2wG0p/IxJM5wBrCV9jH8PTKk10l+KD7yKVWkTyU7WEy4psFKHjcUFpFE= 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:(13230022)(4636009)(136003)(366004)(376002)(346002)(396003)(39860400002)(451199015)(83380400001)(38100700002)(36756003)(8676002)(41300700001)(66556008)(38350700002)(4326008)(66476007)(66946007)(86362001)(5660300002)(6916009)(478600001)(6486002)(8936002)(316002)(6512007)(6506007)(26005)(186003)(52116002)(2906002)(2616005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W0xxJxIulhaxV3HUXFMi6UHb04JD71u+sPVjjAVXziriy6XVibVl8Qp/Dvp5+CHbwh57DCI15kHRBvA1IqPP+UPe4cvxur8wuOP29HGQlLgdil9fFHircJHW3d8+6aId+5X0PSMhxqSqOmWwkEtLijRn32BZbmjaDrggvhFcGg4wlj1L3+yDyeTgvr0RtlxNFMsCLTG0vZsgsAsO0FRUkJ9ni4azIJsei5oUN/42+awzCfDWp1rl6LnooVGTQGPC4SO0VKNXsHaRJMA4DF/iBOUeYJESKdh2vUFxeWzvQSqwc3kUIcpKxKu1VoKCB4Eh29o8HNH8JQzAZBDmYGiLLe8MzSjrbX8ugnt9FyJKeinKLfUaPhGW5cHSB2LqqPFYQXkNsrgXHMW/0wv9hcY6ZCWSOvBxKcexZ6AIixnHH1pPM9LfRmnWtQWmVwuARsao/fAjKxjurORxFtERvDuBGnn/gn3hEEv7NektGaHwdIDpIoZzA5+GU6f8Ua3rZau+Mi7PF5SbAg//QuvgkH2A55Sieid488eoCEBAjMRq4CkZXZ588cTMJQiQ7knr+QI3zGtJPkCczuXEqv+RwKWxD83Q2ySiZr/2HKcEmWmTfn9JBcSHY3C+TmU3ZJeUm0PJ5CAZkUmRi2bfhETeW4X1ECCYXXu51W8HocHGaGMqnATlPLrvGDomn8dcADxgq6YfeIbmJgDNmHoApoo61zOpJqy1/9r+rlpQj2AfSbBA5eedwN7Go1K/Xi9VRQi1qvbddsOTvmjR/+kR86r9Z8cZUX9z/FAFkyv3hZxhjKUhJ4jPCvErFdpU64aNY5xp+h8lUXDmXVDkc2tS4MuFYEJDCN0RQlX1wXi4EbfUIuCB3drgr+nVRjDNEXZdG8y7L1/F6DYDDr4MMvsa1RIHOfJtprx5TFaaqEPtPmPs1qJlM/Jiy8B3xnhf5Wu+I2esOVM2MP5N8G1EfaeePomHaECAXyOe5tP05S9XYCvO/Mpaa63tx9zHZjIteeXM6AX2stQmNRtw7E+Vu13L8uiA/j51DNT/HbUzSozKANYc6Z9ZWZfK5JIC/iCP8+ytFUYMOzsVOf2MvWr7kS9auciG/yqVeoWhKUl7RsxXEmJdoAdDCvAtlHt7VsK4MVVgZ2WhJlCyZUpFbfC+0OoT0dHuwXjQX4AcTYWL3N47My6u6cg6W0EQONGrJXPbqlfkemG9LYpzzAHvcBlpcc2+LMQuxLSNF1NG73r/A3DTCJkSA4d/1BvL3PYGxq2Wujkv+ObIE09NONFWMK/+pex6bLkm1eGqBry9k7BCrqRnQ7XsZM3m0nLwLGloiWPE/fy7ktShrQGNBpHGmGXt9v/vRhPqwqSpRIBdGkT/ZW6OyQJK7R5R74aWXvRHHU24iA4t1qywvLc8R7KbEI5kCRE1ZsJcGaL7G03Rq0pIv3Q0cDNvR/NidrPoGlM253ihvDhbciJ4VYTZQkII6yl/3GeuHqb9aegDdI7MtH/JnyujxWzfuEWKFdDCEs7fMxxlVcELEZENlgJcnoFamglvnF/PlR7j+30DW/E9SWL8lL6uS8aHcdlE4mbPCWYuKl3G6b973u3iYxCMYSyQurQlxOp9RjbVDmKiDwKzBRurLNKueFmhFtL74i8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d00c148b-9f23-4a1f-6ecb-08dadd75585a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 01:48:49.5516 (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: OV5Ez7LUMhzrXPBjl1USll8x7RFUOagJzr2VtnN4WbXD/XCpB9HOyZpIbMzBmw3JpOMEAF3RZbrVqTxy51i2zVxrRk1zG9GfW7NwBiXYcYeWzvhMWCeA5tqCauqjV277 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB7819 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Kuninori Morimoto ALSA SoC has many type of Generic Audio Card driver (Simple Audio Card, Audio Graph Card, Audio Graph Card2), and Renesas/Kuninori Morimoto want to test these. Generic Audio Card driver had been requested on ALSA SoC. It has many type of device connection method, and historically, requested connection support range of generic driver have been upgraded. Upgrading connection support range itself was possible on generic driver, but could not implemented, because we need to keep compatibility on Device-Tree. This is one of the reason why we have many type of Generic Audio Card driver. ULCB/KF is good board to test these. Kuninori has been testing these Generic Audio Card driver by using his local patch to switching drivers. But it is good idea to upstream these from information sharing point of view, because DT setting is complex. It can be good sample for user. This patch is one of them. From normal user point of view who don't need to test the driver, it should keep as-is, nothing changed. This patch adds "Simle Audio Card + MIXer + TDM Split" DT setting file for ULCB/KF. Because it reach to subdevice maximum, it ignore HDMI. We can switch to use it if ulcb.dtsi / ulcb-kf.dtsi were updated. Because it needs "switching driver", not "add extra feature", it doesn't use Device-Tree overlay. Signed-off-by: Kuninori Morimoto --- .../ulcb-kf-simple-audio-card-mix+split.dtsi | 137 ++++++++++++++++++ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 1 + .../ulcb-simple-audio-card-mix+split.dtsi | 86 +++++++++++ arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 + 4 files changed, 226 insertions(+) create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card-mix+split.dtsi create mode 100644 arch/arm64/boot/dts/renesas/ulcb-simple-audio-card-mix+split.dtsi diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card-mix+split.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card-mix+split.dtsi new file mode 100644 index 000000000000..fba226fae0a4 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card-mix+split.dtsi @@ -0,0 +1,137 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Kingfisher + Simple Audio Card (MIX + TDM Split) + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * Note: + * Because there is subdevice maximum, it will ignore HDMI output + * + * (A) CPU0 ------ ak4613 (MIX-0) + * (B) CPU1 --/ (MIX-1) + * (C) CPU2 ------ PCM3168A-p (TDM-0 : 0,1ch) + * (D) CPU3 ------ PCM3168A-p (TDM-1 : 2,3ch) + * (E) CPU4 ------ PCM3168A-p (TDM-2 : 4,5ch) + * (F) CPU5 ------ PCM3168A-p (TDM-3 : 6,7ch) + * (G) CPU6 ------ PCM3168A-c + * + * (A) aplay -D plughw:0,0 xxx.wav (MIX-0) + * (B) aplay -D plughw:0,1 xxx.wav (MIX-1) + * (C) aplay -D plughw:0,2 xxx.wav (TDM-0) + * (D) aplay -D plughw:0,3 xxx.wav (TDM-1) + * (E) aplay -D plughw:0,4 xxx.wav (TDM-2) + * (F) aplay -D plughw:0,5 xxx.wav (TDM-3) + * + * (A) arecord -D plughw:0,0 xxx.wav + * (G) arecord -D plughw:0,6 xxx.wav + */ + +&sound_card { + + simple-audio-card,routing = "ak4613 Playback", "DAI0 Playback", + "ak4613 Playback", "DAI1 Playback", + "DAI0 Capture", "ak4613 Capture", + "pcm3168a Playback", "DAI2 Playback", + "pcm3168a Playback", "DAI3 Playback", + "pcm3168a Playback", "DAI4 Playback", + "pcm3168a Playback", "DAI5 Playback"; + + /* dai-link@0 is defined in ulcb.dtsi */ + + /* + * (C) CPU2 <-> PCM3168A-p (TDM-0 : 0,1ch) + * (D) CPU3 <-> PCM3168A-p (TDM-1 : 2,3ch) + * (E) CPU4 <-> PCM3168A-p (TDM-2 : 4,5ch) + * (F) CPU5 <-> PCM3168A-p (TDM-3 : 6,7ch) + */ + simple-audio-card,dai-link@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + convert-channels = <8>; /* to 8ch TDM */ + + cpu@0 { + reg = <0>; + bitclock-master; + frame-master; + sound-dai = <&rcar_sound 2>; + }; + cpu@1 { + reg = <1>; + sound-dai = <&rcar_sound 3>; + }; + cpu@2 { + reg = <2>; + sound-dai = <&rcar_sound 4>; + }; + cpu@3 { + reg = <3>; + sound-dai = <&rcar_sound 5>; + }; + codec { + prefix = "pcm3168a"; + mclk-fs = <512>; + sound-dai = <&pcm3168a 0>; + }; + }; + /* + * (G) CPU6 <-> PCM3168A-c + */ + simple-audio-card,dai-link@2 { + reg = <2>; + cpu { + bitclock-master; + frame-master; + sound-dai = <&rcar_sound 6>; + }; + codec { + prefix = "pcm3168a"; + mclk-fs = <512>; + sound-dai = <&pcm3168a 1>; + }; + }; +}; + +&pcm3168a { + /* + * (C) CPU2 <-> PCM3168A-p (TDM-0 : 0,1ch) + * (D) CPU3 <-> PCM3168A-p (TDM-1 : 2,3ch) + * (E) CPU4 <-> PCM3168A-p (TDM-2 : 4,5ch) + * (F) CPU5 <-> PCM3168A-p (TDM-3 : 6,7ch) + * (G) CPU6 <-> PCM3168A-c + */ + #sound-dai-cells = <1>; +}; + +&rcar_sound { + + /* dai0-1 are defined in ulcb.dtsi */ + + rcar_sound,dai { + /* + * (C) CPU2 <-> PCM3168A-p (TDM-0 : 0,1ch) + * (D) CPU3 <-> PCM3168A-p (TDM-1 : 2,3ch) + * (E) CPU4 <-> PCM3168A-p (TDM-2 : 4,5ch) + * (F) CPU5 <-> PCM3168A-p (TDM-3 : 6,7ch) + */ + dai2 { + playback = <&ssiu30 &ssi3>; + }; + dai3 { + playback = <&ssiu31 &ssi3>; + }; + dai4 { + playback = <&ssiu32 &ssi3>; + }; + dai5 { + playback = <&ssiu33 &ssi3>; + }; + /* + * (G) CPU6 <-> PCM3168A-c + */ + dai6 { + capture = <&ssi4>; + }; }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi index 131846dde002..ec115124035b 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -454,6 +454,7 @@ &xhci0 { * see also ulcb.dtsi * * #include "ulcb-kf-simple-audio-card.dtsi" + * #include "ulcb-kf-simple-audio-card-mix+split.dtsi" * #include "ulcb-kf-audio-graph-card.dtsi" * #include "ulcb-kf-audio-graph-card-mix+split.dtsi" * #include "ulcb-kf-audio-graph-card2-mix+split.dtsi" diff --git a/arch/arm64/boot/dts/renesas/ulcb-simple-audio-card-mix+split.dtsi b/arch/arm64/boot/dts/renesas/ulcb-simple-audio-card-mix+split.dtsi new file mode 100644 index 000000000000..37cd9a7ec1b2 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-simple-audio-card-mix+split.dtsi @@ -0,0 +1,86 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Simple Audio Card (MIXer) + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * Note: + * Because there is subdevice maximum, it will ignore HDMI output + * + * (A) CPU0 ------ ak4613 (MIX-0) + * (B) CPU1 --/ (MIX-1) + * + * (A) aplay -D plughw:0,0 xxx.wav + * (B) aplay -D plughw:0,1 xxx.wav + * + * (A) arecord -D plughw:0,0 xxx.wav + */ + +/ { + sound_card: sound { + #address-cells = <1>; + #size-cells = <0>; + + compatible = "simple-scu-audio-card"; + label = "rcar-sound"; + + simple-audio-card,prefix = "ak4613"; + simple-audio-card,routing = "ak4613 Playback", "DAI0 Playback", + "ak4613 Playback", "DAI1 Playback", + "DAI0 Capture", "ak4613 Capture"; + + simple-audio-card,dai-link@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + convert-rate = <48000>; + + /* + * (A) CPU0 <-> ak4613 + */ + cpu@0 { + reg = <0>; + bitclock-master; + frame-master; + sound-dai = <&rcar_sound 0>; + }; + /* + * (B) CPU1 <-> ak4613 + */ + cpu@1 { + reg = <1>; + sound-dai = <&rcar_sound 1>; + }; + codec { + prefix = "ak4613"; + sound-dai = <&ak4613>; + }; + }; + }; +}; + +&ak4613 { + /* + * (A) CPU0 <-> ak4613 + */ + #sound-dai-cells = <0>; +}; + +&rcar_sound { + #sound-dai-cells = <1>; + + rcar_sound,dai { + /* + * (A) CPU0 <-> ak4613 + */ + dai0 { + playback = <&src1 &ctu02 &mix0 &dvc0 &ssi0>; + capture = <&ssi1 &src0 &dvc1>; + }; + dai1 { + playback = <&src2 &ctu03 &mix0 &dvc0 &ssi0>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index d8b0b07404ca..377fe6891c57 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -496,12 +496,14 @@ &usb2_phy1 { status = "okay"; }; + /* * For sound-test. * * We can switch Audio Card for testing * * #include "ulcb-simple-audio-card.dtsi" + * #include "ulcb-simple-audio-card-mix+split.dtsi" * #include "ulcb-audio-graph-card.dtsi" * #include "ulcb-audio-graph-card-mix+split.dtsi" * #include "ulcb-audio-graph-card2-mix+split.dtsi"