From patchwork Tue Dec 8 00:10:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7792981 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D3EDBEEE1 for ; Tue, 8 Dec 2015 00:11:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3286C20571 for ; Tue, 8 Dec 2015 00:11:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47B9A20553 for ; Tue, 8 Dec 2015 00:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754562AbbLHALE (ORCPT ); Mon, 7 Dec 2015 19:11:04 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:28660 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752986AbbLHALC (ORCPT ); Mon, 7 Dec 2015 19:11:02 -0500 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 08 Dec 2015 09:11:01 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 87F3A42F3C; Tue, 8 Dec 2015 09:11:01 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 86178480A3; Tue, 8 Dec 2015 09:11:01 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 7E86E48014; Tue, 8 Dec 2015 09:11:01 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id KAP06540; Tue, 8 Dec 2015 09:11:01 +0900 X-IronPort-AV: E=Sophos;i="5.20,397,1444662000"; d="scan'";a="201297637" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Dec 2015 09:11:00 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HKXPR06MB1016.apcprd06.prod.outlook.com (10.161.181.156) with Microsoft SMTP Server (TLS) id 15.1.337.19; Tue, 8 Dec 2015 00:10:59 +0000 Message-ID: <878u557qff.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Simon Horman CC: Geert Uytterhoeven , Magnus Damm , Ulrich Hecht , , In-Reply-To: <1449505537-15428-1-git-send-email-geert+renesas@glider.be> References: <1449505537-15428-1-git-send-email-geert+renesas@glider.be> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 8 Dec 2015 00:10:59 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0023.jpnprd01.prod.outlook.com (25.161.225.161) To HKXPR06MB1016.apcprd06.prod.outlook.com (25.161.181.156) X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 2:J6/LfEj6zfVIDoHez/vaVLZaTLawXKt6PrPikRbdH0U3+IUP2QddNzJApWwux/JwRzc6R5wzNgd9rJiMuoZkvUy5xvjvidhqsHFr0Q2ytcV1u+4fd6EloDq+wYlKhLLN7wC7D5XAaCL3mddBCIHcKw==; 3:UtKnuBPEAxzSxeSw/VDJs7HkAOd9ZfguLA14SD48PkXw83nKvLtfjB8y45KPa+Zw0COQi9nt/SXI/HPXRWScPhjiw4OgQdpp1gO0xhHojwHs4+LQoZAY0uK/8g5DsKrr; 25:sgo/Cnu453VoHYEpSMxgzyBflFHIXJxgQXON+V2JlN8HA2h9o99Bd22rbdTyd1qbDFImaC2Qk/ZSImKQ7UNoDig3qSZ1kBTaNl9/gKqRITVYdLeN/y+Gq7o8xZDOnKX3FtJobyAzC8N9lG1Gzwt83vfA0XKxPQstOBHUXwaIpD/tC1qC8QQLm2i1LaEiP6WwgtSGN/KeyBU2gA+o5OSrFXsOjGPmHXqNIlDXerxLZUTokHdTKoQkrfsnu641x0Js X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1016; X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 20:vArqFxEBLr9tupJqOpyohaUva5JHosUs33FtKiTlSYkVTfs9qnBuEjHB8m3L/koH/A/4yZLG3GCHMctYio1YbNwdZjjI+goOypvCiRDP5vrcMt7A57Qt2A4TWRjqtnubKVo0kXL1hkUVxynqD3/vZfA0ctW0HBMt/oPWMKey44x/ATSFOn3kUqdrSLUTLMLwJxu1PaOSakZ+1WgFAfOvZhPVBkVeQ7QrKeKFbFEWNjVzBG59HyqOa5Y6bFLiwUHF5X3yZEfSMsvgxQ8CnffWKrcRRw/syFTn/PGHOkRSAR8EfyPMh2RuMzfYqFblNNp5RUwa4otyNSexC9Zc9Fewb3tJfbW2vZoOFHgO9xtG0XhZqgu3hclJkN12rz5cvc+9Msxj2vMz3h7PHwFyi0m+Yt6LGSoGDrUdRVSDLQ5SnQHVdjrEcbf9wvEw3ZNht3gAZUb1ZAmZErwfa+/aHZYmDkuevdM/imqQNPfYjcZmymgQbGXGoNj35gy/s5J2Gl6/; 4:yWXH+ncGsdo8Di3mudd/OFEVFCqCvRHpGmla6Beajf/HtzOCqEQGjW38JVu2Km4Pk2YMm1UL5Y84/g0cl7U/460mB1prwSEuv9SyLLCCKZ44OKonBDCqNxU0CQyYRCGESEoZyvuXydSM0Yi1eCMW4c3Zita0sZAAK6Ymw4ECLG6vu79AWzxJe22O6jhM4tRXxAWDHvuOqFS+UpdOA0Uj3h3G7XS/cnLW/2B7+Y8n9eWqmUkuo23fZZ/CChrj3YsRNMbT/z+8hWUKwjtQM4cxXytPs8dPYZuTWg3ga5FKiVefq8ENj8EKtIeIPZ9UsGSvzfGVFDOBC0Yg4X79ofpDA6fktj4B5gFOL/kWIXJc9nJtQ/zD23jBVg+7hZtCAUFwWvyi5kLdce1qv5g3LBUriPEPyZTKKSIOrNIoIj Odvps= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(10201501046); SRVR:HKXPR06MB1016; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB1016; X-Forefront-PRVS: 0784C803FD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(92566002)(97736004)(81156007)(76176999)(33646002)(122386002)(36756003)(2950100001)(87976001)(101416001)(66066001)(4001350100001)(229853001)(230783001)(5001960100002)(47776003)(77096005)(83506001)(50986999)(189998001)(110136002)(46406003)(3846002)(42186005)(69596002)(106356001)(5004730100002)(54356999)(586003)(86362001)(105586002)(6116002)(19580405001)(1096002)(50466002)(40100003)(23726003)(5008740100001)(19580395003)(53416004); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB1016; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB1016; 23:bYNhaFKpV2GjUjd+sJWK6P8CviKEUzDXGzs4I8Zxh?= =?us-ascii?Q?xdqRpgrP6C4HEAWUPUaSw1f+IyOyzzJ+uLFsIbAkVB/t+dVxt8660gNN5xtp?= =?us-ascii?Q?yzCA9qjI7R/vUzmUM6jAhExTRJ1CVv/BkRfND7e26QzlOLzvlCwzm1DsTMON?= =?us-ascii?Q?4FctDj2kvVWRCMbRYws+eSodf4WCG9JZEMxuQ6dY8DiHI0Qp7iVe1b9qpQdi?= =?us-ascii?Q?wRUmQUFaYxjBcgvdKuEGqE5YSceOdgAHzRcelwg6NxaW/0NLvvNfs5NKYUBP?= =?us-ascii?Q?SM5d/OqJZl9AUmU4SRGYI7ZXmDtfW6khjoFgtMOx7tUHi32DSN9yCq7STugp?= =?us-ascii?Q?NB+qEQAyDMUsi9YzGyUv5mUJyaeLw39L6ZyFEYyo+cd+/zn6nxn6YHqdRVmv?= =?us-ascii?Q?ov6mH8wRBBxTsqt6LMEF0VETlYLuKJX4Zyeq4NOnFrcmA6kYuiTPmfSb9oqk?= =?us-ascii?Q?B8Bm5NmqF8urtSIY7lh/siR9GrDMldDu5ITB3Ms/ElagsRL9A99V3PJ8UsJa?= =?us-ascii?Q?r7qUtqVqYJxYOZH6PL85tHja2SIsC907YkJJ06ecE+oZz50q6fwyekCJZzdI?= =?us-ascii?Q?r1FrbQ19MFUpkvB3PBXOQVqPgtHbMaT63pq+LA4qlODYl7qcQCZeMzqIHC10?= =?us-ascii?Q?lMuOH/zOii5naEA5KsOAK5AwYv0hFtXSsS6wD8CwuyOvkEWhkKN8freUzGm4?= =?us-ascii?Q?Ix+RlV34XzYrlMAROS8ZF9hzj32vy6pLwhZhd8I1IOOkXqbA03/povq5OwQF?= =?us-ascii?Q?aiD+l/sWA4zvdAsSQUYsbp4qAPN9RM+rTK7qmlNYMx1TSv0Y1KQ07+PmYZX+?= =?us-ascii?Q?ZaQ4QN6dnDFzXkMcKUWqhxz0Of2y6YW7veuPo+eboy9flplSWUc5O2/E4U3q?= =?us-ascii?Q?kY+QkD4okExXlMogBkRKNIgF3Ocfpn6wsrS58T4IEUzdVqxlRmXYPSphNA2f?= =?us-ascii?Q?UbeHUCEgqdkEDhbfBESKDeDNsbvOPB7bv9Z6PqEuWFV3OKpuiJkHWiA10Ves?= =?us-ascii?Q?OxwFkIZM3d7FDCzWvyTu0jQ2htu/8gAm4Emf4+2dJR8DxSO3DHS2AhwiJnUJ?= =?us-ascii?Q?hE6udKc/OnNqqu0TdRzOH2DparbPcKWoBsfThmqjz9ZLnhZzG43U0G4QOQoO?= =?us-ascii?Q?VrRNwitSig=3D?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 5:aSdZ73OD+F8M0lTs+cDPWKETEzlQQFwz4MyHF4p7DxKfZqvi9L6FuRbotbHqcDmTL1AI/zoacO4BsVblV7lHgUzC0jIYNOuWWcBV5+Axy4RVFumNbG5A3DpnY9c4jHJ/y6fViL3CKeebH4iqwpiQNw==; 24:mQMADGkjU0RS6liXy84UcWUxHKdh6ciwPW/3WXd+3c2gw148c7c4mqNH04cA6MMbil8hR7HzQ9sv8FAvpRpFigz4IbpwLLtKnTYZRs4rZOs=; 20:Crl6u7iaXc7cahjPNY/j83VD2Pd9qzuzy0jE8uB+dOZYbhJkynAqubefkIVtAi0KeL8tHf4t1NKY3tERFlOLGtwcOMSp1O3vKPNTm4Dostb8yZ5g6a8BqRpMwR4rK9mMFD9IxSvdnlEn+Qh7BNOBn8KtW4ZVXAL8l10qjs4UR1Q= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2015 00:10:59.5218 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB1016 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Renesas sound driver needs #sound-dai-cells settings, but, this usage is a little bit confusable. It came from ALSA SoC historical reasons. The sound DAI naming method is different between Single/Multi DAI in the ALSA framework, and it is used for sound card matching. And this #sound-dai-cells has relationship to it. Current SoC dtsi has #sound-dai-cells = <1> as default settings (= it is assuming that board/platform has multi DAI), and board/platform side needs to overwrite it if board/platform was single DAI. This style is more confusable for users. This patch removes SoC side default settings, and force to set it by board/platform side. Signed-off-by: Kuninori Morimoto --- This patch is based on Geert's ARM: shmobile: bockw dts: Override #sound-dai-cells to zero arch/arm/boot/dts/r8a7778.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 4f8e078..b140627 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi @@ -236,7 +236,12 @@ }; rcar_sound: sound@ffd90000 { - #sound-dai-cells = <1>; + /* + * #sound-dai-cells is required + * + * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; + * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; + */ compatible = "renesas,rcar_sound-r8a7778", "renesas,rcar_sound-gen1"; reg = <0xffd90000 0x1000>, /* SRU */ <0xffd91000 0x240>, /* SSI */