From patchwork Thu Nov 8 01:58:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10673365 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02EFF13A4 for ; Thu, 8 Nov 2018 02:00:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E82F42D1A7 for ; Thu, 8 Nov 2018 02:00:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC90A2D1AE; Thu, 8 Nov 2018 02:00:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 616412D1A7 for ; Thu, 8 Nov 2018 02:00:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728552AbeKHLdQ (ORCPT ); Thu, 8 Nov 2018 06:33:16 -0500 Received: from mail-ty1jpn01on0126.outbound.protection.outlook.com ([104.47.93.126]:59520 "EHLO JPN01-TY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728379AbeKHLdQ (ORCPT ); Thu, 8 Nov 2018 06:33:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3q8mB4bbsmCESKOD7ddFA26M2FT06n/WqiiK2Wv94jU=; b=SA3WSu6XPnPd2FFQuN99R5nOO8GK2R1DAS2MK05qHUG180obduT6QeuczyZoqI9m6juMxG1Wxhin2DnF3f1IxPPYDPv/jGQpZgt4sqIo2UPrtUrbygY6P8Jv89/bWCes7e0plIhVnFkk2IOxcUIZDscpnxcQo7FRkETIl/hV850= Received: from morimoto-PC.renesas.com (211.11.155.130) by OSAPR01MB3314.jpnprd01.prod.outlook.com (2603:1096:604:52::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.20; Thu, 8 Nov 2018 01:58:14 +0000 Message-ID: <87h8gse3tp.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 1/4] arm64: renesas: ulcb: use audio-graph-card User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Simon Cc: Magnus , linux-renesas-soc@vger.kernel.org, Jiada Wang In-Reply-To: <87in18e3um.wl-kuninori.morimoto.gx@renesas.com> References: <87in18e3um.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 8 Nov 2018 01:58:14 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TY2PR0101CA0023.apcprd01.prod.exchangelabs.com (2603:1096:404:92::35) To OSAPR01MB3314.jpnprd01.prod.outlook.com (2603:1096:604:52::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e62a4cb-e42e-4be1-0eee-08d6451da4f4 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:OSAPR01MB3314; X-Microsoft-Exchange-Diagnostics: 1;OSAPR01MB3314;3:FTcOeBiVmfD6zaF+tdLaNvE+1uMnNjkXhi9Rezdj/475vZtGp5UAO8C+SsQ+1QmRiPuCNfF7av6hso5e27R94Km0uhAFL3OfW+fJZjyrtdrixVOoq8gDCVbxgQ98i/QDXQjp1aZ2krc9NFhrn/zcmh9QroARHIONg/5ZKpJtYJ9AhUqoI4q0EkMXAKOWM0X88pZCcBkPq/+iIGmP/KjisA84Z1mgBENwFd77ySrkRfzMk47uSD4IIPADF06BbkIX;25:ul4EwxivpL+bOAvg6mjoIsinOxW9PQ0GQomVhqg0P0uNx7dUgByUn/LqM4844UHkad+XJRe2KbyJiCysCb9QDSM2Tbtm8MKG1sPGXmWZBECTD0NPvMInZg9DIs7mBorrZoeTSLHl200LUPfQezZGJBSv0v/OY6VHW2niPF2dNgnf3lBDp4F09HdmuKqKwLhYsp5dL0VowG9ul2k7NceqESl8vHiORr3fIZnJS8QYNlybM2zkLYEL22qfu+yPxOWJyU/GGruRvKRsMeyGA7nzOR4GWMhQ46Xi9VZoLIMMWGsqw75vWGe1PVo32nmNmzaV5a3rIli25T9aDMvQ5OOayQ==;31:bgFAAuZELYChBwZNhQlqlpN/GA7GkY8/CKHlSVziwad3B7pYSqHpY2m6u8U0TziEUqRLMhjXEq9cRpBhpRoznE3lkpG1Aa8/ViebZJ6GjeolUTPNp1I+Q6E7ZrtijScye3RmQM2Hv78AlwMg1iLvKSrla8xv91R4fSwyI4dr4hLu8SiJAAQi9jXS3Bt3Anvz3odX6oGdLdWHqfxFgp3aq1A/9gm0s9tpjdSu/MqgCmk= X-MS-TrafficTypeDiagnostic: OSAPR01MB3314: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1;OSAPR01MB3314;20:sqDHgXw9kfIrQQ1nrABULM4PVH6rl0XSzsdlnKotg4kztfB99TrlN97ztHEonBzi2vrdjZzA2z1PC2RIPQxio7iX2ad8BUi6ZrK6joZF8uQl2VaQK+lJBL0cOmmFS0HS4PA2CqlNwqXIRPh/nzEmV6uIhjMK7oPDdNDqRJBbI2lcK90Bu8mnnVjPAC1bTGEuJHZOI3GQGowxq0ke0hRe1tsZsGqf7lVuo0PQyUdUH5ICZ50rUVGBr5d8H5w/F6S/YskLlt5P9HPtEN+pMHmjtZCTA0wnGWr3b6q6hN1bpp0PJ9/UpoP515F6iOICHxinsqxnz3guhRCCo/PL1eQgVMDjK/2W7kRxulLtZfv29S4FBDTNWZLSAGTCFo5EjFjoSqQZC7pcGi/lQ68GpQWWUrPk8M16syxi8aTqFT+Riv1HJEIXyU/VbzDw7YdGZSpx7AyKp3GCapqTHiTdgu3kZkvS5ebp9biuZ+GCN9mWVWLV47YPwnbI9DVSOee2DENw;4:1rba3D42zduLZRikotL2cG2/8DPP04l5CYh/3OmnvNNcKRrIa7X4s3YoEq3FXYIU0Y1ins1YTl1HG8jFpRJ1jN1uAMmfmXpikUaFat/TjsSU3d1D6OBWRXti9YBHXxRq8k4QL64b9vc2nF0+xzgFH/aHr6AaC48Rz6Ge+XTGr4mnn+dypAryPiZmBI0Z/9YZoMaLvivueliRpYHn1e7/JSVg9xBXll+FqOwEjToJrXtdz+nQ9oY1pVSl863m7ZOuYB3DrKM2OodtElDWyw2hlA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231382)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095);SRVR:OSAPR01MB3314;BCL:0;PCL:0;RULEID:;SRVR:OSAPR01MB3314; X-Forefront-PRVS: 0850800A29 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(39860400002)(396003)(376002)(136003)(346002)(366004)(189003)(199004)(186003)(53416004)(68736007)(54906003)(16526019)(5660300001)(97736004)(25786009)(478600001)(66066001)(58126008)(16586007)(50466002)(39060400002)(8936002)(69596002)(316002)(386003)(8676002)(26005)(6916009)(81156014)(105586002)(81166006)(53936002)(76176011)(36756003)(7696005)(52116002)(106356001)(86362001)(14444005)(4326008)(6116002)(3846002)(446003)(23726003)(7736002)(11346002)(486006)(956004)(476003)(2906002)(2616005)(6486002)(47776003)(305945005)(16060500001);DIR:OUT;SFP:1102;SCL:1;SRVR:OSAPR01MB3314;H:morimoto-PC.renesas.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1;OSAPR01MB3314;23:6XZWMtppacrNZ7DfMKbniYrw4FEsp8+u6zsuTJipdPPoCB/2ur5v3EZDM47+WWuoOtPi2e7Yv3g4WqD2A+ssaDWYolsMQtGO7SN8io8m6h7/pBmFkYhj5IPp26BceyH5sjJkoqZKEP/h5jmBazWxU9lJihXFK2BP0fzlWLCC0eS523Gr/g1+a1akPWH6nDQnW5nJJ1DGt00wC6Pdh1pJdmgZxk3coXKPqTaBZ+Jhhtn4xoMJ8/pUGj1Gl8NNBwl2Tcyd4vfhqzTU3UJBNWi0XdkSwP/2EWSwjC1PW51Fw0HRQrQ8Sm11fUh91QFe8v7Ln/CB882q02ZlB9OrsyNtqMeMOmDwvYphPy6sJYdNlOhHQ9m08k31kyWIodDyUg1FGAgY8Qj7JTGEFV+PR8BU8EbGKmvEvRvwQuOcHAB29s+AS22UHqEviBq96oNofv4sbk4cXDYeHeZm1fvL/ooWWZJtSPCML/FfYhjKqi8DfiOc/HYIS13j8wr5Hozbym9IIPVSUSc/Ccjj3YhaDx5n1MSZoVJ1YrCEgGiyjr+nfS6+qjhejsf8D/L1w7JxTPNNFvsPb7bZdscklVJTB4sSLrKh1u1f5mW5W0GAdT79IXZRXq7Oenbc39SVcdd4tn2eOyRu9QG4X/pMMCBnZFdlPff+Sf/yZpkgdNpPKxraWZz26W6tMXyywUezevi7xnsJKC3DGaLG/MbCaLouM/LEzc5rU+cmBQLryqpC+ZPYt+pFw6qUJzbcaLsbuSVK6xRbiLl/eoFrTs9P5Cau6p/qHZZoWRTnXn5LzaAH+N3wNqAjc9pLQgs248FaQwLm4dMme06L3LoAHSSwvaeqVkX3eGdBNt59RexNnN9ZH2F/Tq4vO2MeP0eYC9RpRt1cJBcpspfR5tLc/F2oD462ZdrT2CJsmjmkBW40QYTbECLsIuy1vXxq9VkHlixzgG5R2eA5gyVnpFtr4PQOIPDE7tG3fjGW+rfvM2jb6FOWAm7ek5q6n9l5DTx+628GUfafp3xFpu860CljaD+2im2q2LDi2kQoXgzphg7sFQD/DiT1JtH588Uavpvq2iGrWBQrgkMDJNC0qvg+DtS+s9ajWMjKYsyWvXQ4PBIGW76JTSeYFVW324Q7DtrT83ayyBvwNJrzybR+IbK+4cbhYvte59b26g48jNIr6nHCUip+k+7bb3pOh3cGgLVOGBYnnNq/o+0ZXXTJB2ipGq+JMb/JnvyeInZh8xLJZlbqiDDVhhCGavQ= X-Microsoft-Antispam-Message-Info: NMcmAB1Yr28rgfElkqkd1xzqLKLovoICviS78b/xNLfmVcjp5fShl+L5wofIrLlmiLavwrlZh4btFzAxFsqtXSr2+yvVCJXm0ZIUzTeUfm6JeZJlyPBVDjEPUCOT1+I3ta2HbGRuWz6b1dVtUCV8T6nTcWoOP9AQu7WsQYQg5yMRvpG9r9m75Sugf6EPbGPrOcooxi3bMbyVZMtYWW2sMAdZ1CiShVqJXG8IlHQkXEAG4s/TcMF+6gN2FYmuBwalBSmnaF0f6CgQ2hvKR/RqQ4fZp4Z+2h8bXizP90VHJmRZ4e/X8H5zO3lHXWFgH7MN+eUjIKsxK6SzgbLOQ1FIhtj9NAI8tn3JVJGnOrwF0gI= X-Microsoft-Exchange-Diagnostics: 1;OSAPR01MB3314;6:voLcoLjz28gE/zj9DC0fCRHlIBUjl2cP9F7TxXki8ogNseaMaA0RazewWVrOla6rSgvaPQ0hR8wNU1bloKHjgJ2zEVzInEMIITp5C9l3RU/tbrrcn8u2+JF0qm5/w4W210L4fBQbMQYuo8EmboaUZODvgoKH3u8+c/v34FLZO46aiXDdWMcQs/m4A216gLVJlr2qol3usPM1Tj8381X8UYPeYrVxRBksJTMhoPoG+2wVvNpLkwlHmUwWE9qn/wJixBPinCH4B9t19qk5SjBu7w2KyovRRmDZt8uOST4gJJe3fBoPo73LfCP6kjTL3wvJtCuLm7zt/owO5ueavw2Ivq5+GgPcV4N/Wyzvkhh2ksNtI3n8c4Zjd0qS4n33xZvc1GvxL0dFmK7edkbhlTJAqFsw7iED6i/FJ9p4EEnw2KrIT/pfRnDuiglWKwrsQEyiKyG0faPNi1NQJEocHkshig==;5:nMvvLK5nJsAQs8Eg56ya8e+/w/Bs4eHp0V7vuZ+/UWT4c8ATCLX6oQXJV1R17RqPjeJkDryZLdWxjpNStdSBhEIvLElOTQsUsgPesu/oKyojbB3imb6oidCYMUrmMGi47i5m1bHYhv3YDL0PqwYleIRn04ccKR4HYWsmyFNAkPA=;7:6te8E7up8yyx1/vaK0TWlkZb28RZ2oBGvT4jfbKoBrF2n4XE92BU14eyl50JDQ/q4WkrrBqXfcmHx0ne7zz9Z5g606Uo3Ta97rz7+WwaCgW0A4BXm2jh3k2u4H3lLECEUO7h24PBjLelam+Ly9qiMA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;OSAPR01MB3314;20:9zNNISgaWjtl+oXZxDqGIRaEclfIYQ4EBiGkoMQih03rcfYiYmN1hxNL4MQJ3J5eDA6gCz5vl7izWP2pOqtNJx9Ol7pUUgQXn8k5FDltYCWunNU5VoNqljKMhDbq9a+1z8d9bIp3kYif62va9mAcr07hZtECuQMP2Q0kTFGA0lU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2018 01:58:14.2236 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1e62a4cb-e42e-4be1-0eee-08d6451da4f4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB3314 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto ULCB can use daughter board which is called as KingFisher. It has extra sound interface, thus we want to use it. But, basically, ALSA SoC can't use Multiple sound card with single CPU sound interface (= SSI). Thus we need to use Single Sound Card with multiple DAI interface. To be easy to expand ULCB sound card on KingFisher, it is better to use multi-dai-link style sound card on ULCB sound DT. Now, "simple-audio-card" / "audio-graph-card" both can support multi-dai-link style, but HDMI sound support (which is not yet supported on ULCB) needs "audio-graph-card". Using audio-graph-card is better selection. This patch exchange current sound card to use it. Signed-off-by: Kuninori Morimoto --- arch/arm64/boot/dts/renesas/ulcb.dtsi | 42 +++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index 89daca7..a936f06 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -83,20 +83,11 @@ regulator-always-on; }; - rsnd_ak4613: sound { - compatible = "simple-audio-card"; + sound_card: sound { + compatible = "audio-graph-card"; + label = "rcar-sound"; - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&sndcpu>; - simple-audio-card,frame-master = <&sndcpu>; - - sndcpu: simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - }; - - sndcodec: simple-audio-card,codec { - sound-dai = <&ak4613>; - }; + dais = <&rsnd_port0>; }; vcc_sdhi0: regulator-vcc-sdhi0 { @@ -211,6 +202,12 @@ asahi-kasei,out4-single-end; asahi-kasei,out5-single-end; asahi-kasei,out6-single-end; + + port { + ak4613_endpoint: endpoint { + remote-endpoint = <&rsnd_endpoint0>; + }; + }; }; cs2000: clk-multiplier@4f { @@ -390,10 +387,21 @@ <&audio_clk_c>, <&cpg CPG_CORE CPG_AUDIO_CLK_I>; - rcar_sound,dai { - dai0 { - playback = <&ssi0 &src0 &dvc0>; - capture = <&ssi1 &src1 &dvc1>; + ports { + #address-cells = <1>; + #size-cells = <0>; + rsnd_port0: port@0 { + reg = <0>; + rsnd_endpoint0: endpoint { + remote-endpoint = <&ak4613_endpoint>; + + dai-format = "left_j"; + bitclock-master = <&rsnd_endpoint0>; + frame-master = <&rsnd_endpoint0>; + + playback = <&ssi0 &src0 &dvc0>; + capture = <&ssi1 &src1 &dvc1>; + }; }; }; };