From patchwork Mon Oct 17 08:34:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9379029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 172196086B for ; Mon, 17 Oct 2016 11:39:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0515929102 for ; Mon, 17 Oct 2016 11:39:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDC572910C; Mon, 17 Oct 2016 11:39:32 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03CF729102 for ; Mon, 17 Oct 2016 11:39:31 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 34540266B23; Mon, 17 Oct 2016 13:39:30 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 15F77266ADA; Mon, 17 Oct 2016 13:37:13 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 86AD0266A34; Mon, 17 Oct 2016 10:35:06 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 9DCC92668F1 for ; Mon, 17 Oct 2016 10:35:03 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 17 Oct 2016 17:35:02 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 523D94D113; Mon, 17 Oct 2016 17:35:02 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 1BC9180030; Mon, 17 Oct 2016 17:35:02 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 0BFF58002F; Mon, 17 Oct 2016 17:35:02 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id TAA25263; Mon, 17 Oct 2016 17:35:01 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="222518337" Received: from mail-hk2apc01lp0214.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.214]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 17 Oct 2016 17:35:00 +0900 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; bh=4ZOfwY0wA/rVM/RgP0HxEA7WJtW4ey6piHRIsVKn4c0=; b=ZvXuKD8x/cRYBbkUdfh0KHqt8FqCUMxwsqlNePhB+nBAAc6h8abbelVzAUS1UzvacSUWC5R46A8khmIM6WCXyZcL+mAlkrcV201Txj7MyT4vvceJ+1EMaShNMGCKoJ7UNLRmDZRi/syA2GeyHeJxFgAdw70kR7xDZmm20Hcn7/Q= 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 KL1PR0601MB1445.apcprd06.prod.outlook.com (10.169.69.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.659.11; Mon, 17 Oct 2016 08:34:57 +0000 Message-ID: <87eg3f4c20.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Rob Herring , Mark Brown In-Reply-To: <87shrv4c8x.wl%kuninori.morimoto.gx@renesas.com> References: <87shrv4c8x.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 17 Oct 2016 08:34:57 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0013.jpnprd01.prod.outlook.com (10.161.74.151) To KL1PR0601MB1445.apcprd06.prod.outlook.com (10.169.69.23) X-MS-Office365-Filtering-Correlation-Id: 0ea93596-816b-4da3-f31c-08d3f6687b17 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 2:rzgyAG543cmpFIbEpv5oMh0ftAjmvJ8n2yw7FDzEWtO1pcK3z5g4uT2a91bolOB0C8IdhH4XLeAExfjglXXMBvkT3KejTBKskj3xviQX6in4aNUZVd7zi08RLV3bwnHuqfWqqBShWw2FeKRVE4BUPFzo3x/TkivYWkYdP8zRvbXss36TA8hQKVGGdlm6/BdTlw7hvhUPWKrlvHdJkvbDjw==; 3:i2p3YajgoVnplnYUgquFPdAhgTF0TjZa1aO48f1Jx+Arr4Din0QfDuVcHdwlZ7b0bdlSeBVXFU3jb+NrxaRxcd6QB09lLlwe2x5tzWzqa9xh7rWqaSibIIejE0w0f/NGYhW1FWVwkbbhg8XQmCOXww== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1445; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 25:2UvKhrUJkAUlXMs4Hdg4Bb1F5HpSRqqzr0znQg5g22+7ScWwbSRkCdPNFbvpGFcq0OG/Xhc83yxlZJach9A4A2Zqbggl+4leX87rObFj7qEtAWayjXevqR29diEmrZGAKw8gW+Agboj8cjOeZ1l6Rm9N0waFtmuhZoQdL+hirEgoRUrvF86h0ozezztLKm7COVjiSnwV0ueM/MK+zO6T3NsM8qLCGjTc+RfywY5eIojCW3Fg66tH0HE+wWP9cPfkTQpLEJzo5Urc9ma3BpTmTEB8PpEtPHhqSaJg6TZGc+t70nAXg57xHbtlpeJrUH9LymAYTbBLhSVuSWgXSBtGDXSf4vvKxoOfVMMzaHFf/Fl9EaSZKIS/1uyN5DqvdoSqSujAk8iFewIwvGMNZerGz1hoiI09Q7KGK46SYcLvzbXdn6br26qyxHgBNoI8uKa0NchJ1UFLEAj/yGKF5EuCYtrOY9ku2ZN0yvMphRtlfE3nMnGeOFNTb9BfYWH+B2zWjaJdPEYkuJp3NyatTCoyCKMZrNTvCD+krRHmJmDq28dZL94Syv9dCKYfbB1UzmqLEl0mBlEqgFrLHjjeWvQ/CIRDaYBN98nqe3QsCH9TbmNaAXR19SwcGAq7wkditsLD3BfQv27eDIkBya8D02K8NRMFTIPZNOE8fKLJUXXH5wl/oZpdXV/BpFgWkBCWCKMjEPjtJ+ovcysPhCi8fEaqKw== X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 31:+ulroOmPP06K9xwz3XB6Es2kSAJ6PpHdmta581+NXBgtrFUSevU/i2zAzIObAk9Tzyz69R29MuxphiVzCZMkdKDt5R5rMtZ8r0hLLoZn3wo42ejGXmF1qL/gmSCBn+R0JMG4hGFGWLbPmzF2v6R93jnHhSXjtbB0V3dlN5U2ZkY+90nx6WcotYvx7uInMmbeQsmCnz0W8WqDTfndnEBJNR9n8qXRFNT8F6Cqqb2fL4705F3MBWJGUttR1vxQPOpoYRGlt9DfswpBzfTvSaSHyg==; 20:vkkR9v61iEE1YkMWgyK1FUU90Xrn8hYsJW2g4ceySNWBPzOc5bho4fQwW/uk3fwN//REyxq/KJAwtyB2SQ2VqmB8YbrBPFeCV3FIR9na56FueI0MnOMTQOTQK9nMi55uaiBVJU1ltiw3XkoWZiVLP18i1C751BXDY/amu0lM+0ocVqQ1OX/xEYT8k1p0n22wfuSbg+mBjcj9DB2YX9ZsmwwbJkXO8AAhFvfLEgQDSySfaz69RMFQ3c4PVUC7KzseTUdtpD4aUJEj8hs7GduuxiNKGg4dzjr5+ZL74woanFVjf/nZeJDhHM9YTcCQ7lFXAuIhazKJ2DSZJmr5tTZ0MHyFt1524rJtGnzCpmBrsL61igkL/GTGN/ORT2UHhMdvi6I25YtulHnMuiTAuHsiZYtVvb6cXlhzVlGdt0aiyrB8LSEB+A75TPYpWvoQQTz9cKUhol34ifkf2rKI8tv8GSiEB5bxI83Jj0oXBJOfx6GUy/1mygV+vvP+N3cAba96 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:KL1PR0601MB1445; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1445; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 4:+y2SWkzSRBStgug47qcUDZigp7HNpmJWjds5rsEwAQS6FDEjwgcOSrjUrjMReJgPRZPiJRhElQucgBisgr9dJt+PDrU6n9DJZe3FjXxS+Cv35pG+3WqFZVV+OHYNtgCbOyHISiVluYjKwypKHsiTcmSBp9C1Q+0AWKpc8QUvNKBiCada2BSlQs0fC8ZTB5z45+PKc7rh0Xocj6MPys3vKDPujIdHPMlo/vOeiaYR3AwR6yx9kb/hkF5VWE+EClNsjzlTEIRT0PEv4EKwtTyjbLwQYzO9c6tSKbFsn28dOgMgkysHv5O4G9TWYnussW1UkMla6XlYzcAITI1BrHH5A+Cb9gshlAhDQpv6eGtxxrw8xxtAfScid+QotTWA1/BnJ6M4Jq5Ag6ZJZT1mxFL+X10QCIzmHTlzojnbRq4MnEI= X-Forefront-PRVS: 0098BA6C6C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(23726003)(7416002)(53416004)(81156014)(68736007)(83506001)(33646002)(189998001)(4326007)(230783001)(4001350100001)(97736004)(5001770100001)(5660300001)(36756003)(50986999)(76176999)(19580405001)(54356999)(19580395003)(66066001)(305945005)(47776003)(8666005)(101416001)(46406003)(106356001)(2906002)(77096005)(50466002)(2950100002)(8676002)(86362001)(81166006)(92566002)(7736002)(7846002)(69596002)(6116002)(3846002)(586003)(105586002)(42186005)(229853001)(7059030)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1445; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1445; 23:b5TGP5jdGtlqFhoJ37fuMCF7sjIdsk4HApXa2yz?= =?us-ascii?Q?fhQlu4T1PG+bs1jBjCUVXfbfYe4ppbvojF5luOC7xmEKKzDVBiP411JHV2OR?= =?us-ascii?Q?iv1GlV7AUzHlmsqR74fSRsz8sOPFCy56z4+6mvUXoT+TiSfb5dWTZrO3dpHB?= =?us-ascii?Q?M72oOydFttj28zFq9ADAP6vYlFlBBQOU9YHdKE32GxgVTppwYjY5C5eYU+wd?= =?us-ascii?Q?Mm0kYiNkCOecXLymDQBmN26vhRI6Ljk1GT88eeOHZjEi6XGaWHVINzqg9k/W?= =?us-ascii?Q?xbrKfIiTuwyN78KrpulaWQU+o2ixsje/r8eJZ9VICToQ8nE58aWEzkrES/SC?= =?us-ascii?Q?saYdk83TJnQcncI9dtZuhnfYc5v+pLhBfjM9+mVvFvE8v/8Av0Rxk4asR29D?= =?us-ascii?Q?GjiUH53d7BLV556nn00WvwKkySFiJ/jr4/cOip+EuCODGFfy5HSRQjno06uh?= =?us-ascii?Q?psL93llrpKtYmYgagG4PTbPPyO7JsLHw5oVd4n8oBiqVuLbIwS9xd9P3kKiA?= =?us-ascii?Q?D6/mByNoenSCbNd0G9dXoEwNybh2Aley/TXkeEJ2foJY8M6Kf437LSP4tqRq?= =?us-ascii?Q?+sxeiRvFHSbRjHSjK2RYlRcGuw0MwDPzBmlMqEo92QL4hFQh78DSCz1LuTRM?= =?us-ascii?Q?jJm5hH+IFjvQ05lLlphwBtpV+Mh+dWti9XfJITkrImQYhbd0L9tPocaK5JoU?= =?us-ascii?Q?G7Hm8w3lIg0wYClyMNOmUOzmkgtUiIqYr4/+T+BA9z6B3eupXjsTLtDhXmuQ?= =?us-ascii?Q?q/oWdOgxnwSlrouU8KDFlZ0Gkd7gEc7iezjp+9LU86JZNZy8vFS8SL4hIN2l?= =?us-ascii?Q?jD5M81A4T0ERLH+oBFkVHtede44UaQwCtzwLJWkCB7riu68sK3KxRJR3Q/Ez?= =?us-ascii?Q?GqrjzrOWBV34zjm0ffLdMTQaXju1rB+5Z9J4M688yUkfD5ZTH6Dq2/IVOTjR?= =?us-ascii?Q?KSjj/FcuZ6C+SQ49hX8Whl58Nw+4WA5EHKzNlgBSJBPFfhOlQdFVhwwde/2+?= =?us-ascii?Q?8UULGCqgT7I81QbSu4p0gF8OWpqzymG+wa/RupD/cQN1u8f+qVJhNbzc5Ha4?= =?us-ascii?Q?OLNPuLAMsSOkzK2+Mg3Y8pQ+saTDgcwRgErH6jLtCVstvPyEkbvMdCvifj+4?= =?us-ascii?Q?Lx8YjHj8QiOhGF44+xzQnmmwBITGX3ORoKkMIjvi5xNuujcZKfN6cmRacn1V?= =?us-ascii?Q?p6e2p7mnyn8S/yarCb3L4EZljdXSeHvWWT0KLEMDwhx44NJlziCUfrdgDgYk?= =?us-ascii?Q?pJEMiAkMgRvaFVGWU2+aSplCJgO+wM13uRuLcMoBU?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 6:4m02jeCGkLtBwUD88+aWromgrgQSXtvEbqlWMxuRzAuoDLoTE0FU0JgsXAoYFxj8hhEUV2AR12ROCKs4ID+IvVaX7I9xiYAmkISdyAhou32ejpJozhIaqG/A73pSUJ6Kp0uwOIIgamPqgeuzrVI580lgzeqht4Zoa68hzCexmfPWXTrLIzLtH4Xmhu3ddbRjbxDlkNZBsxSVlCDL4xaBAZImBe8O15McYhVKPR/qDy9+ARY69CMInkrAq/LPz3+6/PTs2PRQZj2W0s569/+538ijyxuj/U8CgSbp9UuhNYOt1l5GDwB40jkZMZtLsr7mDr4ntYIv7N6Nmi1fiwk1p0nelSaZwCstQPAM5ARwqNo=; 5:591cfYrtzBbQsMgE1P+WmT065TCTy/JMmuBaaQRjMx74b5SncYn+QxWT5UKJNxeB8XH5fuG76E2zEldMqb346w+ZoUAoBq4HTlSgf/QCIdQyVT0yoLcqEzJU2gVfPxpAFw2SdpsKhFn9pOTO7n4n4xdeStYIcauM3RdssbFaJSg=; 24:8Sxd/e0JvgcluatUcoNS3LLvjqosJnneavTokbcQTUUkoZS4au3nbMs1uHusJcOeIU3hW99dBzplX7botVGAdoVnDgyM4AxTalQSENiK0zE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 7:PuVCCL25TKWXMYoB5vEEm5lu74oKp9v6TsaL1TG6rUG/g/foNKN3RFEBp2bYBkwjWiH8eg4qWikj4YOinbtXrUEBpjXySR7TuaATTneWMe/aYYbrIH2v1Jdm3BMmgD2Hf5J+9j1Q2wyVkpGTRz/XM7aGFufs38o7SlO5hCKqXx5G6cNs5uJmRVBEH1fKCvBMqLAq+xgw+7l4/qv4d9g06rbyi74aXcv1RrHF3f0CrdV9JVg/S2paqPIVcUElTr3690DobheuWWAorVcNRH9X83m0KkDiNw7WDcQbN8ReTN8oplRw/HbLihkq4B1SwOWhWYWnFypOVebVwNEnxwe0mQlNMxdlWbS0mf0alES+/5I=; 20:hJbCeCTrTBfR1+KW+69vfObUCkWzh52Pr/gsu/oBlHWx4PmgusDR7owwzgawGKWPkk+sNDvmvIlyjssfKezXp7uqj8x42/DfJ1J7XP5IsVliLphuU7ujnrhY/JOvUlImqtRYsg/3RuH3HDcxIZhOKKSw9K96pwvItJuZKyCh8AM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2016 08:34:57.8929 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1445 Cc: Linux-DT , Linux-ALSA , Liam Girdwood , Linux-Kernel , Simon , Laurent , Grant Likely , Frank Rowand , Guennadi Subject: [alsa-devel] [PATCH 10/23] ASoC: simple-card-utils: adjust for graph on asoc_simple_card_parse_card_name X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto It is assuming that the card related information is located on "card" node, but graph case doesn't have it. This patch adds node parameter to adjust for graph support Signed-off-by: Kuninori Morimoto --- include/sound/simple_card_utils.h | 1 + sound/soc/generic/simple-card-utils.c | 3 ++- sound/soc/generic/simple-card.c | 2 +- sound/soc/generic/simple-scu-card.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index fd641255..09750ac 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -32,6 +32,7 @@ int asoc_simple_card_set_dailink_name(struct device *dev, struct snd_soc_dai_link *dai_link, const char *fmt, ...); int asoc_simple_card_parse_card_name(struct snd_soc_card *card, + struct device_node *node, char *prefix); #define asoc_simple_card_parse_clk_cpu(node, dai_link, simple_dai) \ diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index e5b80f5..6bc1510 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -79,6 +79,7 @@ int asoc_simple_card_set_dailink_name(struct device *dev, EXPORT_SYMBOL_GPL(asoc_simple_card_set_dailink_name); int asoc_simple_card_parse_card_name(struct snd_soc_card *card, + struct device_node *node, char *prefix) { char prop[128]; @@ -87,7 +88,7 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, snprintf(prop, sizeof(prop), "%sname", prefix); /* Parse the card name from DT */ - ret = snd_soc_of_parse_card_name(card, prop); + ret = snd_soc_of_parse_card_name_from_node(card, node, prop); if (ret < 0) return ret; diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index f608f8d2..342ff53 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -401,7 +401,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, goto card_parse_end; } - ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX); + ret = asoc_simple_card_parse_card_name(&priv->snd_card, NULL, PREFIX); if (ret < 0) goto card_parse_end; diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index 348e9a7..a8164a2 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -239,7 +239,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, i++; } - ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX); + ret = asoc_simple_card_parse_card_name(&priv->snd_card, NULL, PREFIX); if (ret < 0) return ret;