From patchwork Mon Aug 31 12:49:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 7099671 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 45A4DBEEC1 for ; Mon, 31 Aug 2015 12:45:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5866020585 for ; Mon, 31 Aug 2015 12:45:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CFF920582 for ; Mon, 31 Aug 2015 12:45:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752932AbbHaMp1 (ORCPT ); Mon, 31 Aug 2015 08:45:27 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33798 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752895AbbHaMp0 (ORCPT ); Mon, 31 Aug 2015 08:45:26 -0400 Received: by pabzx8 with SMTP id zx8so138757992pab.1; Mon, 31 Aug 2015 05:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=e4hIdokrIC5Ih+IqwfOdhz6YoUn/GgiYBjn6Y0CxeIA=; b=WEtytol7FCpyXs8OPnulBw3WZojqQOz7yfXR9tRiEha83g1+e3GfZV3ORPf410IxP6 0JQuqQjYucJFm6UbUVVpoZWlCO0neY66hUqxR+SwOEE1UiEaG83Pe/5r3tPUQoSL7f9Q o6rlpEyBLxL3QiC16e/E10kDgzVVY+5b7igri9xpo7gPKrEt0SPy3kzmIXZtKzcNvTwP RUzu2btEGUjm8t/AdoWNkzQFqJxXiFHBo+o3wIdqIRckNucJFdmjPI0+aOgE1bN6M845 EJJ7y7IVGt7W0VcwRqDaSHhHjs9RAprQzilxX23J1Lz30osVCsbG9zsl3xKwN4ppUcpi SBVQ== X-Received: by 10.68.196.233 with SMTP id ip9mr37183117pbc.139.1441025126021; Mon, 31 Aug 2015 05:45:26 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id v10sm14501716pbs.19.2015.08.31.05.45.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Aug 2015 05:45:23 -0700 (PDT) From: Magnus Damm To: linux-clk@vger.kernel.org Cc: kuninori.morimoto.gx@renesas.com, linux-sh@vger.kernel.org, mturquette@baylibre.com, gaku.inami.xw@bp.renesas.com, sboyd@codeaurora.org, horms@verge.net.au, geert@linux-m68k.org, laurent.pinchart@ideasonboard.com, Magnus Damm Date: Mon, 31 Aug 2015 21:49:38 +0900 Message-Id: <20150831124938.31057.21553.sendpatchset@little-apple> In-Reply-To: <20150831124842.31057.54534.sendpatchset@little-apple> References: <20150831124842.31057.54534.sendpatchset@little-apple> Subject: [PATCH v5 05/05] clk: shmobile: Make MSTP clock-output-names optional Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm This patch updates the MSTP driver to make the "clock-output-names" DT property optional instead of mandatory. In case the DT property is omitted then the function clk_register_clkdev() is skipped. The default for new SoCs is to not use "clock-output-names". Signed-off-by: Magnus Damm --- Changes since V4: - None Changes since V3: - Added support for multiple MSTP bits. =) drivers/clk/shmobile/clk-mstp.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/drivers/clk/shmobile/clk-mstp.c +++ work/drivers/clk/shmobile/clk-mstp.c 2015-08-29 18:01:00.662366518 +0900 @@ -199,26 +199,29 @@ static void __init cpg_mstp_clocks_init( for (i = 0; i < MSTP_MAX_CLOCKS; ++i) { const char *parent_name; const char *name; + bool allocated_name; u32 clkidx; int ret; - /* Skip clocks with no name. */ - ret = of_property_read_string_index(np, "clock-output-names", - i, &name); - if (ret < 0 || strlen(name) == 0) - continue; - parent_name = of_clk_get_parent_name(np, i); ret = of_property_read_u32_index(np, idxname, i, &clkidx); if (parent_name == NULL || ret < 0) break; if (clkidx >= MSTP_MAX_CLOCKS) { - pr_err("%s: invalid clock %s %s index %u)\n", - __func__, np->name, name, clkidx); + pr_err("%s: invalid clock %s index %u)\n", + __func__, np->name, clkidx); continue; } + if (of_property_read_string_index(np, "clock-output-names", + i, &name) == 0) { + allocated_name = false; + } else { + name = kasprintf(GFP_KERNEL, "%s.%u", np->name, clkidx); + allocated_name = true; + } + clks[clkidx] = cpg_mstp_clock_register(name, parent_name, clkidx, group); if (!IS_ERR(clks[clkidx])) { @@ -231,12 +234,19 @@ static void __init cpg_mstp_clocks_init( * * FIXME: Remove this when all devices that require a * clock will be instantiated from DT. + * + * We currently register clkdev only when the DT + * property clock-output-names is present. */ - clk_register_clkdev(clks[clkidx], name, NULL); + if (!allocated_name) + clk_register_clkdev(clks[clkidx], name, NULL); } else { pr_err("%s: failed to register %s %s clock (%ld)\n", __func__, np->name, name, PTR_ERR(clks[clkidx])); } + + if (allocated_name) + kfree(name); } of_clk_add_provider(np, of_clk_src_onecell_get, &group->data);