From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754255AbcK1Crf (ORCPT ); Sun, 27 Nov 2016 21:47:35 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:53194 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754233AbcK1CrX (ORCPT ); Sun, 27 Nov 2016 21:47:23 -0500 X-IronPort-AV: E=Sophos;i="5.31,561,1473087600"; d="scan'";a="227092356" Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Message-ID: <877f7owccz.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 09/14] ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Rob Herring , Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , Laurent , Guennadi , Grant Likely , Frank Rowand , Linux-DT , Linux-Kernel In-Reply-To: <87k2bowckx.wl%kuninori.morimoto.gx@renesas.com> References: <87k2bowckx.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset="US-ASCII" Date: Mon, 28 Nov 2016 02:47:16 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0026.jpnprd01.prod.outlook.com (10.165.48.136) To SG2PR0601MB1456.apcprd06.prod.outlook.com (10.169.106.22) X-MS-Office365-Filtering-Correlation-Id: e0e61b7a-c39e-4c9b-7519-08d41738de33 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:SG2PR0601MB1456; X-Microsoft-Exchange-Diagnostics: 1;SG2PR0601MB1456;3:6gwzgf7jjv7r2sovHI++kerXh/Z01ObzxjGNRVlCOQUEI2M7BEmlY297Z8qDKK49jMC/ugX8ry1dwXyrCA2TsNuAYGh2LH/WXy4ZsJhPk5b13JM7pIuVUCTu3A50cZmvBHeYUzKiEFJpAEte6i0r1ZgfZcoe1lm+Z+fMJ/QgNBuFpt8IE6sM781iFZfAL55ukoDW1b4SFatM6233x3trCd8SXdUzpiPo5CB4j4JrimhfLeSPvq+r6S27L3/dDE081biWgmi60YOuPU62qpRi4Q==;25:jnywbz26NB4nLOKO8pwMt48n7pskldaDzNuhivEmPWSl/p0xRbwNVxhPkICRmI18DZzOZO/q37h+T/C4LtN2QOOIVVRl8Y47KIiGuyvWhkHm0T0c8wvCi9sJvt7jIMExHYJHk6XdkORLF9XVmtdVpm9/tFl8j9rCsHBARlIyp9pOfyKgxwn1itxPzhEgc0lxMgPnmV2MUBEEODb6ROjCxIqnF+TNuwqQYltpVLsmV7yaDKgplHBHQ4v7xdqz4UZ/dAKCirFABEcKUGTIlGZ5ufNK621q5+GXtOQHePN57fkXIIDzpeoha+4UKQDCqBWNPU4rUkJ1IZ2L1wIAnAJySWx/6nwpEFyGwN5PLvYn/8qxcfvU3X4MRLbHYzpOJy4ivu/hUh2G8fcQwW8h4ljgDDLh7Zqz8AV833tluXIL44KJR/OwdAciNrHdKc8ahJpgW6KlV/UPz7y8KXsiH1PcBw== X-Microsoft-Exchange-Diagnostics: 1;SG2PR0601MB1456;31:tJbu1nb+ZqqaZjkqG5MlGw8t/ynskvPiTgcjLJtx2p9awMB0ihTNnacSS7YmsTK9vYM3e2fmN9Dm8I3f+t3mByWWqGa1nlFMTO4YhUrCtJnP7O/wez2B04wXvGRrGNHwLxSJmVnEf4XMDc4xm8dsyIyjgIddubZcz0l3k8xDGCP8l/QxQa8V3mbYjZa3EAE+DrhE+wXTA+DV3dS6oBJduevJFcm8qkJq+ZEgC/JGkEvy+oaN9jojhrpfXASqXiv4WxVszgz780SaTr92bl5gDg==;20:pxnWLftBrnb9iyWRhcMKbZOg2LPnhJCFHlqp38hI5ay9B6rRzLqxaQoYWIyhQUlTbJGLZiiXbnlI3iX8BxtBcytlkGhMQ/tY6UlV2CsQkBGcgh9XOGgLphsmZ9QRi7wqfbfHGp8A5Cx3Mx112PceN1ReutuklfPRDpjuBXiOtgGjVWKEKjlygfH3FUQR/AWBT7OONusnyL7gKox6mwYGaWWSKQEyq6xGge6gW1hSAuHL7sBXQfAZfks/DF5SD8VJz6KQh0ABweEEAj81bIzibCa2dMMoJ9sZveQODRCgVixSwhXjqjGU6ySKFra3/dn/agKAhABVIuKg6jMHUNsXbwXzHnPiDY5MiJA+R7a7wua/CO+5A+Y2RXt+TGkbsWgPIjt6rt5v4lb/MXJRcC22mnpWNbzZbj7CED3UplkrihxI9Jaii8vWtyRYp1ZrQTMNTFdk2iBDnGQu+xJ8UBGydjh9IPR0tZyzLvm607vVsTX17MZwcNz1l85UuthPo4g0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6060326)(6040361)(6045199)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(6061324)(20161123560025)(20161123555025)(20161123564025)(20161123562025)(6072148);SRVR:SG2PR0601MB1456;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1456; X-Microsoft-Exchange-Diagnostics: 1;SG2PR0601MB1456;4:vT9vy17yjqjYPuXLClni6vCLjtnfVTd9Ma/WVL9En1+h794mc0Zc/i0vUt8eKmcQCjAs+CwR6/4MT2Y9yK1rqWM0Z7/y2sS4S6R6MoZCRnTaH/hf0meg8mlgu5vgw4va8imVsHebKEA0ibnatQ2ILAP+3aG1sV5WBekU64KMOE08W+YnI5E3xvNIYYkArFHdHl4r0X7QeL+KuaXIiYnQrNCKeE1ujn6PdIbRmWhU0V8ETkuA9HTlK++fj7ZAAMCVEw+dgsFRSY6SmL7oVYYmlD6uWbV/pmdYMu2ZHDC8kt1gwCas2rSYm7dXvP0MQ9z9RZoI8s+WWulGhJnwQCNgVClOrMZVapjDqdNiVjFAlVCv/RBasnoxg+4sHFOe6xwbz7er+C/8YuxJ9GO9FD1gWaeDLjrDb5+i8JiNtsvAyw8PMzhHOlpAKDf+39J8YRKgQW+JKW8jhubyAdCNgI0bayLKij7WoLeAXLJ7MDvyhfhqXFhZAqYorQpDcIyrrxTZOTXoVUDugY1SqluJHmv8pkzJnPUWjonBE0nW7tUlNVfrgTRCr9HJIyYtrwiabLW3P2qRZEFJPyaFRwjXJV73IUT18xljQqpVnHjb3K+tcqTzFnKNkSrUfaru8L8805omgF4iSGUSICBcysleLBYG/w== X-Forefront-PRVS: 01401330D1 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(36756003)(81166006)(50466002)(53416004)(42186005)(39450400002)(105586002)(39060400001)(81156014)(8676002)(305945005)(7736002)(39410400001)(39380400001)(39400400001)(38730400001)(106356001)(69596002)(86362001)(733004)(2950100002)(46406003)(6486002)(54356999)(76176999)(50986999)(68736007)(3846002)(83506001)(101416001)(189998001)(66066001)(47776003)(230783001)(4326007)(5001770100001)(5660300001)(97736004)(4001350100001)(7846002)(8666005)(7416002)(23726003)(6116002)(2906002)(33646002)(92566002)(7059030)(16060500001);DIR:OUT;SFP:1102;SCL:1;SRVR:SG2PR0601MB1456;H:morimoto-PC.renesas.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SG2PR0601MB1456;23:EeAnKO8jtexDnubscJOnGcMMxWYJB37OgNGBXRe?= =?us-ascii?Q?bYsBOMerltqVJSsx2U2JIA4RMl5CTDzJKwyTuwT7/cJmTACSU5TfXjcwoZka?= =?us-ascii?Q?ihNb1Sma7afiLObOLz+hPtRl5QOByViFnZjurdvHR1CiBETT/7yMRfxqFQ2J?= =?us-ascii?Q?pZqFlHWFvybm/WyKUv9UcaCQRVOgcK59qJcOWJa4Y70sS+YQnoT+5NpyXA11?= =?us-ascii?Q?15rRRkqJJeATbZa18ZTCa9r2zdUSW2bKBR96+mOXNHJxyO92srFChjYPCS5Z?= =?us-ascii?Q?cR76uRr1ckcHOL+tT3swl4SOOqP4u378gUcWXdZIG/nxuo30PIo4eqKOtl3V?= =?us-ascii?Q?/dTDkSaXz3ubB1AcAu5wYaOD9VHOPgNwiwDkYkrtMKnV9UHC382/YRd9kX+g?= =?us-ascii?Q?AW6L03AibAiBR1e1Yr10Nd7b/qEAcmEjdFARquKs1wRfsWGZ2sAHkFuIJYKD?= =?us-ascii?Q?xu8nD+R75gytXplgQtVPhjZUmxVApXlipW6ZyLwU3WSxQw2rJQib/yXXOjxT?= =?us-ascii?Q?7tBIshhTuPvc4ZDIEjXNc9n0+namY5vUVa+IppJ75Y4xWk9q+ppZH51lhz2c?= =?us-ascii?Q?tIs/eK2TpUvbtsqpYyd0j6vhFK21A045SEze36ZjH4J1Pv+6imWn96dGadj3?= =?us-ascii?Q?rizbxND97pOjuCP8E7pxa4xfCZAd+H976SOO0iIycYfNGJdPEdhEUF68+H51?= =?us-ascii?Q?Iq5moUoRGgILWTSoVOa1n1BZUUt9P+kLQKt0Y0FM+W85W6X1pdlbNLxGaCDc?= =?us-ascii?Q?g7ZGrFlymoYGFX5jD1e2/oabLToBTM3A6+MpAQcXO7E6yLZhpD1stw+tb91d?= =?us-ascii?Q?ZLZDRzOnhdhui4aTLa29oE6HfgCbE0Q6myg7+FmMqTzJFBAXpXDJ/itjs+1g?= =?us-ascii?Q?fKIPyXT/HCk5gHb4kxpCZURlXqUCFQN5CzwZITHTbn/HSmyZjLhnTW1X9BrR?= =?us-ascii?Q?uVs/hYXqOG9EiR5N0sBx5H9Wi3e3jtSRnikhlXllE5tRow+sQvPzPKB0BISU?= =?us-ascii?Q?h6YEeKuY6b4i4M1IMYEXh0Q2ULezj1b4wOrY1UPnnzUsMN2BhFI4iI9Ky2uw?= =?us-ascii?Q?kxxlzcAtfm++Y+8HfdhisFDLjCNuz4QYzJEabsH0K6vdTC4WDQyH++Ok+X2e?= =?us-ascii?Q?dXzMkj9cR823VlkYEV+lblyQEv35pUhq2fisxIWDbNQQW5WO9zSn8Ql4Yyhs?= =?us-ascii?Q?gWBKHgI+qxbU196rj/mdKQlfIdtikH9KvR0L8OMcR2X3q/FIYmYwH9sS+nRZ?= =?us-ascii?Q?0RSdEwLslaVaKHmyGX1dN/mWGIsAACbQT6d7at30aGbcjXdtU1+G63BDRvlj?= =?us-ascii?Q?i1W2VPo+bSzB9hcc5G/gRvDM=3D?= X-Microsoft-Exchange-Diagnostics: 1;SG2PR0601MB1456;6:LIkFJJtroLeN90yx6yYl5y3D6ozlTZk38osu52VCBXFH9baQWC4pdns171xoH93GLYEpcqHuWBTAhQt2ycbte5Fabi7pO2/VhI7hSRQeHZoAIo9aUwSNl271TWE7Z33bLuhxn/q9XhLbQuTpC3L5+J14d4+IyJ+rqxv8cc1JdDi9MarFvc0JNELwqnFblpOCSrLLwgHVLHmhSJZdXToy091AU6Kb3x/C7BsBX25/nQe4vjNs11tWZqL0IK8Dghcrjpvf24ap9tyJHY5LNifRsow9oeXqwWpasB9LL+C0/eNpy3lZgL3/W//l1CmKw8z9yL/mCxD4PdMNFyVC9KFTGU5ZOdwGXw+q4UEeoJ/14rrhDPZr5FVqkHpffsdmdzA5eWbPxekCtAO88w6jHSbX9f3g7tWSIAuWtRuqIiylwWiYN2eDxKrUW/e31h4pshwsDJRLp2u1+TrS2x+R9rz+b+q4Nr3JKpgw9yTCcEUmi761AJRMPJ8bCe5jxoMv/LWv;5:h66aSwsr4iivmQm/irtMLz1a9WN4TaHCLlu2nJ/w/mZdqgi+QE4Db1s27bJPH3sZgJpu6M3tDd37BGBWfOLm0v2m4IIVS120XwRNwAb9K51WBO3z/i75culWvZbQ1uSwvntj7AWrTglTxVs44eAS7A==;24:Bl01dYgY0jXuKCHskeYXgTbniNckDvnuHkKRU5MA5iNvhRtY73iKzvdoH++lHhGTkC5MnvUVBBJMihK4OPaUfyakXqTfEgi7K0OxvCTDwbo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SG2PR0601MB1456;7:26pCooC6ZM+69dMUG5RkiI0HBjlnuhBYtFpTY7qWak76rvqSevTjvgtZbR+50jlvQTAz7fil2KQcCZDksnxXGObJERtqMkL7vOsHRhKO4CGEZ6fcdQjLbCMAzULmnM6kf2bBXlerYgLaSkqKA41J0eGsNg5e1n5f/xmd9ddrSZwkpm9m3aAEbuqtDShKeG5xCpFjiiKviZzcGJRyTfWGHKCJs0s6OfBYxuhLAVedLPm3tWza5hdtPS4q//yJVX0RcacVyzRJGxUWMq5l0bvTuca4FMMnkLHfY3F7iHZI5tf2PrSth0/iBoQz9/WfwEx5JUwHyx/jpQb9kskQSuK2H5jX/QUX88NfqPBsObvVKJXjuQBuZJMFrvAqqZTqOdpsdD9UreOsdTx0IjlES1nVOc8wFBJKvgpuyzsnzSEJDOkhea/a2UJiCBt4O9prlpaDzIozheip5I/rVwQEOEZYSQ==;20:afwqXCyNp9q2UqZ0CitYO7TdPtsjyKb1XAX90wAWFiw//oNPGFJq5oFOJpycg8Ncw/yAthWstf9E5eZV/Pom4+IDYPyAUKINI+B88f5qNta114rd3dkFI1pzxAMjcqp0N2vVSUWkKdVnOcNLIQ/Q4yVaq1z4IN5xy5M24LVvGzw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2016 02:47:16.9526 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1456 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kuninori Morimoto simple-card already has asoc_simple_card_parse_dai(), but graph base parsing needs graph specific version of it. Signed-off-by: Kuninori Morimoto --- include/sound/simple_card_utils.h | 10 +++++++ sound/soc/generic/simple-card-utils.c | 53 +++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 09750ac..c223f79 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -60,6 +60,16 @@ int asoc_simple_card_parse_dai(struct device_node *node, const char *cells_name, int *is_single_links); +#define asoc_simple_card_parse_graph_cpu(ep, dai_link) \ + asoc_simple_card_parse_graph_dai(ep, &dai_link->cpu_of_node, \ + &dai_link->cpu_dai_name) +#define asoc_simple_card_parse_graph_codec(ep, dai_link) \ + asoc_simple_card_parse_graph_dai(ep, &dai_link->codec_of_node, \ + &dai_link->codec_dai_name) +int asoc_simple_card_parse_graph_dai(struct device_node *ep, + struct device_node **endpoint_np, + const char **dai_name); + int asoc_simple_card_init_dai(struct snd_soc_dai *dai, struct asoc_simple_dai *simple_dai); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 003331e..527944d 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -10,6 +10,7 @@ #include #include #include +#include #include int asoc_simple_card_parse_daifmt(struct device *dev, @@ -165,6 +166,58 @@ int asoc_simple_card_parse_dai(struct device_node *node, } EXPORT_SYMBOL_GPL(asoc_simple_card_parse_dai); +int asoc_simple_card_parse_graph_dai(struct device_node *ep, + struct device_node **dai_of_node, + const char **dai_name) +{ + struct device_node *node, *port, *endpoint; + int i, id; + + if (!ep) + return 0; + + /* + * of_graph_get_port_parent() will call + * of_node_put(). So, call of_node_get() here + */ + of_node_get(ep); + node = of_graph_get_port_parent(ep); + + i = 0; + id = -1; + for_each_of_port(node, port) { + if (!of_graph_port_type_is_sound(port)) + continue; + + for_each_of_endpoint_in_port(port, endpoint) { + if (endpoint == ep) + id = i; + i++; + } + } + if (id < 0) + return -ENODEV; + + /* Get dai->name */ + if (dai_name) { + struct of_phandle_args args; + int ret; + + args.np = node; + args.args[0] = id; + args.args_count = (i > 1); + + ret = snd_soc_get_dai_name(&args, dai_name); + if (ret < 0) + return ret; + } + + *dai_of_node = node; + + return 0; +} +EXPORT_SYMBOL_GPL(asoc_simple_card_parse_graph_dai); + int asoc_simple_card_init_dai(struct snd_soc_dai *dai, struct asoc_simple_dai *simple_dai) { -- 1.9.1