From patchwork Fri Aug 11 14:12:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 800572 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xTRly4SlVz9s1h for ; Sat, 12 Aug 2017 00:12:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753132AbdHKOM3 (ORCPT ); Fri, 11 Aug 2017 10:12:29 -0400 Received: from mail-by2nam03on0071.outbound.protection.outlook.com ([104.47.42.71]:49248 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753138AbdHKOM1 (ORCPT ); Fri, 11 Aug 2017 10:12:27 -0400 Received: from BN6PR03CA0022.namprd03.prod.outlook.com (10.168.230.160) by BN6PR03MB3315.namprd03.prod.outlook.com (10.174.233.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1341.17; Fri, 11 Aug 2017 14:12:26 +0000 Received: from BY2FFO11FD021.protection.gbl (2a01:111:f400:7c0c::194) by BN6PR03CA0022.outlook.office365.com (2603:10b6:404:23::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1341.17 via Frontend Transport; Fri, 11 Aug 2017 14:12:26 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD021.mail.protection.outlook.com (10.1.15.210) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1304.16 via Frontend Transport; Fri, 11 Aug 2017 14:12:25 +0000 Received: from fsr-ub1664-118.ea.freescale.net (fsr-ub1664-118.ea.freescale.net [10.171.74.132]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v7BECL5L005209; Fri, 11 Aug 2017 07:12:22 -0700 From: Daniel Baluta To: CC: , , , , , , , Daniel Baluta Subject: [PATCH] ASoC: simple-scu-card: Parse off codec widgets Date: Fri, 11 Aug 2017 17:12:19 +0300 Message-ID: <1502460739-12134-1-git-send-email-daniel.baluta@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131469343460311689; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(68736007)(69596002)(54906002)(77096006)(5003940100001)(50226002)(2906002)(305945005)(8936002)(47776003)(230783001)(8676002)(81156014)(81166006)(97736004)(356003)(33646002)(189998001)(104016004)(105606002)(2351001)(106466001)(5660300001)(36756003)(8656003)(50466002)(48376002)(50986999)(110136004)(4326008)(6666003)(6916009)(85426001)(626005)(86362001)(53936002)(498600001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB3315; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2FFO11FD021; 1:L8KPBer8k3IEvohHNKMfhD4tNiCPFQZaHPX8ALsmhP?= =?us-ascii?Q?bwvmGAmXmQ1hB5dtZM8iHwvt/FlF2eB4meYYrce7PEjq1HyZ7m9I8iZ1sgsd?= =?us-ascii?Q?xmQ0y7f/R2DJWi0kbwwg/J8SVIT8Gm9r2+qA59r3rxxqslrpXlFCb0j6F1d+?= =?us-ascii?Q?cJAqv5Tigwyk4qKw1eWqSMVxZ7rq52J+OkJ7p5jjYzpfDvWB1tmCr7YNgkPy?= =?us-ascii?Q?AelP3+SsdidV4GcqT8Nw8vopy7k/D9dl3QxvVUB7owfQmi8JtJHHfdRhOczc?= =?us-ascii?Q?UvVo4szrn9xqmGn+eIikj2ncLbUbd6hlET/wLWf6le8ee/+NfPk4Slj5qane?= =?us-ascii?Q?FxJD8H2jlb8bdyEnBFRpWqR/jqN2ZPARUlDRFnHgKaZ839PsznHcCa0B/rtu?= =?us-ascii?Q?Omzi+kCdY6EEabAZ+tmr+QJkbnZQyKnLoc+kA7TAVIl5HfnOOt1hXB0A7EIA?= =?us-ascii?Q?w74Z9bcveYDcDycMbHlpsxZ/rbuyLPZoUCy4VJxoNG/86BEITeVkbT08HtU6?= =?us-ascii?Q?ahvAM7rfKxzvUhs5YttLmuM2D4O53Tlv3crUKDUfCPaKPGEs7voSRVfOJYOs?= =?us-ascii?Q?YwYDngp9isKOfDjR6vEHGkpCWIzcKZe4164vQpp0rh5Y7Ox30ASDA7rF/Qrp?= =?us-ascii?Q?mGOgtbYOLqE7OQqNAgobSUgs0kCt9cT+qNLEyeBJsYZb2HMtS/C2L5Z9O68K?= =?us-ascii?Q?hOd7C/GaZwukgoxu7cQy0gMBGkwcLjoN+bdcNaUWC5VkCyw5QFBK1c0hNtt2?= =?us-ascii?Q?x01odopBtr5WMlyijiVnZ2wXaSKL5NpWJbh3ZVLpmBwnXNF/AQsMe/TkoIsm?= =?us-ascii?Q?tVSHd43QwwD9eAnvUbHmFieWiOdEiyjc0HBHuqwS5jKcRtv5xqh1jIbe+f3d?= =?us-ascii?Q?KsBPWVf7ljI0M6Qw8xgCvFVQKOt7qREApMj4WqgQBwDXDxxakyXCFLWPvBVJ?= =?us-ascii?Q?QF4nim1ELkVMVJ7SfuKhmAVIBNURWRzpENdFnQf8MkLFa998mjx1uZe01dpq?= =?us-ascii?Q?A=3D?= MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6da87207-0f72-47b8-e129-08d4e0c2fe42 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(300000503095)(300135400095)(2017052603031)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN6PR03MB3315; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3315; 3:67mpndrOQm+CvcaUGqzb6XP6huFD64C9xod85Pe8YX+/BOg3Ojamy9L42DWOhbYKMQ91kW+fQWz2/1oh39JrMfQt+vCiAHv0fFrdfFxsPauwzUF6xD3/vtgj9YrogvyLlpDetZ3XE0kVKi5OwO75SsIDiInc52ZgvmVNCfFQnhjWiV30pJo9rz0lmQPNeCffzJ97DX43xNfdNsak7WJzomPfXBWhOxYPGn5cwUObMF6fGHdNrElANPa4xcjPycWTgCgQCRF9nU31jvxhq2hLnH67Ados6wpIpNk2XUX8oeNO26TaROWy8ZZJiXhmKZBHjjYOhFR8+fj6EXDKcinlsQ==; 25:D8GlgL3kmVQqgsNeks/lTcBBaOnPpVauqffDm3rNa1YHRc3mFWNhzwPU7MKpaecdrXf6YKUMKy0c89KNxGlMpkYFmPuN6wVVMtgI8g2VDKGG68rGtPNM1QaLFrukLJHQebPT2QGbhzrv2r5eAgr9XHrDktM5sjMebl20NDgiyv7Vof8Mta9w6gf4L5zmEtBYmO23gGaNUVatGf9PNcZLzygGTv3oY4o21Xj+4Vt6bjydvoBPlmWVOUd/zvCVjXqVdeTYH6wLjw35IZfB6kcC8Kv+zYfP+ieK26blfBdpRhdHusiEo5y+Har7Erm1EBn81Qt903V3aXECqjjD45kKWQ==; 31:CXhLbJUiv+BOnxeLUkRwTiyMrSwHb49MFplf0+aS4RnW+qI7os3NhtZfuaEzju01DsyE0/5PLgl5L8caDFfnIg33kIuX0/onJ7R1TGbCOMI04LHL2oeMBTbn00cs/hCyLQue9m7iFZqkUjthA1uNsgpIS7abNFH6c6LEVCJ3FNxd5z28RYc1Lbu2p8Sd5LseHXhpPY2QTCdGzhtYFcmXRMIOz6G9n4Zf85WUxrUjJ/E= X-MS-TrafficTypeDiagnostic: BN6PR03MB3315: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(5005006)(13018025)(8121501046)(13016025)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(3002001)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123565025)(20161123556025)(20161123561025)(20161123559100)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR03MB3315; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR03MB3315; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3315; 4:s/T4vNSdv4O9AXv4/FDDXwZnLbJj6wIQkJ/zHLzDUvfkXIRlRoRZP6LuGIMAOnpfuAld/1Q4fXvpg8voehZVXtp90sP0ie/iEVYC4QpZx+KSvIXxmf+c23j8tlTncD1yC1CtjND1UqRosE15314fREnGmuWkHDxvtRcnzxGLArRmf7hKS8flkJd23vdwEiEGGSWIXvojxDpnvTo7lbcWYZJZGzxjcBoznNSPQJeLbRBIeHsbri4tkho6uK8i2FYsH6BReMbzaRu/+qDCcyOf4veYH1/8zNC8y8bvjBBH2p4= X-Forefront-PRVS: 03965EFC76 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB3315; 23:27RrA96WW5PXdQv7mpZHF22lFwHWkRfhozlIP7RU1?= =?us-ascii?Q?wbde++uaQM+5F3p8tYYOI3wVYuCNFeSAqB38J7nOO0jeFisNBoGLNhfbQXWW?= =?us-ascii?Q?Z6RBLbhKU85qsC5eDs1GkA9iwWlDblKkq+DjGpLt3JsEASF7q1/mbVPmpQC+?= =?us-ascii?Q?0Ynv/p5gmRxTZk0e6RtiVjflitcoY7faTmpDnjtzxNMWg4lAZJE5S8ub+PYo?= =?us-ascii?Q?eHfQEgt8wBdZsAjePWVtqic8T+yjHRpzvS2CuL3Pw2eSW1WZv+dkUd0bZNYs?= =?us-ascii?Q?2HRqlfjd8NSh4Alo6a72KaEYmRm+IdNCDzKFzapyA2UXwVFxjhJ3xH7aPslj?= =?us-ascii?Q?/ZSnt4sL5H50dXq3H514A7YOrkslmQ8cy8v+vgqzdf0R2xKSROyGI2h6QBlY?= =?us-ascii?Q?LOgK9TfLV+H3gdzX2cckIleDBDyxQP3D5x87EVMePPDLSzNqC4V5nt/kiNId?= =?us-ascii?Q?SGJtIDVxHpIzyYEV19Uqqp2bVMs5QTKVwkFMmp2DV7kGyjhcDzl57EfIxSxw?= =?us-ascii?Q?p5L+GYhdpN8e/gMGTgbUg2mXn6L6GgH+rNmijKiiTlk1wYj/N5mK2GRdt4fX?= =?us-ascii?Q?wByV1mvl9eDSCF1rHXHCQvYlF40G9opiBT+dY2CuhlKVOG7v/GlXQGrmWCP1?= =?us-ascii?Q?1nHXqgZHDPxAzmqBrnYl6wICxT9l+DXhrpQXSvqDc1xvxm8qdjV80wSR/Rnx?= =?us-ascii?Q?3tTRufeFgBpXeeL9oFd6iUGMnJXECpgoyee3MsFFg8Y8ifx6K3RLuDFCaYhe?= =?us-ascii?Q?JAumaibyQiGtXW2QoCo+BOFNGVSNam8zlwrK8nkd483A/mQmmPB5lRGtotZo?= =?us-ascii?Q?4Dh1i9yxZiFFMON1VYUfvr33xLQQQP4jCmdxXL8jjlc02QV0nDMawNZrU1TZ?= =?us-ascii?Q?eg0KdqUqLMcX/0sDFdE5U1rctTcKnVJdYfU9HkIbod/3DB2psnu/l/YJ3nyn?= =?us-ascii?Q?wsJgcP4HzTJeFfimYnHiVJzbCeBgo/6DGqWYeNXGWcgwn8XZNaQFjat3YtCi?= =?us-ascii?Q?fQdDMguAHomzsDHYkEZmpjVxTl8kHa/MOSd8fEm47yqXN7VxH5Y/oU6kKHjs?= =?us-ascii?Q?Ct2NwftwMRcgbczVVsUK+mHBOwsUdRcomJCH0Bpvo6c3r186KxmJnL19V5I1?= =?us-ascii?Q?QXziguqj6Q=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3315; 6:6LHfHA+WQGYHAUCPQlbdg9Y4Cj4Nl2uhK1FTY/Brd++Je+qBOhZE4CRpuZVMTu1aRoQGfB2pGNbMOg6pMMVbWP+Cff+cc1ls0lZhDX3OPpttuS2IV/EJAg/rGqc0yNnVnjfva8L2V4bMd2CmjMYvUWD0gy7BFsxS/0PW/dzdDQGXacSBMK2Y3Oir6pQ1M7qSu6N4EeDYTSqnHLoF2jLTJrABtfFquKgtxL7jutZCgXmInGR4SwItxXNCK2Wr5RFenl3uYxI+nuIReArqyEVs0YSgquGOXIWCvCoTjw69fP8w5q1TZaZChsM2zqQtguYbp3GC+QHAHcqWqTxsGYhxUA==; 5:AvldW15ZWMS7HKSORVqB3gdeHb5qNa3HWA4Ty0MOJcntmSIwX3SO/Sacyhz2At5ezozvSOG2Y2h+BGHis4JQvupvu1+ktk8EV6BjR+mIdBUvghV0gmccU9Y7bw/sFb11WGqNThDbDHWkQG0csT0MWA==; 24:wHNWu/eCxWAn7wZ+/w3kNKpcZCqULcZQLLwHYV7s3buOogFen4eKI9rswE/GmVWwfZ3zuzho+nzVJXiDv3RWZ6RvAA3RWaea8u+BjeGVvNA=; 7:Yjt6jTe+5pEiJe2gCz+/S6YHvB4kmFZMZP2d8JfhfeU0CHg/PHSJYVKGgwSIfR5mZySwdaJVl1OWPnl5iCp6DV2tSNRE91zj/IeKI6CktK+sRgNjJjONGskg+I8DpgdUVY9EubKqyWfzL95jqQbxY1nkjzXeq8hBixAT7M3w3BVnslZZvUSOfJ8aYAKPd0/QeyTKNejlzQH50EA8M+rFZhuId8n4xyQJGaRkwc3YawI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2017 14:12:25.8907 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB3315 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Signed-off-by: Daniel Baluta Acked-by: Rob Herring Acked-by: Kuninori Morimoto --- Documentation/devicetree/bindings/sound/simple-scu-card.txt | 1 + sound/soc/generic/simple-scu-card.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/simple-scu-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt index 327d229..32f8dbc 100644 --- a/Documentation/devicetree/bindings/sound/simple-scu-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-scu-card.txt @@ -24,6 +24,7 @@ Optional subnode properties: - simple-audio-card,convert-rate : platform specified sampling rate convert - simple-audio-card,convert-channels : platform specified converted channel size (2 - 8 ch) - simple-audio-card,prefix : see routing +- simple-audio-card,widgets : Please refer to widgets.txt. - simple-audio-card,routing : A list of the connections between audio components. Each entry is a pair of strings, the first being the connection's sink, the second being the connection's source. Valid names for sources. diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index a75b385..0bb3da7 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -191,6 +191,10 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv) if (!node) return -EINVAL; + ret = asoc_simple_card_of_parse_widgets(card, PREFIX); + if (ret < 0) + return ret; + ret = asoc_simple_card_of_parse_routing(card, PREFIX, 0); if (ret < 0) return ret;