From patchwork Fri May 20 09:55:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129081 X-Patchwork-Delegate: geert@linux-m68k.org 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 947E76048B for ; Fri, 20 May 2016 09:56:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86C2F1FF6C for ; Fri, 20 May 2016 09:56:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AF992793B; Fri, 20 May 2016 09:56:00 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 EEB9F1FF6C for ; Fri, 20 May 2016 09:55:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755204AbcETJz7 (ORCPT ); Fri, 20 May 2016 05:55:59 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:58844 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755186AbcETJz6 (ORCPT ); Fri, 20 May 2016 05:55:58 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 20 May 2016 18:55:56 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id EBEB252EC1; Fri, 20 May 2016 18:55:56 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id CBE531807C; Fri, 20 May 2016 18:55:47 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 0C2A5180A4; Fri, 20 May 2016 18:55:47 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id UAJ04347; Fri, 20 May 2016 18:55:47 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211714966" Received: from mail-pu1apc01lp0021.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.21]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 18:55:46 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=cZMn4XRGr8oNa9ton6xkHAl+cVeYxuBwBxZYIibyuHE=; b=eCwyHdIK5OCiVtg1w0PmAAMkJcajZ8vxjUbjLMwG/PzRBi5fV8R/Cic/9QHsvoCc9LzjDawNExsWWhTdMSl+vTvsX7FtQ96H/KeEvD+OFa7HDA804PC+e8ABbvURZsBpeeKNbBop+KdgzJfQtADkQgh7HorfF7rKNLg96b5+l3A= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR06MB1710.apcprd06.prod.outlook.com (10.167.82.140) with Microsoft SMTP Server (TLS) id 15.1.497.12; Fri, 20 May 2016 09:55:44 +0000 Message-ID: <87k2ipqct0.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 25/49] ASoC: simple-card: use asoc_simple_card_parse_card_route() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> References: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 20 May 2016 09:55:44 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0037.jpnprd01.prod.outlook.com (10.168.40.175) To SG2PR06MB1710.apcprd06.prod.outlook.com (10.167.82.140) X-MS-Office365-Filtering-Correlation-Id: 4f6b197d-bd1d-43de-f777-08d38094e975 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 2:rmoHVxW6f+8bVND/FgW6bfEiaYcxxd075Mq6H6Ge6zP7YTzmJaXEZ6BlpW1/0axINpMPaR4jz4REbSdjJRv0kcObxI/916Kz4JYGCxvrSxneOr8jt2ZPlW3VNWwPusDBUTVcGKjuLWvPmLFMwRDggx14wL/l4nNZxzEYeUtouazNxA5P2Gw8AOtyG/RTMdLt; 3:zCQsFcf9Bvi4/aOz09VNarQHVzpf4d0v1t5N3RZHJmnF6Wasqok1LTa4rFL9Ea5CMcQYzgboemi43vxctSNMFqAZZZ/K1xErWCVLR/UDa0TGBquJEBgzwgxDzdNY2ke9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1710; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 25:AZ1Olq4wHcW4rm6BZV/ttIw9gu9qOFZ7vTevnbqNwtv3ST0ufbqjOSwP8TeBCPFRI01AU5dnpxEenZnqUkifcfkWWLD9tnYiNHm301klVdrZswc534Knm6TYjKAERCcua9E2LeKSCSVKf3yGvAaQUEmPIj5v73WbYdDeSTsBXRRsuUx38CDuWa3Bwngu65f8DqlQb7fONMEr6Q9EkajhvQVABSgC1QmacY+FPWehTxZJI3cfernfNzeNUtkiu+YsVzKWsLqH5yxQHk1pgGqkGERg6oGJwdP8hOsGKGlCVGWOspcCexGN3JsZuaeE7GVAYBifJy66AsPcy7q3E10AcFZFrzCiHtSP9cv16hVfoDS4si0v4t/+qGGV5niZlYwvldfNavAOMWYPPlXtib1LaJhQArWhCOzDYr9yaNV+ZjGAq7Qbb4uE3breNv3oynnqAY9l7LOSUGfByxrBmmjltA6PdCrfDPrKkFq6gQOEm1mOZFshBVgOZmRlrFYw5GVBsTa4wIZGYyVrsQluQpvu3dHX37BRbCzain5MvT/EAFUUnSAvWiBXFedvcmIEp6WRXxa8jA78FMGDEOwPWijkWgPFir+NDv9YrTqKrkCM7rMAI6RCuVo5ceMB+LO/e0jtafIiLSc2CFVR1gZZzLlotoWhkNaP11/DLUGpAGqV9wcowmMu3Ug3X/SfSLdvWtW4YhGIEy5wI5m8inagYEuiHA== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 20:FL8ECI+BaaNYVg4j7sROfYlJ8ADj7r5yBOSI5QBHxVlqlK33TmoFbpiXCMiIbRDH/Z9T77DGrQXWOXCtu6/uJFkTkB2BEVb8A4x9+KteOaKM/D1tG2UAW40ZHRhYUPsjMYMueeuvpOtfVFbfzm3ZLqaxOLjPJ+f80LwcU4kTHyCb2U52uQnVCly+90BK4ljjbmELgewjKZ81702FwQkkgT1IDNgKZOM7nCefGjbSumdO510ES42cYKho3M7ZtqbHUd/tsV2OCOPAVuFUXOB5KorzNutaLmC483UxMsxbaWkV2U2rusrJbFQ3XPqvF0c7Q+kgABWXXoiZlAn1DdBnhA5ltFLoqE/H9yI5KPyvboUtQyVYPZmshWjM077lzOKZLBHZOkhtyDeBfM+skPECLtP30uwQzIOvOdqoLC15n8dHk4zybHVP7W8CjkH3UHvGGnrBWMge0kI5XQ5JeE11RYDvadXmAHKhgBrlQk6ybJEVE6nlBjdfYMhTQvRrCrIC; 4:LkbjfWwcQYNhdcZmL5A6SpKaF3I61YvhRsD+mCKiTZvONPAbnFPH+ekv8rci9frQzsUzDd4/0Le3r0fea8S2UR/n9j2D815td4JsVWBm/S8nCveFeC9EuROsObWkVQVlrO2roTclGL5AF6Ww9R7bi620CYmA7SZJNqjM4fI/kpslXHTXxVFv1WBWlIh/iufcnJnrJeI7i0R/alerFzqRENzxSiuN1Xl7wMiTO6WjcDSqEu7CWEvfnIMPoEcneraZrb7EL1rbjhWuUvuTzr+0W7yZMbf9zv8sKRQsw4xmYLtYZ+WpNhzZvcUuBBaMr6ICtdEf1On0prqZsx4MnBhhF1jhqvR/9UZNB2RMtmFKlQwxS6n2tpsdF/GstALCy2ATgcHR4MGVZMDvdecaq7PXBQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:SG2PR06MB1710; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1710; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(81166006)(66066001)(47776003)(19580395003)(92566002)(42186005)(2906002)(586003)(5004730100002)(3846002)(86362001)(6116002)(19580405001)(4326007)(54356999)(76176999)(50986999)(53416004)(8676002)(46406003)(189998001)(33646002)(110136002)(77096005)(2950100001)(36756003)(50466002)(229853001)(23726003)(83506001)(5008740100001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1710; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 23:O+md8pIK140egTqXME2L4tUpQdQJfUTY7wDOpdMxwn+fJXmT7wBiyPq0fNyjfpXI0rti/9aofnu3qwXCgcg3r4IP/XwBhwalhrb9c7OCZNHtSqvmTKZHG0zWq4mqUSul+Jbs2Tbroh6+6EMLLy1jHFbgjWKoFEckvEMj+gxry5s3JuNr9Ft52OnNfjkZFBUF6CY0Rx+A9Xw2j4IOCF+HAgfBYOB4enhXY4J3YumWlqBipHwQH6pQBPS0YFL8xMf4Gcl2wJevTPCl63gJzDPfrT6nmwkVESWIwzPsySPoT+PNmvn4FSZ6FAkuWy8HrFo16e6vuVmtv0nRYlCj9vxQJ9qogN9xYSx88MupQpmdk4iB6RuSqpSM8BuM/1O76uKjR/R+6RYa0tP4M1HLmGYwa2k5wZN22dY5KOQ/Pidj8SJuV6xCXh7jSRlZoV/UsUATrmrPZ7XdXnhBNeyClupOiJpKJEiRM8fXkIW0w7llBcUuTOvGIOULvEeRkFHqzZjfcfYNueE0zh52+1LEAUmCxWulhSbgZa5y+qjCnzy02CQ3p0bQpBdB0bbBN1Vm7wdUUyc9xxskJOCkpVszEwEko1Wfd31mo2HGeSOzKO2wYN3g3gFLN+J7pH5R92PtqtNaWmv6bYOMhRy3Ae29l7kL8IzlwBqC/Vv5rFcyo1jP3H9M9/brlibGgQ8hzDmFq4oEeeLtWJ8YDd65J16hwZdU+oGBwk06dkGtYBWxxFmdQpPjavn6Si3vfKyJm8P3Z+Foyok/68HvTliQsux4w+qCnv0qtp5X+FSNcjCrjykZoXmQQVigQVPhAAIuZEkinIisWpiVtVYJ0mSeK5pAByqcMa/sfoEU37ljHSVggVaSiZGIxR19iVXIjkNdl3eNPi2QksduSDWsUk7/FZPlzHgjBQ== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 5:sa5/bqJ1m5h+kWkOH+hpdxcqiveq69zagi0LvPtH4PZuyhl2+aKYhfNDrU9xHwofWogBk31nhS3p2qLBfpJt+cV7FtIjLlOHEzRnqdyMat2oSvRWGIj5wcLsWgW9g7MXrg+B/rfAcoQy3NW4IpUJ3Q==; 24:zHes9B/JogxDY0Yml1hhU2pvBbM1yQzdPYVs0QUNapEXkSo9nwe6upd+nhpNVijMD4oat81cBtnKlzhsUNoGBvGfAkmJ5jUBfk6batm7BVo=; 7:sH+mdE/2BSXV0I6O7/HJX9LzKtuQqUMhSZT4zVNnyTcULlL+Ike6RHfhKxCHU1x5cTk8Dy2KZUj56lQ7keq4Sjj3IIV4VdaKjjELy6MSv44ZWogUv1iqDr/mPxqiXTRan+u4HmyQdDMc7keJaYyG5nitg8YCUp/bTFRpNHyxxwF96LmdaRYXw6a1Tb0QoDbV; 20:yV65Yf6HvlX8bfEHeTp6j8Ic0iRxux0535eXhcMQo+Ue56xIRBw3YFJbmCBu2hds1VBcDoJ7QfuIfHp9zL4ydWknNb+OLKohWJBhcrC8h2G5dmUHCz2YRmfbSgzFouBDCEhzKDkFRQYfn83vogcBkn7aPp8D1MFpiPXwO1RlWj4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 09:55:44.4240 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1710 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 Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index a85245c..5b2559a 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -361,14 +361,6 @@ static int asoc_simple_card_parse_of(struct device_node *node, return ret; } - /* DAPM routes */ - if (of_property_read_bool(node, "simple-audio-card,routing")) { - ret = snd_soc_of_parse_audio_routing(&priv->snd_card, - "simple-audio-card,routing"); - if (ret) - return ret; - } - /* Factor to mclk, used in hw_params() */ ret = of_property_read_u32(node, "simple-audio-card,mclk-fs", &val); if (ret == 0) @@ -408,6 +400,10 @@ static int asoc_simple_card_parse_of(struct device_node *node, if (priv->gpio_mic_det == -EPROBE_DEFER) return -EPROBE_DEFER; + ret = asoc_simple_card_parse_card_route(card, PREFIX); + if (ret) + return ret; + ret = asoc_simple_card_parse_card_name(card, PREFIX); if (ret) return ret;