From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH 07/07] sh: get rid of div6 clock names
Date: Mon, 10 May 2010 14:02:09 +0000 [thread overview]
Message-ID: <20100510140209.32745.5474.sendpatchset@t400s> (raw)
From: Magnus Damm <damm@opensource.se>
Get rid of div6 clock names on
sh7343/sh7366/sh7722/sh7723/sh7724
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/sh/include/asm/clock.h | 11 +++++------
arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 2 +-
arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 2 +-
arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 2 +-
arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 2 +-
arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 13 +++++--------
6 files changed, 14 insertions(+), 18 deletions(-)
--- 0001/arch/sh/include/asm/clock.h
+++ work/arch/sh/include/asm/clock.h 2010-05-10 22:26:55.000000000 +0900
@@ -151,12 +151,11 @@ int sh_clk_div4_enable_register(struct c
int sh_clk_div4_reparent_register(struct clk *clks, int nr,
struct clk_div4_table *table);
-#define SH_CLK_DIV6(_name, _parent, _reg, _flags) \
-{ \
- .name = _name, \
- .parent = _parent, \
- .enable_reg = (void __iomem *)_reg, \
- .flags = _flags, \
+#define SH_CLK_DIV6(_parent, _reg, _flags) \
+{ \
+ .parent = _parent, \
+ .enable_reg = (void __iomem *)_reg, \
+ .flags = _flags, \
}
int sh_clk_div6_register(struct clk *clks, int nr);
--- 0007/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
+++ work/arch/sh/kernel/cpu/sh4a/clock-sh7343.c 2010-05-10 22:29:43.000000000 +0900
@@ -139,7 +139,7 @@ struct clk div4_clks[DIV4_NR] = {
enum { DIV6_V, DIV6_NR };
struct clk div6_clks[DIV6_NR] = {
- [DIV6_V] = SH_CLK_DIV6("video_clk", &pll_clk, VCLKCR, 0),
+ [DIV6_V] = SH_CLK_DIV6(&pll_clk, VCLKCR, 0),
};
#define MSTP(_str, _parent, _reg, _bit, _flags) \
--- 0007/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
+++ work/arch/sh/kernel/cpu/sh4a/clock-sh7366.c 2010-05-10 22:29:54.000000000 +0900
@@ -142,7 +142,7 @@ struct clk div4_clks[DIV4_NR] = {
enum { DIV6_V, DIV6_NR };
struct clk div6_clks[DIV6_NR] = {
- [DIV6_V] = SH_CLK_DIV6("video_clk", &pll_clk, VCLKCR, 0),
+ [DIV6_V] = SH_CLK_DIV6(&pll_clk, VCLKCR, 0),
};
#define MSTP(_str, _parent, _reg, _bit, _flags) \
--- 0007/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
+++ work/arch/sh/kernel/cpu/sh4a/clock-sh7722.c 2010-05-10 22:29:32.000000000 +0900
@@ -152,7 +152,7 @@ struct clk div4_reparent_clks[DIV4_REPAR
enum { DIV6_V, DIV6_NR };
struct clk div6_clks[DIV6_NR] = {
- [DIV6_V] = SH_CLK_DIV6("video_clk", &pll_clk, VCLKCR, 0),
+ [DIV6_V] = SH_CLK_DIV6(&pll_clk, VCLKCR, 0),
};
static struct clk mstp_clks[HWBLK_NR] = {
--- 0007/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
+++ work/arch/sh/kernel/cpu/sh4a/clock-sh7723.c 2010-05-10 22:29:18.000000000 +0900
@@ -152,7 +152,7 @@ struct clk div4_reparent_clks[DIV4_REPAR
enum { DIV6_V, DIV6_NR };
struct clk div6_clks[DIV6_NR] = {
- [DIV6_V] = SH_CLK_DIV6("video_clk", &pll_clk, VCLKCR, 0),
+ [DIV6_V] = SH_CLK_DIV6(&pll_clk, VCLKCR, 0),
};
static struct clk mstp_clks[] = {
--- 0007/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ work/arch/sh/kernel/cpu/sh4a/clock-sh7724.c 2010-05-10 22:28:19.000000000 +0900
@@ -166,15 +166,12 @@ struct clk div4_clks[DIV4_NR] = {
enum { DIV6_V, DIV6_FA, DIV6_FB, DIV6_I, DIV6_S, DIV6_NR };
-#define DIV6(_str, _reg, _flags) \
- SH_CLK_DIV6(_str, &div3_clk, _reg, _flags)
-
struct clk div6_clks[DIV6_NR] = {
- [DIV6_V] = DIV6("video_clk", VCLKCR, 0),
- [DIV6_FA] = DIV6("fsia_clk", FCLKACR, 0),
- [DIV6_FB] = DIV6("fsib_clk", FCLKBCR, 0),
- [DIV6_I] = DIV6("irda_clk", IRDACLKCR, 0),
- [DIV6_S] = DIV6("spu_clk", SPUCLKCR, CLK_ENABLE_ON_INIT),
+ [DIV6_V] = SH_CLK_DIV6(&div3_clk, VCLKCR, 0),
+ [DIV6_FA] = SH_CLK_DIV6(&div3_clk, FCLKACR, 0),
+ [DIV6_FB] = SH_CLK_DIV6(&div3_clk, FCLKBCR, 0),
+ [DIV6_I] = SH_CLK_DIV6(&div3_clk, IRDACLKCR, 0),
+ [DIV6_S] = SH_CLK_DIV6(&div3_clk, SPUCLKCR, CLK_ENABLE_ON_INIT),
};
static struct clk mstp_clks[HWBLK_NR] = {
reply other threads:[~2010-05-10 14:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20100510140209.32745.5474.sendpatchset@t400s \
--to=magnus.damm@gmail.com \
--cc=linux-sh@vger.kernel.org \
/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).