From patchwork Tue Jan 15 09:15:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 155646 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4650669jaa; Tue, 15 Jan 2019 01:15:40 -0800 (PST) X-Google-Smtp-Source: ALg8bN5+ayJZnweL/V93l9O2m9b7v2XibYifTJwtlw/bG76HALWmqPwFJlCat1HiM+UCoxSWO9Pz X-Received: by 2002:a17:902:59c8:: with SMTP id d8mr3074875plj.116.1547543740914; Tue, 15 Jan 2019 01:15:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547543740; cv=none; d=google.com; s=arc-20160816; b=0YJbewMtUccXoGixK++gBi8swIReKz1XXjtV9qaxeBbpr5f3E7cH9n4+9JeQa8g7qZ ainwLxe2Q3miSj4heOOB6vT7iEz8VovuLK4aZco+B7HcLAXNSIUSD3xjNeZu5/dFmj1y hGK/1uX8kq1f0LnV000fFISKOFML2NcdbzO9u8wg1TKZzcYOR45IgB17y1WksoMpZ1iV sqhpTg1Ohi9gbmhoO8eRmO5lomy5CaGmvcQvnw8iLg/hKuOeJpmcopkdlnUSa2Rl+o9z 0trVNiCPJDrNbj3XJ8N+jeYEO+Ku+ZIvxgac4xWr8VEWv2lS2ZaywGp+tVuUlGXFi45Y zc2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=T6PjqVkgv1u1cUd6qFRSr4ittLIj0ye68XBnBrorT5g=; b=IK70B5ISGLEuYwV9uqtitp4pUy+1qNYpr4j1BtX74sKwS9nE9sEFuZrjny69Bp8hLA NIWrHthNlMxg6/G8AT6lx66ykCJxZI1NmWlRhyuJU5/ht0a5fMG7TrhvggnDri4XTfSj +7NvoVZg+IKILPuoAJGr7NjFrd7Gz++R/eLLUiSYb+v9yMzOFH9KMMtR/uRqf0b6OH1a o196x0NCO/7jMKKXQ9trVEEOD3a7JT8nRkxBp51Ue/ZbT8rIhgnd9v9oNueJKOc54+q+ kVDaMqr8cNv0wn8aiIBnt+40Qon0EsziUV4wyQW22VJoVKbE7hQciR5/y04Bj9GfhNKx RjCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=C8TvSnW7; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e37si2812235plb.172.2019.01.15.01.15.40; Tue, 15 Jan 2019 01:15:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=C8TvSnW7; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728583AbfAOJPk (ORCPT + 5 others); Tue, 15 Jan 2019 04:15:40 -0500 Received: from lelv0142.ext.ti.com ([198.47.23.249]:40898 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725929AbfAOJPj (ORCPT ); Tue, 15 Jan 2019 04:15:39 -0500 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x0F9FatA016112; Tue, 15 Jan 2019 03:15:36 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1547543736; bh=T6PjqVkgv1u1cUd6qFRSr4ittLIj0ye68XBnBrorT5g=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=C8TvSnW7JCUHG3XDZ1Q7xLlstgXXMuJTSJRuAZDrb9fV8ysPEcycAWqw1mUg9uN0s Ot0LWkYlNIperKLq0tqXXutBOketC7hLh3k8ET9v4TWwDR8UG+rCqJDGnjDDRYcRQA ciwEq+d0uTDdcjh5oi9Ky1d9KAcHeJpRIoMH4b40= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x0F9FaAT013313 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 15 Jan 2019 03:15:36 -0600 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 15 Jan 2019 03:15:35 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1591.10 via Frontend Transport; Tue, 15 Jan 2019 03:15:35 -0600 Received: from gomoku.home (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id x0F9FNLj016112; Tue, 15 Jan 2019 03:15:32 -0600 From: Tero Kristo To: , , CC: , Subject: [PATCH 3/4] clk: ti: remove usage of CLK_IS_BASIC Date: Tue, 15 Jan 2019 11:15:14 +0200 Message-ID: <1547543715-16467-4-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1547543715-16467-1-git-send-email-t-kristo@ti.com> References: <1547543715-16467-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Remove the usage of CLK_IS_BASIC flag completely from TI clock driver. In most cases, the use is completely redundant, but in some cases we need to use the new API to check if the clock is an OMAP clock or not. Signed-off-by: Tero Kristo --- drivers/clk/ti/adpll.c | 2 +- drivers/clk/ti/clkctrl.c | 2 +- drivers/clk/ti/clockdomain.c | 2 +- drivers/clk/ti/divider.c | 2 +- drivers/clk/ti/dpll3xxx.c | 2 +- drivers/clk/ti/mux.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) -- 1.9.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/clk/ti/adpll.c b/drivers/clk/ti/adpll.c index 688e403..0c21098 100644 --- a/drivers/clk/ti/adpll.c +++ b/drivers/clk/ti/adpll.c @@ -614,7 +614,7 @@ static int ti_adpll_init_clkout(struct ti_adpll_data *d, init.name = child_name; init.ops = ops; - init.flags = CLK_IS_BASIC; + init.flags = 0; co->hw.init = &init; parent_names[0] = __clk_get_name(clk0); parent_names[1] = __clk_get_name(clk1); diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c index 40630eb..bf32d99 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c @@ -276,7 +276,7 @@ static struct clk_hw *_ti_omap4_clkctrl_xlate(struct of_phandle_args *clkspec, init.parent_names = parents; init.num_parents = num_parents; init.ops = ops; - init.flags = CLK_IS_BASIC; + init.flags = 0; clk = ti_clk_register(NULL, clk_hw, init.name); if (IS_ERR_OR_NULL(clk)) { diff --git a/drivers/clk/ti/clockdomain.c b/drivers/clk/ti/clockdomain.c index 07a8051..423a99b 100644 --- a/drivers/clk/ti/clockdomain.c +++ b/drivers/clk/ti/clockdomain.c @@ -143,7 +143,7 @@ static void __init of_ti_clockdomain_setup(struct device_node *node) continue; } clk_hw = __clk_get_hw(clk); - if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) { + if (!omap2_clk_is_hw_omap(clk_hw)) { pr_warn("can't setup clkdm for basic clk %s\n", __clk_get_name(clk)); continue; diff --git a/drivers/clk/ti/divider.c b/drivers/clk/ti/divider.c index 8d77090..cb5a819 100644 --- a/drivers/clk/ti/divider.c +++ b/drivers/clk/ti/divider.c @@ -336,7 +336,7 @@ static struct clk *_register_divider(struct device *dev, const char *name, init.name = name; init.ops = &ti_clk_divider_ops; - init.flags = flags | CLK_IS_BASIC; + init.flags = flags; init.parent_names = (parent_name ? &parent_name : NULL); init.num_parents = (parent_name ? 1 : 0); diff --git a/drivers/clk/ti/dpll3xxx.c b/drivers/clk/ti/dpll3xxx.c index 44b6b64..3dde6c8 100644 --- a/drivers/clk/ti/dpll3xxx.c +++ b/drivers/clk/ti/dpll3xxx.c @@ -731,7 +731,7 @@ static struct clk_hw_omap *omap3_find_clkoutx2_dpll(struct clk_hw *hw) do { do { hw = clk_hw_get_parent(hw); - } while (hw && (clk_hw_get_flags(hw) & CLK_IS_BASIC)); + } while (hw && (!omap2_clk_is_hw_omap(hw))); if (!hw) break; pclk = to_clk_hw_omap(hw); diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c index 883bdde..b7f9a4f 100644 --- a/drivers/clk/ti/mux.c +++ b/drivers/clk/ti/mux.c @@ -143,7 +143,7 @@ static struct clk *_register_mux(struct device *dev, const char *name, init.name = name; init.ops = &ti_clk_mux_ops; - init.flags = flags | CLK_IS_BASIC; + init.flags = flags; init.parent_names = parent_names; init.num_parents = num_parents;