From: Stephen Boyd <sboyd@codeaurora.org>
To: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>
Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org,
Chao Xie <chao.xie@marvell.com>
Subject: [PATCH 07/41] clk: mmp: Remove CLK_IS_ROOT
Date: Tue, 1 Mar 2016 10:59:52 -0800 [thread overview]
Message-ID: <1456858826-28541-8-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1456858826-28541-1-git-send-email-sboyd@codeaurora.org>
This flag is a no-op now. Remove usage of the flag.
Cc: Chao Xie <chao.xie@marvell.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/clk/mmp/clk-mmp2.c | 14 +++++---------
drivers/clk/mmp/clk-of-mmp2.c | 10 +++++-----
drivers/clk/mmp/clk-of-pxa168.c | 8 ++++----
drivers/clk/mmp/clk-of-pxa1928.c | 12 ++++++------
drivers/clk/mmp/clk-of-pxa910.c | 8 ++++----
drivers/clk/mmp/clk-pxa168.c | 8 +++-----
drivers/clk/mmp/clk-pxa910.c | 8 +++-----
7 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/drivers/clk/mmp/clk-mmp2.c b/drivers/clk/mmp/clk-mmp2.c
index 38931dbd1eff..383f6a4f64f0 100644
--- a/drivers/clk/mmp/clk-mmp2.c
+++ b/drivers/clk/mmp/clk-mmp2.c
@@ -99,23 +99,19 @@ void __init mmp2_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys,
return;
}
- clk = clk_register_fixed_rate(NULL, "clk32", NULL, CLK_IS_ROOT, 3200);
+ clk = clk_register_fixed_rate(NULL, "clk32", NULL, 0, 3200);
clk_register_clkdev(clk, "clk32", NULL);
- vctcxo = clk_register_fixed_rate(NULL, "vctcxo", NULL, CLK_IS_ROOT,
- 26000000);
+ vctcxo = clk_register_fixed_rate(NULL, "vctcxo", NULL, 0, 26000000);
clk_register_clkdev(vctcxo, "vctcxo", NULL);
- clk = clk_register_fixed_rate(NULL, "pll1", NULL, CLK_IS_ROOT,
- 800000000);
+ clk = clk_register_fixed_rate(NULL, "pll1", NULL, 0, 800000000);
clk_register_clkdev(clk, "pll1", NULL);
- clk = clk_register_fixed_rate(NULL, "usb_pll", NULL, CLK_IS_ROOT,
- 480000000);
+ clk = clk_register_fixed_rate(NULL, "usb_pll", NULL, 0, 480000000);
clk_register_clkdev(clk, "usb_pll", NULL);
- clk = clk_register_fixed_rate(NULL, "pll2", NULL, CLK_IS_ROOT,
- 960000000);
+ clk = clk_register_fixed_rate(NULL, "pll2", NULL, 0, 960000000);
clk_register_clkdev(clk, "pll2", NULL);
clk = clk_register_fixed_factor(NULL, "pll1_2", "pll1",
diff --git a/drivers/clk/mmp/clk-of-mmp2.c b/drivers/clk/mmp/clk-of-mmp2.c
index 251533d87c65..3a51fff1b0e7 100644
--- a/drivers/clk/mmp/clk-of-mmp2.c
+++ b/drivers/clk/mmp/clk-of-mmp2.c
@@ -63,11 +63,11 @@ struct mmp2_clk_unit {
};
static struct mmp_param_fixed_rate_clk fixed_rate_clks[] = {
- {MMP2_CLK_CLK32, "clk32", NULL, CLK_IS_ROOT, 32768},
- {MMP2_CLK_VCTCXO, "vctcxo", NULL, CLK_IS_ROOT, 26000000},
- {MMP2_CLK_PLL1, "pll1", NULL, CLK_IS_ROOT, 800000000},
- {MMP2_CLK_PLL2, "pll2", NULL, CLK_IS_ROOT, 960000000},
- {MMP2_CLK_USB_PLL, "usb_pll", NULL, CLK_IS_ROOT, 480000000},
+ {MMP2_CLK_CLK32, "clk32", NULL, 0, 32768},
+ {MMP2_CLK_VCTCXO, "vctcxo", NULL, 0, 26000000},
+ {MMP2_CLK_PLL1, "pll1", NULL, 0, 800000000},
+ {MMP2_CLK_PLL2, "pll2", NULL, 0, 960000000},
+ {MMP2_CLK_USB_PLL, "usb_pll", NULL, 0, 480000000},
};
static struct mmp_param_fixed_factor_clk fixed_factor_clks[] = {
diff --git a/drivers/clk/mmp/clk-of-pxa168.c b/drivers/clk/mmp/clk-of-pxa168.c
index 64eaf4141c69..87f2317b2a00 100644
--- a/drivers/clk/mmp/clk-of-pxa168.c
+++ b/drivers/clk/mmp/clk-of-pxa168.c
@@ -56,10 +56,10 @@ struct pxa168_clk_unit {
};
static struct mmp_param_fixed_rate_clk fixed_rate_clks[] = {
- {PXA168_CLK_CLK32, "clk32", NULL, CLK_IS_ROOT, 32768},
- {PXA168_CLK_VCTCXO, "vctcxo", NULL, CLK_IS_ROOT, 26000000},
- {PXA168_CLK_PLL1, "pll1", NULL, CLK_IS_ROOT, 624000000},
- {PXA168_CLK_USB_PLL, "usb_pll", NULL, CLK_IS_ROOT, 480000000},
+ {PXA168_CLK_CLK32, "clk32", NULL, 0, 32768},
+ {PXA168_CLK_VCTCXO, "vctcxo", NULL, 0, 26000000},
+ {PXA168_CLK_PLL1, "pll1", NULL, 0, 624000000},
+ {PXA168_CLK_USB_PLL, "usb_pll", NULL, 0, 480000000},
};
static struct mmp_param_fixed_factor_clk fixed_factor_clks[] = {
diff --git a/drivers/clk/mmp/clk-of-pxa1928.c b/drivers/clk/mmp/clk-of-pxa1928.c
index 433a5ae1eae0..e478ff44e170 100644
--- a/drivers/clk/mmp/clk-of-pxa1928.c
+++ b/drivers/clk/mmp/clk-of-pxa1928.c
@@ -34,12 +34,12 @@ struct pxa1928_clk_unit {
};
static struct mmp_param_fixed_rate_clk fixed_rate_clks[] = {
- {0, "clk32", NULL, CLK_IS_ROOT, 32768},
- {0, "vctcxo", NULL, CLK_IS_ROOT, 26000000},
- {0, "pll1_624", NULL, CLK_IS_ROOT, 624000000},
- {0, "pll5p", NULL, CLK_IS_ROOT, 832000000},
- {0, "pll5", NULL, CLK_IS_ROOT, 1248000000},
- {0, "usb_pll", NULL, CLK_IS_ROOT, 480000000},
+ {0, "clk32", NULL, 0, 32768},
+ {0, "vctcxo", NULL, 0, 26000000},
+ {0, "pll1_624", NULL, 0, 624000000},
+ {0, "pll5p", NULL, 0, 832000000},
+ {0, "pll5", NULL, 0, 1248000000},
+ {0, "usb_pll", NULL, 0, 480000000},
};
static struct mmp_param_fixed_factor_clk fixed_factor_clks[] = {
diff --git a/drivers/clk/mmp/clk-of-pxa910.c b/drivers/clk/mmp/clk-of-pxa910.c
index 13d6173326a4..e22a67f76d93 100644
--- a/drivers/clk/mmp/clk-of-pxa910.c
+++ b/drivers/clk/mmp/clk-of-pxa910.c
@@ -56,10 +56,10 @@ struct pxa910_clk_unit {
};
static struct mmp_param_fixed_rate_clk fixed_rate_clks[] = {
- {PXA910_CLK_CLK32, "clk32", NULL, CLK_IS_ROOT, 32768},
- {PXA910_CLK_VCTCXO, "vctcxo", NULL, CLK_IS_ROOT, 26000000},
- {PXA910_CLK_PLL1, "pll1", NULL, CLK_IS_ROOT, 624000000},
- {PXA910_CLK_USB_PLL, "usb_pll", NULL, CLK_IS_ROOT, 480000000},
+ {PXA910_CLK_CLK32, "clk32", NULL, 0, 32768},
+ {PXA910_CLK_VCTCXO, "vctcxo", NULL, 0, 26000000},
+ {PXA910_CLK_PLL1, "pll1", NULL, 0, 624000000},
+ {PXA910_CLK_USB_PLL, "usb_pll", NULL, 0, 480000000},
};
static struct mmp_param_fixed_factor_clk fixed_factor_clks[] = {
diff --git a/drivers/clk/mmp/clk-pxa168.c b/drivers/clk/mmp/clk-pxa168.c
index 0dd83fb950c9..a9ef9209532a 100644
--- a/drivers/clk/mmp/clk-pxa168.c
+++ b/drivers/clk/mmp/clk-pxa168.c
@@ -92,15 +92,13 @@ void __init pxa168_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys,
return;
}
- clk = clk_register_fixed_rate(NULL, "clk32", NULL, CLK_IS_ROOT, 3200);
+ clk = clk_register_fixed_rate(NULL, "clk32", NULL, 0, 3200);
clk_register_clkdev(clk, "clk32", NULL);
- clk = clk_register_fixed_rate(NULL, "vctcxo", NULL, CLK_IS_ROOT,
- 26000000);
+ clk = clk_register_fixed_rate(NULL, "vctcxo", NULL, 0, 26000000);
clk_register_clkdev(clk, "vctcxo", NULL);
- clk = clk_register_fixed_rate(NULL, "pll1", NULL, CLK_IS_ROOT,
- 624000000);
+ clk = clk_register_fixed_rate(NULL, "pll1", NULL, 0, 624000000);
clk_register_clkdev(clk, "pll1", NULL);
clk = clk_register_fixed_factor(NULL, "pll1_2", "pll1",
diff --git a/drivers/clk/mmp/clk-pxa910.c b/drivers/clk/mmp/clk-pxa910.c
index e1d2ce22cdf1..a520cf7702a1 100644
--- a/drivers/clk/mmp/clk-pxa910.c
+++ b/drivers/clk/mmp/clk-pxa910.c
@@ -97,15 +97,13 @@ void __init pxa910_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys,
return;
}
- clk = clk_register_fixed_rate(NULL, "clk32", NULL, CLK_IS_ROOT, 3200);
+ clk = clk_register_fixed_rate(NULL, "clk32", NULL, 0, 3200);
clk_register_clkdev(clk, "clk32", NULL);
- clk = clk_register_fixed_rate(NULL, "vctcxo", NULL, CLK_IS_ROOT,
- 26000000);
+ clk = clk_register_fixed_rate(NULL, "vctcxo", NULL, 0, 26000000);
clk_register_clkdev(clk, "vctcxo", NULL);
- clk = clk_register_fixed_rate(NULL, "pll1", NULL, CLK_IS_ROOT,
- 624000000);
+ clk = clk_register_fixed_rate(NULL, "pll1", NULL, 0, 624000000);
clk_register_clkdev(clk, "pll1", NULL);
clk = clk_register_fixed_factor(NULL, "pll1_2", "pll1",
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2016-03-01 19:00 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 18:59 [PATCH 00/41] Remove CLK_IS_ROOT from drivers/clk Stephen Boyd
2016-03-01 18:59 ` [PATCH 01/41] clk: at91: Remove CLK_IS_ROOT Stephen Boyd
2016-03-01 22:15 ` Boris Brezillon
2016-03-01 18:59 ` [PATCH 02/41] clk: bcm: " Stephen Boyd
2016-03-02 21:59 ` Eric Anholt
2016-03-01 18:59 ` [PATCH 03/41] clk: hisilicon: " Stephen Boyd
2016-03-02 1:45 ` Leo Yan
2016-03-03 1:43 ` Stephen Boyd
2016-03-01 18:59 ` [PATCH 04/41] clk: imx: " Stephen Boyd
2016-03-02 2:42 ` Shawn Guo
2016-03-01 18:59 ` [PATCH 05/41] clk: mediatek: " Stephen Boyd
2016-03-02 1:58 ` James Liao
2016-03-03 1:44 ` Stephen Boyd
2016-03-01 18:59 ` [PATCH 06/41] clk: meson: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 18:59 ` Stephen Boyd [this message]
2016-03-01 18:59 ` [PATCH 08/41] clk: mvebu: " Stephen Boyd
2016-03-03 10:27 ` Gregory CLEMENT
2016-03-03 19:26 ` Stephen Boyd
2016-03-01 18:59 ` [PATCH 09/41] clk: mxs: " Stephen Boyd
2016-03-02 2:42 ` Shawn Guo
2016-03-03 1:45 ` Stephen Boyd
2016-03-01 18:59 ` [PATCH 10/41] clk: nxp: " Stephen Boyd
2016-03-01 20:06 ` Joachim Eastwood
2016-03-03 1:45 ` Stephen Boyd
2016-03-01 18:59 ` [PATCH 11/41] clk: pxa: " Stephen Boyd
2016-03-01 19:27 ` Robert Jarzmik
2016-03-03 1:46 ` Stephen Boyd
2016-03-01 18:59 ` [PATCH 12/41] clk: qcom: " Stephen Boyd
2016-03-04 20:53 ` Stephen Boyd
2016-03-01 18:59 ` [PATCH 13/41] clk: samsung: " Stephen Boyd
2016-03-02 10:26 ` Sylwester Nawrocki
2016-03-01 18:59 ` [PATCH 14/41] clk: sirf: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 15/41] clk: spear: " Stephen Boyd
2016-03-02 2:54 ` Viresh Kumar
2016-03-03 1:47 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 16/41] clk: sunxi: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 17/41] clk: tegra: " Stephen Boyd
2016-03-02 14:55 ` Thierry Reding
2016-03-02 16:50 ` Rhyland Klein
2016-03-03 1:47 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 18/41] clk: ti: " Stephen Boyd
2016-03-02 15:32 ` Tero Kristo
2016-03-03 1:47 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 19/41] clk: ux500: " Stephen Boyd
2016-03-01 20:05 ` Ulf Hansson
2016-03-03 1:48 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 20/41] clk: versatile: " Stephen Boyd
2016-03-05 16:49 ` Linus Walleij
2016-03-15 22:19 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 21/41] clk: x86: " Stephen Boyd
2016-03-03 10:34 ` Mika Westerberg
2016-03-01 19:00 ` [PATCH 22/41] clk: x86: Remove clkdev.h and clk.h includes Stephen Boyd
2016-03-03 10:35 ` Mika Westerberg
2016-03-01 19:00 ` [PATCH 23/41] clk: zte: Remove CLK_IS_ROOT Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 24/41] clk: zynq: " Stephen Boyd
2016-03-02 3:33 ` Sören Brinkmann
2016-03-03 1:48 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 25/41] clk: clps711x: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 26/41] clk: efm32gg: " Stephen Boyd
2016-03-01 19:26 ` Uwe Kleine-König
2016-03-01 19:37 ` Stephen Boyd
2016-03-01 19:52 ` Uwe Kleine-König
2016-03-03 1:48 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 27/41] clk: fixed-rate: " Stephen Boyd
2016-03-04 22:31 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 28/41] clk: ls1x: " Stephen Boyd
2016-03-01 19:00 ` [PATCH 29/41] clk: max77{686,802}: " Stephen Boyd
2016-03-07 13:46 ` Javier Martinez Canillas
2016-03-01 19:00 ` [PATCH 30/41] clk: mb86s7x: " Stephen Boyd
2016-03-03 11:42 ` Jassi Brar
2016-03-01 19:00 ` [PATCH 31/41] clk: nspire: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 32/41] clk: palmas: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 33/41] clk: pwm: " Stephen Boyd
2016-03-02 9:37 ` Philipp Zabel
2016-03-03 1:50 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 34/41] clk: qoriq: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 35/41] clk: rk808: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 36/41] clk: s2mps11: " Stephen Boyd
2016-03-02 2:25 ` Andi Shyti
2016-03-03 1:50 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 37/41] clk: scpi: " Stephen Boyd
2016-03-02 9:34 ` Sudeep Holla
2016-03-03 1:51 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 38/41] clk: si5{14,351,70}: " Stephen Boyd
2016-03-02 3:34 ` Sören Brinkmann
2016-03-01 19:00 ` [PATCH 39/41] clk: twl6040: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 40/41] clk: wm831x: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
2016-03-01 19:00 ` [PATCH 41/41] clk: xgene: " Stephen Boyd
2016-04-15 23:54 ` Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456858826-28541-8-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=chao.xie@marvell.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).