From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753295AbeBEPpX (ORCPT ); Mon, 5 Feb 2018 10:45:23 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:16402 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752925AbeBEPpO (ORCPT ); Mon, 5 Feb 2018 10:45:14 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20180205154513epoutp0270c2a0ba7424db749809d07f71389e8a~QeHPCZl6u3222732227epoutp02K X-AuditID: b6c32a37-433ff70000001029-47-5a787c083c2a From: Sylwester Nawrocki To: broonie@kernel.org Cc: lgirdwood@gmail.com, alsa-devel@alsa-project.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, krzk@kernel.org, jcsing.lee@samsung.com, sbkim73@samsung.com, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com, m.szyprowski@samsung.com, Sylwester Nawrocki Subject: [PATCH 2/8] ASoC: samsung: i2s: Ensure names of supplied clocks are unique Date: Mon, 05 Feb 2018 16:43:57 +0100 Message-id: <20180205154403.13520-3-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.14.2 In-reply-to: <20180205154403.13520-1-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrEIsWRmVeSWpSXmKPExsWy7bCmgS5HTUWUwfRXihZXLh5istg4Yz2r xdSHT9gs5h85x2rxdn83s8X58xvYLb5d6WCyuLxrDpvFjPP7mCzWHrnLbtG69wi7xeE37awW F1d8YXLg9djwuYnNY+esu+wem1Z1snn0bVnF6PF5k1wAaxSXTUpqTmZZapG+XQJXRuffn8wF 0yUq7vc+Ym1g/C/cxcjJISFgItF5ppm5i5GLQ0hgB6PE7z1TGUESQgLfGSWefTCCKVp4YAUj RNFuRok1Fy6wQRT9YpToes4BYrMJGEr0Hu0DaxYREJO4PacTbCqzwBkmien71jCBJIQFQiWO 9UA0swioSvw4+IYdxOYVsJaYtmEPC8Q2eYn3C+6DDeIUsJHYc28Z2GYJgR1sEou+/WKEKHKR eLzgC1SDsMSr41uABnEA2dISl47aQtT3M0qcWNMM1TyDUeJO+wQmiAZricPHL7KC2MwCfBLv vvawQjTzSnS0CUGUeEjs+LIYar6jxO/Vy9gg3gcaeu7GZpYJjFILGBlWMYqlFhTnpqcWGxYY 6xUn5haX5qXrJefnbmIEx7SW+Q7GDed8DjEKcDAq8fAKZFRECbEmlhVX5h5ilOBgVhLhdbpe HiXEm5JYWZValB9fVJqTWnyIUZqDRUmcNyDAJUpIID2xJDU7NbUgtQgmy8TBKdXAyH/2Xtnz fwbz7TmKdpg+Xi3s8urGU4Hv2//c5p8nFPBhc/mLyx/N9SqK/nclrK1fzWe4IDxOdGNS6VaD xdPbra+/Y7xu+Pf+y9xtTV8/3tCwPrI0+eLSFJ7rzPxrCzbXHHvv6r5ZSSeza13TsaOOn48X qm9P6npmrZ92fnNc9PyT7+7VWlZ4mCmxFGckGmoxFxUnAgCkjHfA5QIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFLMWRmVeSWpSXmKPExsVy+t9jAV32mooog+9rlS2uXDzEZLFxxnpW i6kPn7BZzD9yjtXi7f5uZovz5zewW3y70sFkcXnXHDaLGef3MVmsPXKX3aJ17xF2i8Nv2lkt Lq74wuTA67HhcxObx85Zd9k9Nq3qZPPo27KK0ePzJrkA1igum5TUnMyy1CJ9uwSujM6/P5kL pktU3O99xNrA+F+4i5GTQ0LARGLhgRWMXYxcHEICOxkl5jZ/gnJ+MUpM7e5lBaliEzCU6D3a xwhiiwiISdye08kMUsQscIZJ4svES+wgCWGBUIljPRfYQGwWAVWJHwffgMV5Bawlpm3YwwKx Tl7i/YL7YIM4BWwk9txbBmRzAG2zlmi6KTCBkWcBI8MqRsnUguLc9NxiowLDvNRyveLE3OLS vHS95PzcTYzAENx2WKtvB+P9JfGHGAU4GJV4eDOyKqKEWBPLiitzDzFKcDArifA6XS+PEuJN SaysSi3Kjy8qzUktPsQozcGiJM57O+9YpJBAemJJanZqakFqEUyWiYNTqoFx61KL4BP/Esyz 7m460fCP707ZMzc31tlPK9+e/LC/7rjIbmu90E9S+fy5X3bHfVl6cqHulAtcbyLSn58QeO8V P6dO1is948KhJEPRiXvlpj2bvKHFQdyYWbjs/bmc+p26H47tfPvt9I/4KXkONzfGaPAfXXo7 9PfsCTo7Zi3d8YTPdIPa9mUF0kosxRmJhlrMRcWJAGS6T5A9AgAA X-CMS-MailID: 20180205154511epcas1p14dccb00b68fdb688f2c427c56e01c052 X-Msg-Generator: CA CMS-TYPE: 101P X-CMS-RootMailID: 20180205154511epcas1p14dccb00b68fdb688f2c427c56e01c052 X-RootMTR: 20180205154511epcas1p14dccb00b68fdb688f2c427c56e01c052 References: <20180205154403.13520-1-s.nawrocki@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to support multiple instances of the I2S IP block the platform device name is prepended to each clock registered by the driver. The clock-output-names property is now not used, this should not cause any issues as, for example, CDCLK clock is referenced through DT 'clocks' property, not by name. This change allows to have both I2S0 and I2S1 enabled simultaneously on exynos5433 and working properly when #clock-cells property is specified in respective DT nodes. Signed-off-by: Sylwester Nawrocki --- sound/soc/samsung/i2s.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index aeba0ae890ea..b7d25a63da8b 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1193,11 +1193,13 @@ static void i2s_unregister_clock_provider(struct platform_device *pdev) static int i2s_register_clock_provider(struct platform_device *pdev) { - struct device *dev = &pdev->dev; - struct i2s_dai *i2s = dev_get_drvdata(dev); + const char * const i2s_clk_desc[] = { "cdclk", "rclk_src", "prescaler" }; const char *clk_name[2] = { "i2s_opclk0", "i2s_opclk1" }; const char *p_names[2] = { NULL }; + struct device *dev = &pdev->dev; + struct i2s_dai *i2s = dev_get_drvdata(dev); const struct samsung_i2s_variant_regs *reg_info = i2s->variant_regs; + const char *i2s_clk_name[ARRAY_SIZE(i2s_clk_desc)]; struct clk *rclksrc; int ret, i; @@ -1214,30 +1216,35 @@ static int i2s_register_clock_provider(struct platform_device *pdev) clk_put(rclksrc); } + for (i = 0; i < ARRAY_SIZE(i2s_clk_desc); i++) + i2s_clk_name[i] = devm_kasprintf(dev, GFP_KERNEL, "%s_%s", + dev_name(dev), i2s_clk_desc[i]); + if (!(i2s->quirks & QUIRK_NO_MUXPSR)) { /* Activate the prescaler */ u32 val = readl(i2s->addr + I2SPSR); writel(val | PSR_PSREN, i2s->addr + I2SPSR); i2s->clk_table[CLK_I2S_RCLK_SRC] = clk_register_mux(dev, - "i2s_rclksrc", p_names, ARRAY_SIZE(p_names), + i2s_clk_name[CLK_I2S_RCLK_SRC], p_names, + ARRAY_SIZE(p_names), CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, i2s->addr + I2SMOD, reg_info->rclksrc_off, 1, 0, i2s->lock); i2s->clk_table[CLK_I2S_RCLK_PSR] = clk_register_divider(dev, - "i2s_presc", "i2s_rclksrc", + i2s_clk_name[CLK_I2S_RCLK_PSR], + i2s_clk_name[CLK_I2S_RCLK_SRC], CLK_SET_RATE_PARENT, i2s->addr + I2SPSR, 8, 6, 0, i2s->lock); - p_names[0] = "i2s_presc"; + p_names[0] = i2s_clk_name[CLK_I2S_RCLK_PSR]; i2s->clk_data.clk_num = 2; } - of_property_read_string_index(dev->of_node, - "clock-output-names", 0, &clk_name[0]); - i2s->clk_table[CLK_I2S_CDCLK] = clk_register_gate(dev, clk_name[0], - p_names[0], CLK_SET_RATE_PARENT, + i2s->clk_table[CLK_I2S_CDCLK] = clk_register_gate(dev, + i2s_clk_name[CLK_I2S_CDCLK], p_names[0], + CLK_SET_RATE_PARENT, i2s->addr + I2SMOD, reg_info->cdclkcon_off, CLK_GATE_SET_TO_DISABLE, i2s->lock); -- 2.14.2