From patchwork Fri Jan 13 02:03:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13099652 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 12322C54EBE for ; Fri, 13 Jan 2023 02:04:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230224AbjAMCEE (ORCPT ); Thu, 12 Jan 2023 21:04:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232816AbjAMCED (ORCPT ); Thu, 12 Jan 2023 21:04:03 -0500 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2133.outbound.protection.outlook.com [40.107.114.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2F6A621B3 for ; Thu, 12 Jan 2023 18:04:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TH5MI0cE0kC6kdpy3J/wJZRRrhlFcXDZhscKAzYvf6WUYu4icgOaFWs2OaaFNpL68sjdb6dGyeDXfBMRDHTL6jwU3e2LbbeQHgi2iUjch5/J4fVCMVGgS4F+Fcm+pZb7dKz+ieC/IQz7PPoYd0RiKMI5mFs0Ze0YvzzHmaVTclpJQDt6RdpkkH3KPO0AUQVxFw5Re+LavsqCfWSQVi1A4pkuxaZJL6HR0exfKoy7vXmpl6HilP/YRJpkdD7PqQ0gnRXJQBhd/kKRm+XGzAvLuvj2YVoNrzsemVgWpAudLdzdOS5esyqkm5nwYnO6o5SWUtSE+CncPQCNSYMqzx5Lzw== 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=hO4Aht1Y5yebDWJ5G9wdT5AG/AhQ9v6IfEd24aHQIts=; b=oSukzJYrpxlKKaLGdoZnYfmyNYgaQY2niy3Js1TakcTViw728z/r24aDv+JAKCA9O9Syw8MsYbp+42cIYxmg6FjasnUC0Pu2dLiMStrvbE069B8FpneprIvSyAW4VBAIQrmtUOv3Cb90pI69jXwcSoMDHbgMe8qQJmQJVB/jLMLyfxdqTm8sN/mzEu6bq6qu7r7/OFVFFsLndLi/2OcEy7ScuqBpaZpsX/y/Mc0FAK9ErKbs7H36kHrnR+GgmA29/vd0iGmx2IDHArfOoIUjiAwm0YtwVQhy/rO+kh9XwWDIk5gBNYe/PfA2c73EDjvRjQbkYk2s2pvun4qbS7v4qA== 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=hO4Aht1Y5yebDWJ5G9wdT5AG/AhQ9v6IfEd24aHQIts=; b=f6ObjyWcSC99HdHeWrRQF1L1QHfA3qh8/KAxC5CSxS8zpf8GHXwBSouaLBsabKcFI51FOf9xarjl9qBjQFyCfSboecHDPZt1C2QVEUgdzDnVE/vgQf+20BDMvoVARcKwp5dECB+JRj8XiDIkUs1wOiqjPbafoi9ir5+AejMCJK4= 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 TYCPR01MB10859.jpnprd01.prod.outlook.com (2603:1096:400:26f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Fri, 13 Jan 2023 02:03:59 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 13 Jan 2023 02:03:59 +0000 Message-ID: <87edrzi41e.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> References: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 13 Jan 2023 02:03:58 +0000 X-ClientProxiedBy: TYWPR01CA0027.jpnprd01.prod.outlook.com (2603:1096:400:aa::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_|TYCPR01MB10859:EE_ X-MS-Office365-Filtering-Correlation-Id: 956f634f-c0b8-494c-2b74-08daf50a6f12 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AVQ7dV6MtpodP1721RqyV3lrysR6RjeNeTnadgkTftDipjYl3dfxKStp4wM8vYycBsoyRFwGoEoItTQ0RcLmsV9Rcx70cjWhfXcFQo4XaV5vq+m2ug0NmJGMwJ4MY1oBIiFjoT2JJd27oGYpeRa3qP9lPw6AjmKJZFtExU8bQP4QeyQCTF88Jel0o1eWCKK7i/r0UFPzpql2Ik/WZ1dWNoDVxw1rH3MLyVzjp3Jm4+2X0Lj+WCQGIRC15I9U70OjoDDLNYKoVjB+kso3AEjZULI8sId5PfpDnjXp7q2f6GYZZiHNuREPYvxDtJygJvEw4HsDi/BarMBwTllPG4vG0ad24mvVuSJoQbqMlVDBxLygWywaZK/lfu3Epmi+2rtUZJ2fk6hWIUBFpFSapGNkbGiJbSJIPKRk+dZzCLc+IYyhaCEf7VH0QzoKNizHjy+8F3RTpdlxoVGhxXtkJFiTApAUnzF1xJhzvTdgUP84OBxpk6H+Mcbt0JGytF6VvVWKkTIdToMTTDnkDFAJLIL7F9HtbbC9j2SVxyARRjDyGKYFSobaN8M3b8SFncqR6pF0lY0eROXa+MQDzhIPE1QZ6HtSziKu1N3nlSTvj9pJEC+Q0wSPgEPgDB6dLAWCxBnItHvjOqlmoLCVH3XfVL98n67T+KGUM/FYEj+DmPYw3wK0gaBbldl+AklfGyu7x1lzFNkJDY3WR4l5YLAxNjtJsf13HjwttrI06/noKooAUcU= 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)(366004)(39860400002)(136003)(396003)(346002)(451199015)(6512007)(478600001)(26005)(186003)(86362001)(966005)(6486002)(52116002)(6506007)(6916009)(4326008)(66556008)(8676002)(66476007)(2616005)(66946007)(316002)(38350700002)(38100700002)(41300700001)(8936002)(36756003)(83380400001)(5660300002)(2906002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vfBSdeXL+FMcbG7OREJrhDQad8Es7IBcgQ79hXyUlLmpFwUbIAkMtlvzWf+QpKHHpbEc17dYv9kYyLR0RNnjRHHYBaonrhTYuwH1gEBapLT8sJXEAkxH5MaFd09GuXX3jEe2c1aL8KXZf68jfghbxK/ze+drwVPb5GzTEmIyxetCJGQk6y5bRl8wsLWPAE8KtSuUcsyvzL0BhMA7ok7BjTAg5wCHLg4q2A5XIGQnun4SNwFSyeZ1tbFXgwgH8DhZNs+FeuNQQh3gOUCou7NtqyMzH0fon/YyTXtZDpWJmWrRhh1/iKu17qSrEEB2GAW+k6hH6yKSvGTrgGFTGyweKDqN8s5cVTJD2Fs4SebAoxZL6BHxuaK2chL+MssxG6i++YYW5Nkm3GvZC6GG0iVIwsFP3PkFDYD8ML4z8LVj+sEFTDbC2ADri1ZDJNlEEGY2mE2EdNe+FYiPQuDyxHr1bifM9uBQ9uAS0WrAgoNeyLrOifBvBqhUT23ljC95MfmT3FmBcYOCC63NWC5K5Cki7hjyo/ZVxY6LICM0VW9ch3B7Pclu6ZjqJvYlWo3Obve+EUF7fS6jTXQrRSXj2/9iLj5Km//0xUMqeRKqphnizmwyE3GyFGJy471zJAPYy/qgfcO5yz3DbfBq3yQhPAoj32Dn0Y8qT+yLrzAmrwgPErgE0PKj7JqhGVpPVj872D00qIa68q1vCjywhcQHnPXgiwI86mIEhuT0QY8fwfDJ6s8oK/O92KyMx10Ukb4ynl+1nco+yAaJvbDD3qZumvlb/QzYpUPSXHexqpv9/oVueGnDsJdaTpmRogWYlJsZIAMLsXvdUFSmJSYiwPRfXqrY9d+P3XV2jG4fOdrOV/EUVY5K1raHkHsABGaEbqQmgq8QanqOgr/4FsbyKXztsoFlwzezTMM3L1j/e3nqpUYCdHZYtoKNVOpUwPCGnGnny4cpcNRjl9LCQq8qVkQYve/GQxYsE4iO+j5pVf/7KSd41Iy2FjCh1/6YcaGUNMpBj9U6Kj1Sc9vQZp9mFIwNaI386U/w+XDtDioWFvTm+tqNL4h3ggejy5gujzv+jZsLwuOeOw/TSMq8pv1hJXgYIhG3WPB9y6Cyg2B5P5bhcCZo6/GKj+KEgSCJexlPHzEF8YN0M0auJ5BTji2g58kVOxXNkiI+kv8/G+/mFf1GyNbs+GQf+eqLHMNEssCfry+Idnn0J1JLmj9FyrsRDadosKrBOHehcYoGutFdOI4zi4p6L33nBPaXCJ6tLeEHBbAZvK+sUNFotbuCQ6fFPlXk7rZrBWVD4yiv4z6OUdy+E0SYcIvO9h1UdStehg7opSCnu/Qx+x+1Qj1WE6SxJw45tfA1LPYS0FHkyzDVgWF+fYjRJQ6fkvxIP/ccS0RtB7eFFTasoASkU7nekNZPPSTKTxwPxkB0Ufq2dq4PmeCjK/3a/YttqroQucrq3N5qUdl0SSZ5HnkvvLhMJESF3bCbQUoE6T+5qFgqiyk1CgWYsEUmIXpa7PLrgACSDlQYHuXqLc69BGqcsZJQROxNO307xgkwSTuh80BNQlz5Dqd0dJEMHhuVavHxYoNd89vvKKV4rJvdmgUlykSiaUMEIgfkcCiLrSzOA93ZasdVHarpfuqytGs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 956f634f-c0b8-494c-2b74-08daf50a6f12 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 02:03:58.9536 (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: LJKpi08nrhvTsGLY+m6bF+kH/Bg5p7ESnx23xEGGRkCD+GFdU2KW4v7t7WlJOpN/8r6OI8JuIsY+Pi6oQePvnAeqWi06vrZLTNGNoCmEpF6E+of5iiRqOjqobJRZ3KC+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10859 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. Link: https://lore.kernel.org/r/87cz8mpxgt.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto Reviewed-by: Geert Uytterhoeven --- 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 73be346001cb..16d146db824a 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 111a6d23159e..2f2e483a2c2a 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 777b672b59cc..b9d34147628e 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 3e0be1b58931..f51bf687f4bd 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 Fri Jan 13 02:04:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13099653 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 76029C54EBE for ; Fri, 13 Jan 2023 02:04:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232859AbjAMCEL (ORCPT ); Thu, 12 Jan 2023 21:04:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232182AbjAMCEH (ORCPT ); Thu, 12 Jan 2023 21:04:07 -0500 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2136.outbound.protection.outlook.com [40.107.114.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7225C621A5 for ; Thu, 12 Jan 2023 18:04:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FRm/d02XZ/HCZAkVOwbqX0S/kN4IZb96ep/kFRYgfopKtJ/XqCDM8UedNXi+3GZ6Wm2p+Vv2hwB8t0BE0iIu4TYNwHo0wdhK0LFsfANdJn0qcTJFxuR/1CMNekoh22aF8NMkcsqAal/TrI/75F+7w2fRPXRaa0xB4RgYrvePSHO3JNcw+OQXT5Rz2MdBZts5oz+pYj5cPhROolnVIlg1Phkw+ehz9elaJwLkBE6L+VTGhfD1Fbc+qkmALvtZj9vibdHdfL6HW03DzATDNfaaRckMBXyRHM9WJk0e6KemEA5+qPrJFZ9rlXrSDFJRVKDMyRxosEH3hiKMJGrjFDTRXg== 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=+kzkRpgBdE7iP8LlniK7oBnEoBHNitmcMe0glVDUGq4=; b=giA+7CQtSw9mB4M53ZAGjH4fZPye6eJ+mLxy2ts0D1ze73NH27TRcDTCrkOPQQTI1sOzRGWIvjeMCAB9XRKtwWDRvifRXBRdWQlu0gR+z4KByo+4kAVY0Knu/HpCwqWtnOcFyI5kXsTL/EoeIYR2c7Wvnhu2VZOi9z5XgPjQLv+t20iI2NBJ3yJ95d3u4Q9SDN+apSZDJXBomDx4v2HQ1GvlqnS1xyJQWkwVy4XwsoN+iXeVdNxNnejXrqk4gRQIiuFrlLR4/lKM8tl0ddCA9zB+O5jE8fS37PVSBPWDlo4SHcQ+qQYIdgI6mBhjTYM+9Xe7oPQ83dLoBvljqHar9w== 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=+kzkRpgBdE7iP8LlniK7oBnEoBHNitmcMe0glVDUGq4=; b=NB3M3QATelR2YDJrraVcsg5FuISHM8BDxk8Xuv6pplndD2LZAOm0hSfCGaKLBk3d43hPsIsizk12nkecrUNB9MukEGBETqPRVjRVswE2HbMPTK38/vW2lq6JArwmuMdBgtERq/SwojZaj6tIgaA26U92W4GufN7+aSDLb5EzlPE= 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 TYCPR01MB10859.jpnprd01.prod.outlook.com (2603:1096:400:26f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Fri, 13 Jan 2023 02:04:03 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 13 Jan 2023 02:04:03 +0000 Message-ID: <87cz7ji418.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> References: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 13 Jan 2023 02:04:03 +0000 X-ClientProxiedBy: TYWPR01CA0004.jpnprd01.prod.outlook.com (2603:1096:400:a9::9) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10859:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a0a0c42-919c-469d-7dcc-08daf50a71ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +amLsNZvVCJTD6CzAzk0q+8N2Bfe8XW729Qw/eERG559ZaJuig5FU0/6eCicQXiDicL+pOxqP9yD6h5n0wMU1YmjB2bbVvmYOG/YXB+6AgOc3I5mCkexpeD5j4Nlskx2Mzt/ClQXJoNIe1oFQyIqec+Hnubv7f+sEhV0wQW+gTw3ktHRJXjZAaZjyeyLqhUnPWy2ozu5Uumvu6+A7iFlSxNf2mJgjqqw6Ei50V3tA/6pr5wY/usHHZhZ8AeILPZ0Q2nq5OCt9FoHIlpdmuhjVbO60hS3yPRKmCguCFUJgJeP/9ZjOxknUF+LbuEt0DeMXYHlk8APxIsjW0rKVJClX+NDp6CVg+VaAFUlJvW7ADUyvC9GxLDHVkFGAbc9cNo9l2I6f2kgVd3vNuurj2iqpFolzLz+ogzf4Ar/GwdmnAa2C/6Kkd04JqB/Oa6Oi8Sa2+wgxHpovKZRHWi9M53U9rL81CpWdrMPdad1R+Tw9lhj/NxF5/j4fkz2pADhMMFfV8e2ax+/94sWhiSFwk2+ahKmevmZMeblPUmEfys5mPoibOdbtSwYRqprsT8lNx6QmC8qRnMOxxbZ9Y/aWDfWNNNFMLlAFI6P6553E1SGrYLXnxcldhJpEavYAhN6BeoAY02JFJEyn6Yu7nAoA2rHmt/bw0oTg0rCPecAGgUcgHGmdWUjKYuoAhznZS0L0WDkUN50PUJXL1PhtCU/EIWbnXHjjLCZQ8y1nGU8yrepY6I= 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)(366004)(39860400002)(136003)(396003)(346002)(451199015)(6512007)(478600001)(26005)(186003)(86362001)(966005)(6486002)(52116002)(6506007)(6916009)(4326008)(66556008)(8676002)(66476007)(2616005)(66946007)(316002)(38350700002)(38100700002)(41300700001)(8936002)(36756003)(83380400001)(5660300002)(2906002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YaPLbcu8uWEB/JTubB1R7LRtt9+NzAopPo1UitcTqRAQNkKaxoM4D11bBgbly8/hxbTX/UuG8uTVjcb0XlV79YXsZztb0CGSbwp5EA9gEt4nEHtclbgf15Mi0INDgWdB7goOVQ3Jbd4JuIJ5lDKd/6RYa/7P1Pb8fOz1eq/LPxybRt4O1wZICOW8v44dD5UxcNSvr51VkO5KQP+vB2wXJ+cy1ggfirTiU7XdOEwQVixdx56T/pgjCoHcrYIQOZWARucLKDsA9qPY2zrKv/scVQjpfZ+SQ2wibhs+jmWtx1GCJBj/rnEYSAmIVXE+Idnkp04Mvitt2gRFS8p2A2qsMUiEyCCytYyXG+GzMK9YTqWHU9eT8rP+nGXmmoy6WQrwiEXwb8bE+jYyEXJl+JQ2HX3/ccWxl8N0LVMFvfu/1qbLAZ+WSAgSNATYUTB9hxM5ggD9Hx8Ii16i7M3/Ct/5yvKoU4f88SesWqm3FBWOfZ7Cwx3BAkq1kDD3WZEXaUFCU2/RYIKvUiuKPFbUYYiOkryJ1kTkJ+YEYTkqdIBthnLJVKv7X4/nZu3bVdQzzfcjDLihDpgt92+RSU5KMIVumcI4bqObN1Rrz7f4TZITZ6OtVHhtVv3HPjdhNtkE9xJ9XyteLpIN2xSyUGauJG+ZrrgRxh75ey201vRplVePILPt7cFvLBXSBFhoN0jo64btUrjzZdSxPzxnI/c82aPIuzgGOmKsAA88Xh2I7rKAkjplMZL9My1vjbOTXeVyP62BSaOTL37b2IbdA9H26AG93d7XYUaaRNAhFUoMqBm8XQEHgUfk3kgJAFlo8IlEp2s722QFSoCAGfwp90sGifv3Dgm9XJ6BtBmzL8N/braiZG/zlp+SBHsCpkgmYbPx/VvRfBRLH2sys4uKcy8TmwqH1fOEh7qjjwZ/NVruUQ7222cfKkicOg4o76OuCeU3seZkKZ3aGwksavsYsxh5Nr5sj/n0gBHneZZE0cUKHhMzMLTKYTkEA7O4ItBfqjlAtE0UWpbo3m7jGpDhIYvf2gLCs/PaVU11b8gLQURcD/tU+vgazYNcVAYlwEuTsmmElzIdsjP1yWO+WZMhcbiK+93pCcfWZglaH6BA+OIzZ5JtRNUCteekKoSsJJXYQoAN9UnQBeP85pHLGReTO4mwSU4KYYVM2mu0E4/GFcBe0AdD4FqEuWIDVgbJq1TGEEiTkuIXN0/FBnUWJM+p8hhS22aPKJd3Qai93pIt3/YiAbMK7rUd1cDb2HG6tDg++PAclHiOxJC5PBDsd4UZ6ece48OJhpxrsZSLo0wr+RAB8JTQnOlsB1qDi0l+iNU68vzGGdRFXTSO/7Wv+TrTzfjNdpopToFRNhPPAytfO7Ss1u+9nKJb0zpYCESqUrskoEMFWvxrzFazMjUwNx/I0fj8tycNkv5NVc0u0ZIHfMibYCsXfS4VLQ813a21Aeq9RRJrmGS0SFyj0cFZgdBIJp7pJyFCpZ6sy5V6v85ft8En9pzN0TBLeBaFSbXhlU9awCHbjrsdkHdj/f1YG8s2fTftqe7PnAwn7BrBMorpuOSYqcxn2gTIwYjbFyDzqh/340VhhLN5I1HgdEJk4q9V+k/mEzP5XPb2VqhktNZOnxC+CSiQTwo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a0a0c42-919c-469d-7dcc-08daf50a71ee X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 02:04:03.7373 (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: 4DNLzoy2GeU7WpROyK51RQh/pttI4vODS5ra+Deb8rZNAF6Z54iKLTQGbLbQO4X9VGFpRZS6iKMK1JZPye8Pc4WM5n1aBDa+dKBy7qXf0sz3JPNAo9TMPlPjjP8bQYTH X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10859 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. Link: https://lore.kernel.org/r/87bko6pxgl.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto Reviewed-by: Geert Uytterhoeven --- 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 Fri Jan 13 02:04:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13099654 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 398C3C63797 for ; Fri, 13 Jan 2023 02:04:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231400AbjAMCEP (ORCPT ); Thu, 12 Jan 2023 21:04:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230443AbjAMCEO (ORCPT ); Thu, 12 Jan 2023 21:04:14 -0500 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2133.outbound.protection.outlook.com [40.107.114.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7497B621B1 for ; Thu, 12 Jan 2023 18:04:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GIFEYbTB1mFtCdeQJjY+1X3BgSMXuYgzHUyv6quOXNJorHJsobt7Jn6aw+gyO5sXBFW5KUJ5lxMZgkRxne5j3eBP/2Y8O+5deu6q2AZSXuhtrEQi3SKumccplPHmtZdlU3Ok6XUTh8+tAv1yFQyotXKu3ecBvqZzn9oAkyySfq8V5NeQWsjm4sQQATRZlqJ7e1xD/fR5VnF0azNSwTjNIuOYO+nmUqclKUm+6eXkA6yLx5YzX7JANwKMyCKSsNC+6ERaQbvWKCDpQ3Lx0RQtcDbXpFF1a1OoFqSEWuBzzmvOewzYQMuat10yjLDWfuaK19NlStZZtYnPQloL/wx0Bg== 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=uwwXoJozOHEqJ34cJX8nC4JMqnq/p9f5yIABQsABbGY=; b=Mg++hevwwS3AlFDLHa8Jpm6I+6auJ9IiX1OS7lIQP7bthBTuhngt6lGcrvh8C5Bhaid+Z2FgwQWFyyfqZvKWEyzPX/6yHd8eLIN8P4c21L7tjwX2zYCSZpg05PDSVS7jVuaS4PxVEaumBE2moVU/AzXVb4aYF1dFUAxw64aQ1UC4IqvjX3Odx5zFotCi1jOo4xSTjM1OKPT67NtwQKRsvbqd1uS1v+mkpNxvaYINF7tTWFyc7vo99vLfhacKWP99+WL1dX7OGfPornzGlzEKzc1ynJINfsieEQBIskLUIytlqKfiGLDZrSpf3Kw5oX8H3FH5xPd9yW/xtFDzbpFJxQ== 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=uwwXoJozOHEqJ34cJX8nC4JMqnq/p9f5yIABQsABbGY=; b=a/isMN0gUeN024mk59MUBKkFr5HHE2H3tvddIBXPlO2wR1O4h/KfK+EnZTSQz2rNMoU5p9QMzxfNnrifcDcPxuTlrxzToEsQGQtrVbjRLxe+A3SLXxp6HVhKAlUen+BxvTtHNPezCqsdvNmJbmw6CZeW6fbIvEAYjqoZH8/bqtM= 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 TYCPR01MB11239.jpnprd01.prod.outlook.com (2603:1096:400:3c1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Fri, 13 Jan 2023 02:04:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 13 Jan 2023 02:04:08 +0000 Message-ID: <87bkn3i414.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> References: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 13 Jan 2023 02:04:08 +0000 X-ClientProxiedBy: TYCP286CA0066.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31a::10) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB11239:EE_ X-MS-Office365-Filtering-Correlation-Id: 12835b97-608c-4337-532a-08daf50a74b9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d/ZxSAJNTBAAqcHXweLKBanPS0YFfOcwd4c4gbxqcM4LxguvucrLb7XNoy7RT2ZS/AR+9fd49ywAaBJyD41Uim1Im0yXOCuYwandTK4L1mQts9/NfkhaUGyB/pS8z7qmOjc5Rg8xnokKxgVbpfSN7eRTLrsZ+MOq4JN3MamTLwezUm0whBCJBoWcpunQh+KffkeNvmZ7ubJjzFwzgbnpMSeInXjRHQFhx/R+adG6RaV6rSu/DWVfwQ4g3cpPh62g54khntVmvJKUomFA2u6oktFUTmX1eciDOovQMfviZHYEIvzGdC0eSX5piCp7SSJeuXh6wATjGWsCuGL+UjcpqLD6xlmabQviD6eCtkKR3yWZRuHzcKYasSqz4FCMkgHleJBsZAOJ+akRIdlsQdEd9Rx+PLyLgay7vqAm/lU/HNFfgH+cgqSN1qAv9Zb/O8F+6h8ZAgpoAldcTS8RO2V1pW/2MklUFpfTXfk8w9xk9FXld29TUFpKOkC8wxMfDnohhuER+Irf73hSHCv78/CSCEKP0jN8CbjF0vb6Z69br2OvmweqORkYV5JVDWO+OwxqXc0RTpN455nzXT/Hsm1DfL+Uckle19CcMZD3Xrts/ZgqXthaB32mJRx1V2WwW1ZUmT5jG+gLjdW8RcKxZzU5rgpRIsXWx7a5f1ZL3enLQoE1yAMEV2jIjh6ZhdyZUSFg6c9p1rcsQkpL6dDaS8iYZJwtGovzDKhpxsAyLz+/2dKYd/PuGJO6cBHtcRZg5ewn 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(52116002)(6512007)(478600001)(38350700002)(966005)(36756003)(38100700002)(6486002)(86362001)(186003)(6506007)(41300700001)(26005)(8676002)(66556008)(4326008)(6916009)(66946007)(66476007)(8936002)(5660300002)(83380400001)(316002)(2616005)(2906002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Eg9HQIOUPU1cWXcUqrldDebF3V5BxwWuPLqQX6Tun8bAeblTXj4grNUhjMJVavE/V6stFAVRSN3xzmByYs6MOiSfmB5OGwlvchL6jeevTVGwDve9eoOf/b3TQ1m8E2IazMVMm5Ks2l341ZSC++0hhqKh37eBk5dzxVcOV7j1ytvPKfxpd/qDPPhMvNSBH01BfaFMP9UT6iZ6g4Y24a26zbei7Ad4vD9LSIwCAmgTM4A6n+j9qRSldQPzr0bu4MSN7t2hj17LNPFhTuIvQO/OmHNVFw+F5FjjrKzfRLa/6GF4mEbJ99H5SjiTcVIAW56WnJbfKu5AiYU9vt5P8KeC3NXDCUWRRzZPeLpr4zBR+xxcCIeF/psRLpmpK/4wNXllaaeWjTCetpvfSEcb+iIDvVbavgyyuqN/kK/aYHgnSuUwA/Ewr5d0Ncpb8xjVHzM2NSgjf9sjumrPpmJZ8kgxARU4hKpogQ/HvhjqdfQfmg9CPZcgJKBAnsUvjc0NNWANCDn6mtP/SeXRiGgc2dqMoLEzhrMUCkFm1jfpnBsGGQgM9NscTz7DSoJtidM6L0BXjHxmBOcy+3xXGZEUvc9W1Ubh8xakuzTYD2wtTxO5UBxt2034fP77kLJjjRzrj61yB2Y7dKTu++uuM5RGwyDie8Brj1M7rb+QUpI/rp5417e6gF55QvKv7LDl4lgmFVEvpxIBLp2ozBN5hg6HK0u0V4a9zufTBLjLn6zLOMEz2erwM/Cu7HgwfTgQOsOBAMKslzaIEKmPwn7nIs7jP6BSEoeQDerkFMKlTCk97y88HW4jw2/PDXqTsqETlvZosJUhUvvGDVwdd9ESuFToG92KXxFOTrwZKOoxQn4c/aV7uzk9fzzvZpjSA3RL5YfYLf+dH5BKB2r4Sr4r2pvAd53mGUGz3+TEbsqdzq3KQi06QghiLLXikKStvCi6E6nVtIdb46phnphW8T5XNZ/qRdAp5WK0udLLpneigmkwmMuB2SBzGStXGhmIJOEeO2z63UcdXxbw6dcstO4AwRy9c+W43vFxfTecHLebzSQLhcRP44hRrRUd0Uza1sGB2Ue4qAuRB6ZUtWnigvG1rbwiJqummYnYeWvYDP3tUzUQpsq0ZvWqh0jtTntR6+5pgakLzFJfysUXCDNP78E2uBivyPwjvoa8GKjXMzoIQvOqL0SfKMbwFw1bDEGYVGwFCsyck8bIPbT0mFxnEJZv4supjgiQ6/CKIH81l9WYhKNEoTO51DoCAcYMf2VvMSQtG6JWr4D/bdxXzUeQJTazn7opKqsRX1tERMSIO/pcWt9E9+FeEGgXqH+B0LjiMoNrl/LM360moqq3HssP7UzdGZHdN3spC5OP4OB2+0vP3hj7Pg2uQmjphT/p5UE1hQpP2AmkZ9NGqMaTZ7MOEo3ANtXlgwzjE460Jg7IYxjGjH2e4ftbUOGpr+/yuTTp/OJQKmPeGai0yDoE4+M6RCxN0R+QAlMidUxjxprttnld+JK6hXtDtBKxgIs9YM+VY65WMapbgKm8p0ohdhhXeAbZviNLfgZsupaQYtuVynzORKsqce/OCVU9TEMIB1vedSF1aRuDB+FAI9222jW49QDgenw5C6jAqER2Cc8/KNcQ6sWbwxzEWiQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12835b97-608c-4337-532a-08daf50a74b9 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 02:04:08.4064 (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: jfT1WGJ2EBNcRPfH140zkHWczgmBKbakNdXvOwWp7zeNAN6wW7/RK/KL12cRjykTmw5MPfJ7+4xRDpcV1MJF/g9DtwSOujXPVtgAmff7UHAFQtM7ucaLvXDzyxOwV454 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11239 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. Link: https://lore.kernel.org/r/87a63qpxge.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto Reviewed-by: Geert Uytterhoeven --- .../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..3be54df645e6 --- /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) CPU0 <-> ak4613 */ + &rsnd_port1 /* (B) CPU1 -> HDMI */ + >; + }; +}; + +&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..1db99b7608f0 --- /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) CPU0 <-> ak4613 */ + &rsnd_port1 /* (B) CPU1 -> HDMI */ + &rsnd_port2 /* (C) CPU2 -> PCM3168A-p */ + &rsnd_port3 /* (D) CPU3 <- PCM3168A-c */ + >; +}; + +&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 Fri Jan 13 02:04:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13099655 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 EE7D0C54EBE for ; Fri, 13 Jan 2023 02:04:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232182AbjAMCER (ORCPT ); Thu, 12 Jan 2023 21:04:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231153AbjAMCEQ (ORCPT ); Thu, 12 Jan 2023 21:04:16 -0500 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2125.outbound.protection.outlook.com [40.107.114.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EF45621B0 for ; Thu, 12 Jan 2023 18:04:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xo61OcZZT6Bnx0aWVPTzf3xAvw1NoqMhFBOOJBulUBmGi5GD6k62OxqO/P9SXg1CBnG73eOPIBTI4k+EPsMjfQkhLkJuzkO/QLpj00umWZMpNyJZ6sx8Fti/V5OHJCEJoqW4rbg9GP8Ghn6O6sHdTdW5y0Wx6Y6s2hR4zv2MKLCdv/UWiE2uEEdrwCB44SS1LC2npVG+B6RKcq/lblZ+lIHmLxZZ0a3/MfqAMfm3XeAQu+fJ5jMwjpBvlmU9bjm6NeHcdXLeVnO6S9xuYhPERRYzIUqVAEgs+eQJ9pNoCZKGx/UR3KUrl/GeWtSsFdPawC28v2ZKyQ8POlk5AhFm0Q== 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=V4WlOIfkcSoPF+BZPNu3XODXC+a69eQQLRUqY7B4zfU=; b=VbbmGF4lWnzD8UJn7of5Si1dn+MUxZFYLy6j1R9UbouIU9n62xm4ksEu6u/Z9SMJWOVbqPNlEcLEsyBBu4a2DPwXvU8cfpYnfiI8TzQvmdF0QpJ9hAo9dzTw10e1xd8JkS2KJCDtqn+25/YPO2LvJAXhIU+TDOMp1VCyz4cvrwpU/GwtCKRLdc5KkleGIan+lPJyLpFWbNlCoab4pxqJUMs/YKvFgumnuEGK+qz5yux2QxdVb9xSiVP0Go7c2xxrL6L+6/dCuKKdVNMLmCYKgHPhu6V03u8Fn+LjPeQaMyz66VBFzUZJOVNIMj4qbS80KHw4Fgk4CVLTRQ8fUTvLLA== 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=V4WlOIfkcSoPF+BZPNu3XODXC+a69eQQLRUqY7B4zfU=; b=A4FfyBJNa0ZluKUHNJHwDhVknChIYsTATiL8Ie/lNCmwSgZn/wB9Zs1mWB/darCUq+rSqzX8/XsKAQK89h3lqBmbIB4C82ozeizjr5NlNpE8jGpoQNOuVi/2Jr7wUM2FUJFrCtej0HLPSXbaEtbzQtS6wQsyMdKnN5/cgsZpAfE= 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 TYCPR01MB11239.jpnprd01.prod.outlook.com (2603:1096:400:3c1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Fri, 13 Jan 2023 02:04:13 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 13 Jan 2023 02:04:13 +0000 Message-ID: <87a62ni40z.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> References: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 13 Jan 2023 02:04:13 +0000 X-ClientProxiedBy: TYAPR01CA0004.jpnprd01.prod.outlook.com (2603:1096:404::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_|TYCPR01MB11239:EE_ X-MS-Office365-Filtering-Correlation-Id: 5678bc80-d6eb-45d2-2f29-08daf50a77bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oEGOLvJf44aZFh4Sw4ASZ7V9rb3Jnbiyb94eaXc9tsLfb6uGY7vX86pS9s3JVxOSSB6hOJ9oICuGB8gRNEoOgN39o9aVZcaovbBJaCjeE89mnoqtC9Qq9iHHLoohbatYcjog5E6ha8nhQ29pZ0Jx65W/XoJVyofccYdxBpj1iFgbFUdCc7vRJXw1q/Wc63NeDTwcXGfhhu/gnI0ElFqLJgJpIKwvWuR6f1O0YaWrXK4LkjrGvnWgDiazha1fVoRKvKu7KdlnNK036EJUTm6CO/FjqWaJYXbOwUD3ppIvlCht2HszpsGtaEwGjaxGshMAMnuq874o0bm6URfaKtrRXky+ICiWTQhibsgJl3Z8TYvHTb/bbX00YYPfUEfPZln2HkAthucMrlqThx/C+LSzR8eooMfLnz9XqHPYH+Ww3AS+b+r9EDJsGRtuppIkHjk+VI7PK+t/q9NoQH8MfVdD/y48LALsxCgdWU0oRALQ1fSRyHbM08WhMeH8KqXn8OymPrZswhCg5w87Jh2iNdsXFHDLAPGNOb2PfUmOOGqSVi8xh5SAnum25L/Xg7+okiavEzsfjdWXcIeccTWFPX822MoXcEVbOvr7hnA6zoNNj3y0tCRBGZeabVRarluD5uy3bwqfJtSSRK2jNWOlkI+sztjwtBvJlMombiEkLmV1pQAtiD8gwGP19o4SceYEjdhI/upms8j0f5FJ1+vSv6IAGecq9gyJrrKVrV5HMHje3LNuaX2ES/BRvh1/CTIE+dId 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(52116002)(6512007)(478600001)(38350700002)(966005)(36756003)(38100700002)(6486002)(86362001)(186003)(6506007)(41300700001)(26005)(8676002)(66556008)(4326008)(6916009)(66946007)(66476007)(8936002)(5660300002)(83380400001)(316002)(2616005)(2906002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6yjAKdf3c6FAsv68c1nSPZFZgeEWnei3i+gadGxFp4+zeI1QY9zGux/tAUMDSc9OkXrsQcrTqpH/spQCGeP1YY0sEjIxqrlzPrQe4y70ZhzPatiexZsXhFbYRyALzKzCvVbJKY3LZS8Guuifw9Ev/Y+Ky3lAN470lC6nom5JqqS74suHwDU4ry1/mdXcZA9/T9pI3DrU3VskjbVbYHFcgqM+R6GT2/f745fG137xytGI6KcgglucqftmA6lXTXHmfmRkT1h00TBUER3r0IwLyc0rZdurykYDxPk8DDMjPopuymU10lSmvtkO3ZFjY5ePr8EHyvg1MwtFZDU5zdJqh391p7rB8JuPFaH5NBL7MVylCsnIuPYHAs3n5g8Rnv7Yg5Jr04Zq/Ho2lxV7xtfYR7+xTGsIOJPpcbK/L9PfMKIxFS5vz06mkksz+yFl/oxW8tDnBalUSoMTDGs/XmVqLnFNq44F+CpX7Zc+RYEwaKxPhBLwgFjMXvZeAfTfYZOya8w6cZvUqRtaLraplG0/o4t+UvsGx1LfHM7FCYNW+uBr3kuO0lPKouCymKOc/Es/UBRLYxyq3kVxCfKUNYJRNQ946MKQI8F1HsjwYmkIqUCqQFj1bfcwGKDC0BZqW5hxnCqeYOxiiEBA3509E+d3dIN6uFHye6NAx5Bz5wEtOGbTPtopF25izj36K3s1EzC2axlIQogP+WTE4E+1A4cquGYxFoD+uVSRbKZV7jpPLBA8nLLhJMOOwvDibyv6NY8EoA9ybr9475p56WD9drV010Gtz10PeIM7Cuuy3dWdhiqjdRVCtwMGvw9lHFThZ7xC02BaoLzTHc9OgZaKPcjonuT80UCBL4fLeqQ49JggilbQ43z2JrlLZPJKAIuy2uOz8UhmKeR9qUSpw5SVDc9mMEI76yGxRIXAFWqBvtIeyEJNAsBl0INa1fNaTxy+1KkUbTnYfgAEt+BDPHaGA5q7oyZdcaU1K09SDDC4JJVrDuzmR+3oUDSA81PFMmZ8j8ioo0qVAFGmWNITrvAM4tdV+jtFEQhOGZJEmv0WIayVnvRCjmpANX+H99bEHC/xtAZTHsAcm2Ou0c9bNukXGXJV5qJvSowtynMr6ecMeBEcVKmcSS8IgtBswhYiNk88isDI6pGjyVl48RC0Y74SxkVFOg0U/Ltam6KskLl4ejdJQUUmOkIw+8Iyqj+4mwl8k2hpMicch1WjtpZGh7ut03ZPe4FR/J97W3fgDrRg7l/C/FAHISnL/Y862wuJw9Ady9WNf6PIdltb45iECaN/FXgVvTbOACizj8plnmlfjMIcxopLPxlMFUoo+exuzEvkQgJoX1qZzkUnPUE+WAfHPYuDTOZRQdHfnEepWN8EcQOwObrBabuLxKOCsy9FqFQ4ulS3yyhbd12KGcrJUQ1u8p6Ki00vkoAQPTQQ5kx13T56EvhOWu6VDlOmoPFKqwKlNaRe9UKfIgnf7ydG7e7k1Wytsyo6olWwXMcwSTPXRlbFjHB9surrp7rR4TqxDiRovREZeXW8pdKE4gDCc8OLkh0tajTER5bZafxOLAannQ5+Oz5Ni6tNSiUdZLz6QJv2dvZ0Qt3dD5nNQCGB5MWxZX/EjUar68P3WOwEqkSMFLAJTZs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5678bc80-d6eb-45d2-2f29-08daf50a77bb X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 02:04:13.4830 (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: dApurJPSM1HYXaulYkDfUH0SQ4iWRMJDD7kC0eWqwSFvVlZcTWA1w+5bWjKkHt8Ei9JLzfI0nitqQqOLcj4HUl7aaARv6Qayj5cLKfA7bw+v1I+Caz+HjMtqpGSLdCIf X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11239 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. Link: https://lore.kernel.org/r/878rjapxg8.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto Reviewed-by: Geert Uytterhoeven --- .../dts/renesas/ulcb-audio-graph-card2.dtsi | 26 +++++++ .../renesas/ulcb-kf-audio-graph-card2.dtsi | 30 ++++++++ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 68 +++---------------- arch/arm64/boot/dts/renesas/ulcb.dtsi | 60 +++------------- 4 files changed, 75 insertions(+), 109 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..5ebec1235843 --- /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) CPU0 <-> ak4613 */ + &rsnd_port1 /* (B) CPU1 -> HDMI */ + >; +}; 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..c30e056538e4 --- /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) CPU0 <-> ak4613 */ + &rsnd_port1 /* (B) CPU1 -> HDMI */ + &rsnd_port2 /* (C) CPU2 -> PCM3168A-p */ + &rsnd_port3 /* (D) CPU3 <- PCM3168A-c */ + >; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi index 408871c2859d..3527d538a20e 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -6,12 +6,6 @@ * Copyright (C) 2017 Cogent Embedded, Inc. */ -/* - * SSI-PCM3168A - * aplay -D plughw:0,2 xxx.wav - * arecord -D plughw:0,3 xxx.wav - */ - / { aliases { serial1 = &hscif0; @@ -212,26 +206,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 +392,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 +426,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 +440,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..bc0ed53c89f4 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -6,14 +6,6 @@ * Copyright (C) 2016 Cogent Embedded, Inc. */ -/* - * SSI-AK4613 - * aplay -D plughw:0,0 xxx.wav - * arecord -D plughw:0,0 xxx.wav - * SSI-HDMI - * aplay -D plughw:0,1 xxx.wav - */ - #include #include @@ -102,15 +94,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 +184,6 @@ rcar_dw_hdmi0_out: endpoint { }; port@2 { reg = <2>; - dw_hdmi0_snd_in: endpoint { - remote-endpoint = <&rsnd_for_hdmi>; - }; }; }; }; @@ -218,7 +198,6 @@ &i2c2 { ak4613: codec@10 { compatible = "asahi-kasei,ak4613"; - #sound-dai-cells = <0>; reg = <0x10>; clocks = <&rcar_sound 3>; @@ -230,12 +209,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 +378,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 +487,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 Fri Jan 13 02:04:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13099656 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 29B08C54EBD for ; Fri, 13 Jan 2023 02:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234936AbjAMCEW (ORCPT ); Thu, 12 Jan 2023 21:04:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230443AbjAMCEV (ORCPT ); Thu, 12 Jan 2023 21:04:21 -0500 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2134.outbound.protection.outlook.com [40.107.114.134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7D96621B3 for ; Thu, 12 Jan 2023 18:04:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DgLMZLCakv41TBl+wX2JYlg0B84ap1D39pHyK3/aH9RntzhhbONtJRPO8bBvzdli+yd/MDQGq5j17DOFnIbYiXfkQptU/KquDAChtky2OEPzBbQHiyOjBxpX7XJTitPnq+7W/z2Ozr8nBBAYQLGs9QSu21PJ6Eg+tw4jT55SX3dqyY2cB5oF/0r5OJ0XhCx2zzuwGKBboByZSgUzanqOwRp0bG0JMFilsLdtSFR2DnmU5WS58UIXx2t7njZOGAlJQmuD+sF84/NXKe8TSmv5i7NNxGytecdo3Nn2eL+U6GTogue2KwqQFr9gCGw6jKD5J+jZ8GcuL4D2Jfc3geCtdw== 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=KPPw8wyWxPmyr8GqhwOmUtfuST+2RP8ssaCxF2/9HZQ=; b=AWTaoCLuSstcNVMPMFImnUFWSvHOPl3POcWijeBabMPPsXoyz7sGfiuRnPIvOz1qJGnuXnN5dWPl6PvBay0WqQwa2zcnrRA/C6UvSIVKNhGMw21SB8zAo+vBrGS6ydErBdo5OzxBNJB0CGVD01xkBZJCzw6eohFu5oF7T0Qek2LaAcOpvv2wqe34vxbJjPHnfiOPMu8nJ+IEHNtPJ4sb7JNPhiqwcRYyuwjz67cAip76/uKi5sC5AN8PDOX+WjyWgm0Ji3OKKeaPOYRvwPCKMlDRr4VwrSNa1WMUzGIWVF3j3LwTiV3UOj6T4xJeAHtUQ5JSfg5QEkio0EckTqjXkA== 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=KPPw8wyWxPmyr8GqhwOmUtfuST+2RP8ssaCxF2/9HZQ=; b=lLNYAGREGkWDiX4j5YuJa2oNh1pOl4Ul+18ye4v6uaa9xrKGxnpOLY2X33j/SVgegyjDorLtT6KvstYv7r3xCQ9l3GJg4lrulzzElX18r+3RXDKJfFvd4P5Oj90FHxaizWAK/FHvM8Yy9glgwwlnn0D2l8KYNgcB8I+OblHHHB0= 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 TYCPR01MB11239.jpnprd01.prod.outlook.com (2603:1096:400:3c1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Fri, 13 Jan 2023 02:04:18 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 13 Jan 2023 02:04:18 +0000 Message-ID: <878ri7i40u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> References: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 13 Jan 2023 02:04:17 +0000 X-ClientProxiedBy: TYCPR01CA0111.jpnprd01.prod.outlook.com (2603:1096:405:4::27) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB11239:EE_ X-MS-Office365-Filtering-Correlation-Id: eeeb9f7d-72fe-4cfe-f0d7-08daf50a7a84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EtgBy0gfFrLcJWqn32wqapHriYrbsRx6uISTR2a6DrL5qpTQQsLMKVaiDkH4nCR5SAzJkX2Fo8LyqBBSjW5lJ+QRyjN9mlRDMJsrs4aT0kvVwbzTQmCX2bIviiKqwIUrsvbOJhyPjb5W3ygZ2jB24xac2J5BJIk0YUiDgLOMfUGxeew+/cm6mqNbt/FdT4FShSEZLWPltWwj6z2EDrmsyyX6lDBD7lAhq9w5bHKA6z//p+a2HcNQvv0o+QANx/cg3KgnFUp2LigN5Y5wDk+h2tgo3s3WaMQqySD8sadu0hFKnQu5Ii0nZkR9UuHGO/8SNpIAz1sAmz3CW+FGn4nG2krLKE/0RO3vHS1i/q1xnnryl93xAmWQVNYPQix0p65UsFb8EEEEay0neymtxsrwVVQA7rj/1WaVld8Hcca0kUiHPpvqMnqlBWzGRbmCXam3hhu/AdDnT4b1y5pfAGCMNnSp8YDsVyICEH36md1kTdFMM05+zth4tyYJ2K9cw1DROD9GaR94oxv2ZidVugiggZMgL5CCxRlE8PjTwpQsFK/5amiEd2to8LDFKHvG7ARiptFk8y+eK4GjHbEW8wyAjEFBXB3F3c61SrgXYYUv6b7hFjmyzZV2POSuipbRuvqG9hI6pn4ogVAzvTNiEQDd8CCC6RHzea7trTzmNtPUyM81BW0ZZ2tnfdHcyrPQJMLdhKZKAzCpCQjMxjDJZD8V9XpCNoR9zGIHeMZ7Uq9CE1gWTYRqtIvALYmq5uUiJSxb 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(52116002)(6512007)(478600001)(38350700002)(966005)(36756003)(38100700002)(6486002)(86362001)(186003)(6506007)(41300700001)(26005)(8676002)(66556008)(4326008)(6916009)(66946007)(66476007)(8936002)(5660300002)(83380400001)(316002)(2616005)(2906002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: f05nYZOnZiXz/e6O4sEv4jb2I7ZBejkHGoeGt1lFNb1BluCcNBAPxnCXvvn8e3oUQpZGhY6ODxUqRcJuHOaesY3cgZJZmqI9StA8jM2bNsrjAnsz7o0bcO1MELz+8N/wVnRG71hdbz8Y93IHF5l9uS+69jVokrRBd9trOVtu7bwTFB2Xl50ooCZE3UpOY9cLHkzA+SdcITatN21QpqodziaNYuTa+eCDQjE3IArgTTkMedeNk7B1BZz64UPZqQ2ph5oF6VIP0Jhp6+j5CIQ9El5Psnl+ru2w22RFsr3Iey8AtFBafCLsy2bfOaHM3V4ngXfksKaxLVw+qFTrAiDxd7wjgiPSAixUU8IasiMdC8fUj2bCNkOSP0X1/JJoAijkM7r12krao1A3eXs8uDy6dphANvaRUPw5d+YhMnrFBYTtIgAjVrEtswh1iEyF1VtQZprLAtvMnMsm1HW+7eJirSCLPkurobaM4IraT+KkpNoRyNZRDXkpqr9lfP6/EIn64rCWyY6G1hQX/t/xXTstIZDvyHSZ1YrkcUAPT57vqq/cF76lZxSDH19z0X1RhyWIDWMvvi+cDjhb/TbhFnmoU9O58ldz/bX1f+ZnhEtPzxZ3qtt34N/g44/jszS8ry7kn4uek94UxBhc6oE0mJkwWbAGXg/Gn32DE47bZq/cVtJc9IwWxcnb1Q4cb8suTK7ppzTOU8ln8rwMcOsQlV1rGgZOvFeURGyse7FoRiYNhGnz75rtgcPTrpwjXndM3Ku6oD7Dx78DihgcDP2gNuoMCgM/Dq6lv5+7O4v8gTGCL7i5uUOa9NbTYy0SMqFWZEVwBsI4bMM99Pkl8hxl6t969a8WNLppYIreZ8iIFEPqCZf7OjlDE+CYcIXBDcBkZfNsXFzn2uuo4Phtdu2QsjFlxajb7VG4Q0b/Z4MjX2LIHOxKJqtxp3Ql5RMeQoU6fWzNIa73b10WkeMeonGngAbI1dOBNW2kXMOSyRAAFk0U0lu2gGzQpvEiFZ7V3sgR2Gz1zdKxAxl8+SDeUUBFCJf6rhawn+De73kjsRj3sBwLY3y5XKb5Ji99B3bqd5fDynF+oG/fjKZr1CTj0ySdKQycG2YQjN5sMHjPBFzPGeT5TjbDheiSoA9zX9y2Jo4yT6w6da4AtEsLa+6uw+3Q81utjYqG9l0Zjbm/Q/HQaQ8r/4jT1b32LdJLBLU8ikkV70QXEe/1RXfzWuXbaku5Xx7fmJrbV9p+8qlgkYv0YSOdaPo18SSAdKV4UbST/PE1Smf6J2Q0Ilw7qUSd6KGaBC1n68pUhAbs1Lr245RZBk56SFUjIYTNdtFpshM7viivxzOC9avU7npZG0hz6TKhopKA7U/Rhuv7WhDKPeX3K6Exrp94Cq0ksQYkhKi75qio7Tj4+pCLxcSLmASqOyOINAhQgldVYHAIokDfD38em3K2IQOCROAD0qsq8wzxIAdB8oeLGkomDgEKT3FqT+qDC1buOtADt74K08DVexX07QCmO6a0gjGJK6jCI1WdvI/u+H5U6u8L7aGUORsuj8iVYcTaLwCV5eSEsIRG+6kadgBKETRqeJgc+ces/2ROtz45jZ6o9Hw5yq4z/vETqevjiB1lLITc1X92dn6p53YB+FYDJfQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: eeeb9f7d-72fe-4cfe-f0d7-08daf50a7a84 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 02:04:18.1450 (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: sQwkjxkYeSA3nxmwF9WnaBww2fg1lu/BTTTJlbxDWxdh1Z701ZxRVhgmblNqUMol560Ry5qSdJJ0X7cASul4hPrRcAjUX6PElUzviuEedMKUxc2Xz5c+CX5hEfIc4VJz X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11239 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. Link: https://lore.kernel.org/r/877cyupxg2.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto Reviewed-by: Geert Uytterhoeven --- .../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..2010e8ac7fdc --- /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 { + + rcar_sound,dai { + /* dai0-1 are defined in ulcb.dtsi */ + + /* + * (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 3527d538a20e..afc63d28bf5c 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -447,6 +447,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..751cfd8c5257 --- /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 bc0ed53c89f4..95d9086b92fe 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -493,6 +493,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 Fri Jan 13 02:04:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13099657 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 B179EC63797 for ; Fri, 13 Jan 2023 02:04:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230443AbjAMCE1 (ORCPT ); Thu, 12 Jan 2023 21:04:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232583AbjAMCEZ (ORCPT ); Thu, 12 Jan 2023 21:04:25 -0500 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2096.outbound.protection.outlook.com [40.107.114.96]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B093621B1 for ; Thu, 12 Jan 2023 18:04:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aZ8791P6f4SiY9BDGX2AwcWl7YJ4kowwGJNQoxuKH77lK+akQ5I/LDJE+aiFeOw/4OyGwLK89nkC9i5ysLzo8P6dwxzfqBd9Ra5XPKTCs84Ytw1h3yakeOoq/MslkvJ1LGUqGBZ77gztZSqbRvy0yHVON5q5H7qjEaQun6v+BRYCI336LqLJr9abFcLkNC1x55ijo7M3URVhyf/CyEo5/SlS6d2HT835V0LtYExi71wn0xdQChG/D0zl8pgrX0UdxSkbMUUtzEjL2hyOPgnNerBd3SY6XXh7jqTqC9pXwBw/agHx7F0V++wDZgdGOlJ3uok7q79l+d8OoZ1yX88CWQ== 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=4RmOWQNwoAa8CxRMpMT+CrEDrVp0dfSYOiQdJ8enwfM=; b=i15kd6p3W4xv88av6D+Ya4ELZJdtnepIo7en5xyYvi8MW0nowfAbeyBxlhRZIOu58fq8m5dFWljOJHKakVpBWsz6AwA7KtICPYIU7r2T4EjB2DvoYtfEU9A4TOZEg7VCq81IE8d8YfrvPgYXgfPny8rHfbuJP/53J1tqWhn7VcWizvLhY5UUL4V74cTRQqiYkElcDWg7r0/mbp7DB05f1UyhmYE58nPWKRSGdM/ENIarBzYcjbVhRxsrB6NTn0aKjg3/cwfj4roJcfY6KFX6vwjoUyLIbTJLRUwZGDXokZFp52oTreEj0stqlyKDa3GYhfU51Fb5V3ER3gjEIhdpTA== 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=4RmOWQNwoAa8CxRMpMT+CrEDrVp0dfSYOiQdJ8enwfM=; b=D22/soqS2ea/VeDS6kkcv3+pfpRQXJa6oENI69fW5tAR/5CE4Ri2IVK9bWx7gx+qEehZrm6icoQcQTUwfCvEhIUDs5eRwcWhBtSnsgX6YFIVgUbfW3wnSSGQKyxn2MpDDeecWRH6WCmlYtZCicFRe1FIY2NGQGhwfrBGtV+dvUs= 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 TYCPR01MB11239.jpnprd01.prod.outlook.com (2603:1096:400:3c1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Fri, 13 Jan 2023 02:04:22 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 13 Jan 2023 02:04:22 +0000 Message-ID: <877cxri40q.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> References: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 13 Jan 2023 02:04:22 +0000 X-ClientProxiedBy: TYCP301CA0003.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::9) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB11239:EE_ X-MS-Office365-Filtering-Correlation-Id: 277b7c18-8966-4867-f1b4-08daf50a7d0d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GcpmUqw6fP3Tu4xE+Q38Sb1EACoXXSTOD+v/D8tjQdloLBvZQZYLK+RUo7GUlQ7gbnuSWjPApml8EjjKOKKvA3W/2PdwSRvtFCyWyySXG/zIOIrjhNBUwczzx8gyFb9siSrr2aMs7t94XWaNAibcpcsYQjFeuf9z7UXq+qVqqdEkuD9ewKK8jdiggmoTauFN/1hREIy4GCwa7UvEcpRiOIZpcLqtND0EThhKtLO6ZT9KWpI3XgZwBCq4Ldz7fK/UuXDTl1t2iXp2V9nlvQwvQVw5ARYK2lT/pZK1+p0LGaxJIPLsaTWcgFsDy+UkE7CLAQ4OQ1xagz3HwUPorAxV9lb47Cl0HaDbWzG4flUeTK7F+xXcH6Nf7o99XLQFoKsquyfYsYCKn4DzZMfgrgClnVJQ6i5i4yLr2LJIBAs617UrLDNnmiv3u24LcOLlihQt4u1cNiQI2jtK6njbMRsa8Ix7NoqwD5CpxJNjlyvZFMtjvLlJLbTMDxr7EUyZwf0axPXnbKH7X4yt8KT0IXrXRGlfeqbSSuTAMhQ5auYE/ryGpLzorYLovrPsVIdmBCL1nf+Bmn0yjL4UfNEFHTb1GswvcXj6w0fBXBL6EbP9j83fh6mxBdf0Tuv7ukGZ19/38MNoyoT98c/3+kdNEpDmDLckrhyqFka02sjQv1qVcR6RvW1CXDpgo5lJqnf/bhbJ895XWfO/gySildvx+nudw/l4yRBm8Gl/f81fPc/Wa+9wRSKYQJ77SsqRzi/SwUj7 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(52116002)(6512007)(478600001)(38350700002)(966005)(36756003)(38100700002)(6486002)(86362001)(186003)(6506007)(41300700001)(26005)(8676002)(66556008)(4326008)(6916009)(66946007)(66476007)(8936002)(5660300002)(83380400001)(316002)(2616005)(2906002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5B/yrJ2+jl3lVMnyRBLJdm0ibBTPVoEb1E6NMLuPf/9wQoJtjMXs2tLHV7n4sMlGnm/YkEgAG5R3+pCV6PPy1rfKZoIFjQ9yrtSStoqfeGoFH2c00v3gD5XrVhQXq8fidJ3lmKenflS/pAA++SuFiFi3ArcN+9Mq99yZvgp5vwv5w/1AwEcUuy5MZUvkKmu8GhSbrl5Odfgh+RqhLEihHD73ReT31/i+vrRLGy/tMxo/B+wxeo9ESKOxCBqD35RBbD0w2s7oMjs5HzkeDYfutEEwF/WifKLe5Bg3TNqUaZ2CwbgLoo2bqAngja7Zp60hMdxSRBnaq7+uE9XfKAGpaOElZ/caMlsjg/9Uy7Y9K48chiiurwpeEvNhsUiXdFFCm7EBVxgp7ggNwKu4l34rjHnHKmZl0MKcq55b1UqB7dfcdap/jp5lxBpTWDImRh4lYOfreSffR7/d+Pn+Vqw3smrJu3CxGTLyAsDdsCVR1s3+A7AkEZItg/mnvIyaJyaAigDaj+KTAE21LsUKFGf9YMacKng+6SMFBHH1g0uZV00YBMBgpA6/RDCwJ8LEVDtBg4+NqemDiMt9J4duyl6k1HrrQcc+3VTk6vu07lzYv6ZHWbBtssajjx7FREgBM+c4nqUoHBgakEt94ybRKPpkY730ZQGUa5FInh2/Mm+W2fL2OjBFs+zfoK0BOrjmodkj/Qj2dtqT3BxI0/89P3x4AbvrE7NW29ZwqLUC4mheLDlfiEOrM0sVt7qLcr887QGqEbS340pMrzDlH3+CFqMuHwpILUa5i1OOds9GW/R5EkcOMWkCBc75uQ/Xme9D/r6hI2pjeRJ54oFXlqOmv0nGcTcP/8zy4EIM0B/4yue2ZeOu11A1NUQhU7HmP7yOso8NtUuB4xuC9xl+YWGrpNFyQjb81kEVPxKhoWf3b2eHBTU02bFXSjbYy/vlxwEY0ZDbjcGFDv/d6W05szweqH/X4WrUzyImLOTifxNjoJjOipyCfhu2R3JguAeJ+T0yLj1r1IMlgUai1P2amIstl6A3IiLw+gTkrg9eAMQAGsenuHrIvv11nWhjc5Rdd7/tP6DG4TUWTQbymseh61GSK4gK38LRWBz9+YKLJ3KGmsMNiWAeMTkQ2L7W+FfMnqT9TWErzy94JQg9uk86Va0JjXT3/SvMXV8X6hdX2lYjMTuQO4AfAvxlgjZXVIiEFdBi5+7VtISU5p/uusv/rQL46/S55slTopH9+yiZSMfcgQxBV/BftFfatWdGiKwRwzGSJ36hCldUslmaLKaWKZkqiLgRu4BxtBej1lgM9g7ir++wCvkDqqk9lJVdiYfdj/nhGybpb3gnwCVI9mVf74xgcTAdXvL8L2D2ltBMk/CSFdANMM57/7gZQEeindoxhWQDznqc5UJJBey1rkVuA+wKuKgu9rzkdpmM7cwK6KyFts3uOBDyspFmdgf6R0kZb4NQnM6H+u5MYrvbcEehxnsccBTDpuYtBf/t8JtifZCAA6UVv3vmohjyVn5nY8oyTzCuC2n1t4Q0rwzeOGn7+dxtkTTncg+1D/oybBL2WOlb4ZJdbBJQZqMJqimsO340I7lDHm7cRouDqImfGBWvFbi4uw7FxeXTqf5Fz52Y5+qEa3JIWMQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 277b7c18-8966-4867-f1b4-08daf50a7d0d X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 02:04:22.4296 (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: JXjeXFNjd6Luk/Zupz4SvFyUkrsNiFgn/K8neEnqzQnQcz6JzJyv0e+PvSDyB5Q4JuaWpYG3NZ+dD6N2IYhVH5u2qF73o68NrDt74W5PXNsSER0eiUkK/a5s9kPWaEKJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11239 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. Link: https://lore.kernel.org/r/875yeepxfw.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto Reviewed-by: Geert Uytterhoeven --- .../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..197e045afbca --- /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 + */ + 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 + */ + 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..bc9b89dc6eb6 --- /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 */ + &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 afc63d28bf5c..25098efd6b89 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -449,5 +449,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 95d9086b92fe..bb93ba4ff946 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -495,5 +495,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 Fri Jan 13 02:04:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13099658 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 F0C30C54EBD for ; Fri, 13 Jan 2023 02:04:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231372AbjAMCEc (ORCPT ); Thu, 12 Jan 2023 21:04:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232816AbjAMCEb (ORCPT ); Thu, 12 Jan 2023 21:04:31 -0500 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2131.outbound.protection.outlook.com [40.107.114.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CABA621B0 for ; Thu, 12 Jan 2023 18:04:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gyDltEmzOGAdFse6Bq3YU1TvVyTy3kIyR1ASTFpyPscY7Et/Vt8eXJOF2eFzH1lKC394pgSjVL/smXtk5NjdnJWC2dtCzfHz7DVJjQpHukOAWCKTXZ6texbbU+gVF8lf5g5FMUJ6VENMDj/06sSJulCwNV5Y7GSjVejNOQkv1t9s9TeyrRWzthmaKOrepeGGl3gwRExiDz5CBdywawH6CDlUGysHOQRkU7cJqk0TVMgT+RT96pNUCAjzWaL7vKoeJe59Hm7C4TdiQ6Qiq8d49rwozyv/7uQoS7+ofSWXbvZjyDc7E2WFO5sIGT71yezenAohf+Iykra5jIAAkdWW5A== 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=PqU1SQZ7FdPr2nQf0m9K002XvjOQztbsfvPFjITIFVU=; b=IKNqQa9mOLrF86i+iYII1S6FXsGPuAY9bMHS1sFWb5CR4IDAJiKOTiEHchX2rccBaPFBK+ShDZRXWAeUUr+hM160JZyuperqVyY5+5DG30nzP+VctLDJ5SFUjOI6kMdXQyXMeevqzRgN+00xwPmUtyN7ukKO7frdVP0/FrKBl5v3yFMwuxGyiqEKQ73fPGNW1XrJha8AkBDbWq/rAA8bEGcpS9rsKLxNmMsQnu0MIj+U4yRw3p9T/8xu3P9C6DkJ0E6lbWgaFmDKZPpIykPg0cNDitn/Z/uTSus0ahmKNLAfhHgTMYvI/B5J6GXyIC9xcWj2LonAS4Y4RaT8tutsrw== 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=PqU1SQZ7FdPr2nQf0m9K002XvjOQztbsfvPFjITIFVU=; b=WCSp3ZrpR4ALN102BYas3NzlvGg88zG1bsxJNDIOhsLBbiDQaneGmQ0kjCTJ+P1INo2ws1dKgv6JphwSjCj3Ge6A8fgM1d81dzDbzfJDy5hdeioh7eaMFyvXieMfh+05Ag2EoKkZJFUe2aGo6S/eTYMEmeoPmALwoKuH2voBbtM= 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 TYCPR01MB11239.jpnprd01.prod.outlook.com (2603:1096:400:3c1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Fri, 13 Jan 2023 02:04:28 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 13 Jan 2023 02:04:28 +0000 Message-ID: <875ydbi40l.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> References: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 13 Jan 2023 02:04:27 +0000 X-ClientProxiedBy: TYWP286CA0025.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:262::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB11239:EE_ X-MS-Office365-Filtering-Correlation-Id: 4dc6729c-843c-4bf2-7313-08daf50a7ff3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VVwZsschN6Z5Q45kmiuJ0GXLQWPP7Z+5AONCPVWUIwN4qyOga2J/ha9zatNuoMu9fCk05KW/B638Q2iX/+mKVAVvPyTC0CPhrxvvnFxxo8AENTI+kH4aqoJvBGEnZMuiKT4b/SzEnQgXtd2Hgpo5on5NXUmNENYwKIB2OHp+9nE/PWv75VJ53rUCdzgk0mHluFfNP929Kh7utIfuUn9K5CLMvUvznhh3xgMO7R6rG4wOpGvh0Q/5nCLKbv1JxObxt10mkwH3F2qqI8YvgcrZd0n4jYaLVCPo0x3nP+J88nK842ZNXRDzo9l9KnhJt6v4o08VHDsx9bPUr4TBd+i86pK3ok3My0KIJg8tATbHffNS+mVNeYQtfqy1DAhjDpqbyZA2sSMECd3+M4Qsd808XVI/FBsob89MAdhFrUzBtZ07EwXfSnucrhAvPn47nQ18OOPYFS5Dini56NS2NzWQk31ZKyfPd3k6mvwFjM8B1ukzNGeopKNkz97bKTkd5SlDnoveFUWdJ4/4xzFftmiAo3R8/2f/3BtQwtLvr+ZlFxEZk0eYQWtOvJgvnV6BseM6LoFt4IDHAu+xeaF1FLI/JCOPbI27N/DgWnXFh6oa5fxU+C0HSVn/JS0f64jWUHXhDEYjzGqEc0MV/OU/TAhAhPicXSf8yEjrf7RPp26PclhRcknpvAm4QJxfXbog5o8Esljld/5mV0Yu87RdJbO9KUwM6n7zRi+qlj3+TwmVXBFl5v8jduQqr5T4bRPPcw/B 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(52116002)(6512007)(478600001)(38350700002)(966005)(36756003)(38100700002)(6486002)(86362001)(186003)(6506007)(41300700001)(26005)(8676002)(66556008)(4326008)(6916009)(66946007)(66476007)(8936002)(5660300002)(83380400001)(316002)(2616005)(2906002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ThQOZvCeC6IaoqhIbn+5UA333lswD+M6I6+p/kzDgyZ7Pa1M0fZOhMJ4dowxkbY0GiKa8/Jk17kqyFrL585hXMVHrHXSEWHe8hc4VZcDcrQ6sq9Mu/d77AffpLQmGbDpMwpjEyFgNp5RT0Gj2+g2afgCH/+Pw2Lb99D3JE1hnSqGcIRVA/nW77nIyeeLVTQo++C55MP1ng9LZFYD4tQkF798LjvwvrPrS8NeeczAFT/9Bnq1z1vrsWKRCLXltl+PSnCNnB9w3fSeIARqVeGHegQOGhLnAsa1tnfzfkYgjEDTBsmQELEFxzuUqF7jZJBjeZRCoRcuBAaGHpS8Dp75fexArNQ91g8u7GuXbRML7uFRMp+QmivCKyYzd++EhRuukpGRs7etM7lXJlpWGpgUJBfSMnw0r7Brb3ri0nvEchLvg8JfuqXw/I6JpY+9AkwnVRJkLE5i5NFnw8zo8v/YbKc6Rwj796bzSovRIUnVhxE6xYwVU2do8NiBCINvdSo76tL04J5d9GCDyxpf1jrktFmt/RHtDBxBdBKfcjmVqmHYUkTNZ4kSOMF6/Wg+Ka/GZH/K3dSvDP0wy00qV742MNysrc9bpfQgpxPDu9hTjhZ3QXX1eNadTAUEFV2GUgAH6gAspqzy4y6H/+UNl09ttNzhCwB5PBrFQSqcdbPkJl7SHKSPSBxqsCYF+QqV9Hch7VMsyHO5ANYLEJrC9OAaVuTHdaCC5skOLFjVlC2+rH2YM7Wd92kmXePvQYZbQQU/dfYlXGVR4KFjdnnKUamCuIUg1ectBXi2tj3684vyg1FP8+jcfSUPjI9qE0vBnR9raMmneP2mfE+4XY2q5Eh0TIXARDb59HhCvT5vthB6pgf7wQWsy2/XxEC1KqhektuYAR8i7U34L2iGbWm3tW4A1JwhQ97CmVBwC0aWdECkydpnjXCi4rfxL06wXHQ/hD3JcKMnn5bRq6oQprTiu4+mWSjL6o+BZgOXsDUi9PcrAT5aCeIeZhRDOJ0cxYfzEiGcPhnQCN1yN/DbxQNuAWTJtlIh80/b1x3oxs/+iQt27MqJ149v4UCcI2L71EJu7TBzVmGxK9FZ1JpA78LIiVRl16vjZjes5eWc5O+aOtxhE1Bi+MO5oJswmL0SiW2uwo8UJ/pFye9SoQm30ECxN0NN36z/O6me6vvNWOxn54fZQta0xzRpU6rny9LOP96lgGJVQ5U9wIzSVwPcbMVPeLYmcu5U/djgEg2c4Ofvt3ronuOTanxb5YhRgJVVcl0/a6AF0xZTs/tKd/yePBsHS12wwrRHMCm/71+0LsNnqBLnBw9oewuka5HbPK+BR33AlPlGX5t1R3DeDhIWurtqLqvl+PbhMXRRqxaRtg2AUxCM/WzB7uMFwB5II2bRXb4/ODIYgxDbi48kIhNpAGmFgjRsTPMXbkjdkjwlJliLwY9yzgddwX1BLg4+rL5ycf3piDwkE0QlYpo5nkTmpQjDsgxk6G761PPwbEHWr0uCEYbAKA2feY6J2+KkVvS2OuDVkEXAaA0PYXIDvqZLcvLEl4Z9bxtMVLX8TJ22bCFkhFGvavhID4OUovgZx8KPaxsPZLYpTRi05A/nFJEoEYiex/QNAJmvfPXNWhbs6ZMtJn4XAsc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4dc6729c-843c-4bf2-7313-08daf50a7ff3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 02:04:28.0234 (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: KIygt5hi430W9QiA9u5ZyrZE7UJ5qaiQ2IkL+rVbm404hQ3LUOlLwd/TnkhQRy4RetNM88qx53t892bk27FEur0PEldq+H0hiEPgkx+ANZM2PolT7L6b4IeWWDivt5jl X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11239 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. Link: https://lore.kernel.org/r/874jtypxfp.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto Reviewed-by: Geert Uytterhoeven --- .../ulcb-audio-graph-card-mix+split.dtsi | 91 ++++++++++ .../ulcb-kf-audio-graph-card-mix+split.dtsi | 170 ++++++++++++++++++ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 1 + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + 4 files changed, 263 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..88daded1975b --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card-mix+split.dtsi @@ -0,0 +1,91 @@ +// 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) (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-scu-card"; + label = "rcar-sound"; + + routing = "ak4613 Playback", "DAI0 Playback", + "ak4613 Playback", "DAI1 Playback", + "DAI0 Capture", "ak4613 Capture"; + + dais = <&rsnd_port0 /* (A) CPU0 */ + &rsnd_port1 /* (B) CPU1 */ + >; + }; +}; + +&ak4613 { + port { + #address-cells = <1>; + #size-cells = <0>; + + /* + * (X) ak4613 + */ + prefix = "ak4613"; + convert-rate = <48000>; + + /* (A) CPU0 <-> (X) ak4613 */ + ak4613_ep1: endpoint@0 { + reg = <0>; + remote-endpoint = <&rsnd_for_ak4613_1>; + }; + /* (B) CPU1 <-> (X) ak4613 */ + 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..4fb3ba08a585 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card-mix+split.dtsi @@ -0,0 +1,170 @@ +// 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) (X) ak4613 (MIX-0) + * (B) CPU1 (2ch) --/ (MIX-1) + * (C) CPU2 (2ch) ----> (8ch) (Y) PCM3168A-p (TDM-0 : 0,1ch) + * (D) CPU3 (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"; + + dais = <&rsnd_port0 /* (A) CPU0 */ + &rsnd_port1 /* (B) CPU1 */ + &rsnd_port2 /* (C) CPU2 */ + &rsnd_port3 /* (D) CPU3 */ + &rsnd_port4 /* (E) CPU4 */ + &rsnd_port5 /* (F) CPU5 */ + &rsnd_port6 /* (G) GPU6 */ + >; +}; + +&pcm3168a { + ports { + #address-cells = <1>; + #size-cells = <0>; + mclk-fs = <512>; + + /* + * (Y) PCM3168A-p + */ + port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + prefix = "pcm3168a"; + convert-channels = <8>; /* to 8ch TDM */ + + /* (C) CPU2 -> (Y) PCM3168A-p */ + pcm3168a_endpoint_p1: endpoint@0 { + reg = <0>; + remote-endpoint = <&rsnd_for_pcm3168a_play1>; + clocks = <&clksndsel>; + }; + /* (D) CPU3 -> (Y) PCM3168A-p */ + pcm3168a_endpoint_p2: endpoint@1 { + reg = <1>; + remote-endpoint = <&rsnd_for_pcm3168a_play2>; + clocks = <&clksndsel>; + }; + /* (E) CPU4 -> (Y) PCM3168A-p */ + pcm3168a_endpoint_p3: endpoint@2 { + reg = <2>; + remote-endpoint = <&rsnd_for_pcm3168a_play3>; + clocks = <&clksndsel>; + }; + /* (F) CPU5 -> (Y) PCM3168A-p */ + pcm3168a_endpoint_p4: endpoint@3 { + reg = <3>; + remote-endpoint = <&rsnd_for_pcm3168a_play4>; + clocks = <&clksndsel>; + }; + }; + /* + * (Z) PCM3168A-c + */ + port@1 { + reg = <1>; + /* (G) CPU6 <-> PCM3168A-c */ + 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 + */ + rsnd_port2: port@2 { + reg = <2>; + rsnd_for_pcm3168a_play1: endpoint { + remote-endpoint = <&pcm3168a_endpoint_p1>; + bitclock-master; + frame-master; + playback = <&ssiu30 &ssi3>; + }; + }; + /* + * (D) CPU3 + */ + rsnd_port3: port@3 { + reg = <3>; + rsnd_for_pcm3168a_play2: endpoint { + remote-endpoint = <&pcm3168a_endpoint_p2>; + bitclock-master; + frame-master; + playback = <&ssiu31 &ssi3>; + }; + }; + /* + * (E) CPU4 + */ + rsnd_port4: port@4 { + reg = <4>; + rsnd_for_pcm3168a_play3: endpoint { + remote-endpoint = <&pcm3168a_endpoint_p3>; + bitclock-master; + frame-master; + playback = <&ssiu32 &ssi3>; + }; + }; + /* + * (F) CPU5 + */ + 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 + */ + 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 25098efd6b89..08242d3dee3f 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -449,6 +449,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 bb93ba4ff946..172d065d70bb 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -495,6 +495,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 Fri Jan 13 02:04:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13099659 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 2EF34C54EBD for ; Fri, 13 Jan 2023 02:04:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240575AbjAMCEj (ORCPT ); Thu, 12 Jan 2023 21:04:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240368AbjAMCEh (ORCPT ); Thu, 12 Jan 2023 21:04:37 -0500 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2122.outbound.protection.outlook.com [40.107.114.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8BC9621B0 for ; Thu, 12 Jan 2023 18:04:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R7gNhEnfypTsqw5QXNaqUmBXwY3yOjiROGP5ppMg/HkElzAkGHMgQRrD8Ak7CK2oZ84ozSYNqIwkEQ08b7uUkdGsZCOdxjgigA2fV5N/sfUahbqR3oAr+SVdeEcxj0nJvhC7W+DuDVThoQ4VJvAERXYTsrK18peb7IM0guKdUKRDcIaksXMPabIs6bcp+l49sqX9oU11e9v06q2rHnbd0EELGHwpU/ErtfAmrrYIDsT4Fn0HH5b68oWFigKieeHMCwgiR0K9vuCQ2AyJfAlPdbQciLD6QsUV2X1j57a3b4SqepeFymVtd4EAk6a75wveO3V90LAUd03BSTQg64DPDA== 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=R3eaw0oGLpFUuLsSgtKkA4rA/v+mpgwZyK1zRB1VUmo=; b=JxrmlccE9B4CUKHCPgdoKDurmq7jo88unHk39xng8CPq7PNHNDWc87nkGHGLVZVLy1uJU7AXgZHP7pEP8XgcvbWECVGufGZvrQoTXcVwNHlGECuZWf/x7QxLc6OJfZP8VYrunhQq5VYIqdiCTVIpb3/mTfcZOip/JceG9Fh0uXOaiNHMOaIjpRb6IDITvcNLrmrm7z1iRt01Ztw6lwjonR5l1mTNq1eRY3TXGFi5yCmeNGkD4FAnd6b9z2tG9scyMgMdM/DzM+jJGxkORn4durW3AEaC5wO5qeDbgW1nlsxRQeZ7zJXTETAzVS/ohUj+4pYfUqraqg9Hp80wLZwGMw== 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=R3eaw0oGLpFUuLsSgtKkA4rA/v+mpgwZyK1zRB1VUmo=; b=Nmd1YfLtnej2SJ1nvOP9BMeX+bYUh+JyycWNlRXNqKcxNTY/+FgyJ5uYVUg4PHhY51NYPUOIQR+mSDsJ85235zPoaxjZNTrDafZ2CIiNzPI6DmKKoPwxIHbBqzHAIxbOSuW36LQe30fgLg5C8Rzt7yJIDnghN0VBS4vguVJjCKE= 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 TYCPR01MB11239.jpnprd01.prod.outlook.com (2603:1096:400:3c1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Fri, 13 Jan 2023 02:04:34 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 13 Jan 2023 02:04:34 +0000 Message-ID: <874jsvi40e.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> References: <87fscfi424.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 13 Jan 2023 02:04:33 +0000 X-ClientProxiedBy: TYCPR01CA0060.jpnprd01.prod.outlook.com (2603:1096:405:2::24) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB11239:EE_ X-MS-Office365-Filtering-Correlation-Id: e9709efd-13dc-46f0-c738-08daf50a83ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6BPZa8QrRXsfrLWzdTjv3OQth62r+XnavWTJwV/xFZumiLTiT7/JXBzB1Y/gcs0FGSWIBEkMiqCw2n8DodK7FQeGFzIK40FHbCdniDe80teChbsrOqIkxZaKAlPP1RZdK8irRPp82X1Rf2TL0vlFjqGEpg0mbRe2wEF4AsPvncy8jiaeDthhv0YIubYbjv4RanrJ3zd99SaxsyqlCtK1853aughOJWcg+QLZtbstJ6n3q45wF76Q40lzvy8N0BXiQDqqahwFXZcByDAzy19mwATGUBxaLWw36kyfykswOHcuXeEnw+Hz7QDK7G94cELIICHweDGcls7hlnY+P7jZiMCV6ENjD6qUUeqwz/wRDT5voWZsw6ET1j+DKp/QSUKHfCCCZ5jcEYbyqY+nz8E+pWV+nTzxQ8vajrkrQXva2bobBpZFJwsvjAoqKzlceFByYUzH99CDtMDf6otUWBw0HATLNQbkC3X0xypBiJb/pJcNj2DIMMyAkBA3bZf63xKfGwaUqLIIj4Ov3CPqxuvWV2P/KONCWfuJl65RITOBfCGIwIPBLuiTJxvcGUO1Q1p11DBFQDPzCCvPTWrvUGeZOOcyccDFsz+BmxBzYyU9P2jmtyhmqHJxTSAOC6y796blp2E28pmd9dzsGE+PYHrpASeT1TqBSfwwW5j2tMVKE+jeFvJxP2tnXhWDSDw1f2u3tbAR3llWwslLBkkOb6hAI4yYDroHoqf1a45q3BhYlcXJPTy3RyopYSzbBbZuO4sr 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(52116002)(6512007)(478600001)(38350700002)(966005)(36756003)(38100700002)(6486002)(86362001)(186003)(6506007)(41300700001)(26005)(8676002)(66556008)(4326008)(6916009)(66946007)(66476007)(8936002)(5660300002)(83380400001)(316002)(2616005)(2906002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PmdkWPbV8FrZhrBgCd6Vs8pyMiBVuO2WdanGL1Odi4rAdL2Exd8YY76Gr8PJm/4qgkqukVOkXEtlkFfOfSa44S2617nwnOIwOkD3epys8VqrOs3lSmu0P9AHKXNvqB6Rjqi/xE7ZV4OpVsMOQ1R+WfE9C9uNAzu06jA0E3ZWDPvwqjpcJtmRjy0L/TFXUZc+1KQhY/psWLZqBDij3BIfk5Tdpnxa21abhFjYQ9ePdhha18Gl2sdrkgbMTH33NK7WiTURdTkM8Q5EVzT/XgQLS0YCMNiZVd8n6o0vMj1egrpDlcXc0TQe7jZtfhqSwD2yVsp449Go9mrJYkhTPTv996bt33hDP7v618Xbfz3HQIldFByAHOjzFStsIEqe5lQ0Phv/gpcJm6sqCBa2KCvXqxHsuqFivFnA6vty7my98ZsPEKxZvvqVRzzxfUEWS0I46JCMRumAnmuZ5+e8+4k9f3IfD47vv/Stk1ZW/HIwUfRHh3aMlb0o43xcXnkyi5+XRATCqxz7aBRCL5Lm0mCaAw3HPNJwoXcKAxnH+CiZj4TSv+PXs2BnqU91qO9zYdTnFxrddDmi9jfhLcaQwg1RSCI5AA/ylIy3NysQ5LgjluGAHq86jL4zVkfoA0WiMm0m03bteE1ur5iO2BK8jG70RgZwbisqMLNm41W55mW2OMYEflV20DzLbPTOek0qFud53eoiI3FMFuq2tJQvRDrkoTzXpRZqXC0fH9ZRZuw5rZi6sS6kXu8E0wX3r7NINxPylmVzNZ5g02nU9nqoBxR5L9qoqWiiu97w1vnqiMB/BtRstHj0Q87y+xKf1OxakmRjvRUsEy7qa5d4f70aTtR7eHRGkdU9N5mLcQ0JVUxQvGs4pzKwldHXXlQm6QnIF37WsBYYBQXHXNpifyrGrPJndBYufZTY0E3wJfrZ8e2/rbe4yFxs2e74fP5gO81BC3/6PTm5AORwCt4R1FHagpCr9FXyGqUiG3REYzQykIUd10wzWNmSCg0TzrMl74qensx7Yz/D3LFx6LifJUwKCL5LO+9sFdEBfOCLGmKCiLU+Ak2Uaj7nBfx01oQ0et8NVaNRhVDHNrJSKea6en94ZbXjon3/EGdBCW0CoJ/5SDwzCI1FXgJwEcT465QOV8aT2v6OMCL7JfN2XiCGemtld37izOiOqLM5ms9wldwmsAKtih0A10A/RE+qpMmmNB6tXliXMxhwjPZ8Gldy3Y6oCedmMlmv6coj0Y1Rm04BdpwgAWSfdxo97LSRm362zFqMsc6nFAFqABwZJGlAkj6BFMZ8NTNWXuaQMBBhu9lZZwJE+cbu8DNocSkb0ksoZePlrs4DqySCJQej757vmyS6gjuIZxxGkwV4YtbK3Q+l7LCw9Y0DwMfLqlgKpcpbsIKIGux/lJo4rjU1AsKIO3HTfSuesYorxK5HKeN9C/oBF/maw2TQzbQx0Z4p3GhgTi0QMEio22FcUxb1oYOGPcXdyqP7BGG+nG6CtzIAyIFDJixsLXc37MYbztrQ2Fvu/W9xVX7LQ3DFDT8LLlL4PLETTdNRNqdxXWyOYbPvDqPSfB85IQ0X0depcIDnXmwmo7KpAd1N+HjOk4lJiC0ZXesz9STZJlgGjGoAcBVX1g1dQmNMRTQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9709efd-13dc-46f0-c738-08daf50a83ef X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 02:04:34.0853 (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: KjDosSHJ+DTh32snWc1VA0QuTuMujlGXDP/uZaRik7ojR7GazBIqP9vhyhEvkLtNT36cZnLgDyPqFVEAZw2JbD+x0wM0tVWlfozCAl2PdKR8MvugttgErYUyJsVgfWmz X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11239 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. Link: https://lore.kernel.org/r/87359ipxfj.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto Reviewed-by: Geert Uytterhoeven --- .../ulcb-kf-simple-audio-card-mix+split.dtsi | 152 ++++++++++++++++++ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 1 + .../ulcb-simple-audio-card-mix+split.dtsi | 89 ++++++++++ arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 + 4 files changed, 244 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..a7a4e18c197a --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card-mix+split.dtsi @@ -0,0 +1,152 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Kingfisher + Simple Audio Card (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 { + + 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 */ + + simple-audio-card,dai-link@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + convert-channels = <8>; /* to 8ch TDM */ + + /* + * (C) CPU2 + */ + cpu@0 { + reg = <0>; + bitclock-master; + frame-master; + sound-dai = <&rcar_sound 2>; + }; + /* + * (D) CPU3 + */ + cpu@1 { + reg = <1>; + sound-dai = <&rcar_sound 3>; + }; + /* + * (E) CPU4 + */ + cpu@2 { + reg = <2>; + sound-dai = <&rcar_sound 4>; + }; + /* + * (F) CPU5 + */ + cpu@3 { + reg = <3>; + sound-dai = <&rcar_sound 5>; + }; + /* + * (Y) PCM3168A-p + */ + codec { + prefix = "pcm3168a"; + mclk-fs = <512>; + sound-dai = <&pcm3168a 0>; + }; + }; + simple-audio-card,dai-link@2 { + reg = <2>; + /* + * (G) CPU6 + */ + cpu { + bitclock-master; + frame-master; + sound-dai = <&rcar_sound 6>; + }; + /* + * (Z) PCM3168A-c + */ + codec { + prefix = "pcm3168a"; + mclk-fs = <512>; + sound-dai = <&pcm3168a 1>; + }; + }; +}; + +&pcm3168a { + /* + * (Y) PCM3168A-p + * (Z) PCM3168A-c + */ + #sound-dai-cells = <1>; +}; + +&rcar_sound { + rcar_sound,dai { + + /* dai0-1 are defined in ulcb.dtsi */ + + /* + * (C) CPU2 + */ + dai2 { + playback = <&ssiu30 &ssi3>; + }; + /* + * (D) CPU3 + */ + dai3 { + playback = <&ssiu31 &ssi3>; + }; + /* + * (E) CPU4 + */ + dai4 { + playback = <&ssiu32 &ssi3>; + }; + /* + * (F) CPU5 + */ + dai5 { + playback = <&ssiu33 &ssi3>; + }; + /* + * (G) CPU6 + */ + dai6 { + capture = <&ssi4>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi index 08242d3dee3f..5b71c15c72f8 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi @@ -448,6 +448,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..767214eb2024 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-simple-audio-card-mix+split.dtsi @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree for ULCB + Simple Audio Card (MIXer) + * + * Copyright (C) 2022 Renesas Electronics Corp. + */ + +/* + * (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 { + #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 + */ + cpu@0 { + reg = <0>; + bitclock-master; + frame-master; + sound-dai = <&rcar_sound 0>; + }; + /* + * (B) CPU1 + */ + cpu@1 { + reg = <1>; + sound-dai = <&rcar_sound 1>; + }; + /* + * (X) ak4613 + */ + codec { + prefix = "ak4613"; + sound-dai = <&ak4613>; + }; + }; + }; +}; + +&ak4613 { + /* + * (X) ak4613 + */ + #sound-dai-cells = <0>; +}; + +&rcar_sound { + #sound-dai-cells = <1>; + + rcar_sound,dai { + /* + * (A) CPU0 + */ + dai0 { + playback = <&src1 &ctu02 &mix0 &dvc0 &ssi0>; + capture = <&ssi1 &src0 &dvc1>; + }; + /* + * (B) CPU1 + */ + 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 172d065d70bb..d693e879b330 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -488,12 +488,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"