* [PATCH 1/3] clkdev: factorize macro
@ 2011-08-11 15:07 Jean-Christophe PLAGNIOL-VILLARD
2011-08-11 15:07 ` [PATCH 2/3] nomadik: fix static allocation clkdev Jean-Christophe PLAGNIOL-VILLARD
2011-08-11 15:07 ` [PATCH 3/3] versatile: " Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 2 replies; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-08-11 15:07 UTC (permalink / raw)
To: barebox
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/clock.h | 13 -------------
arch/arm/mach-nomadik/include/mach/clkdev.h | 6 ------
arch/arm/mach-versatile/include/mach/clkdev.h | 6 ------
include/linux/clkdev.h | 19 +++++++++++++++++++
4 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-at91/clock.h b/arch/arm/mach-at91/clock.h
index c2e63e4..cacc0b5 100644
--- a/arch/arm/mach-at91/clock.h
+++ b/arch/arm/mach-at91/clock.h
@@ -32,16 +32,3 @@ struct clk {
extern int __init clk_register(struct clk *clk);
extern struct clk mck;
extern struct clk utmi_clk;
-
-#define CLKDEV_CON_ID(_id, _clk) \
- { \
- .con_id = _id, \
- .clk = _clk, \
- }
-
-#define CLKDEV_CON_DEV_ID(_con_id, _dev_id, _clk) \
- { \
- .con_id = _con_id, \
- .dev_id = _dev_id, \
- .clk = _clk, \
- }
diff --git a/arch/arm/mach-nomadik/include/mach/clkdev.h b/arch/arm/mach-nomadik/include/mach/clkdev.h
index a9092a2..04b37a8 100644
--- a/arch/arm/mach-nomadik/include/mach/clkdev.h
+++ b/arch/arm/mach-nomadik/include/mach/clkdev.h
@@ -4,10 +4,4 @@
#define __clk_get(clk) ({ 1; })
#define __clk_put(clk) do { } while (0)
-#define CLKDEV_CON_ID(_id, _clk) \
- { \
- .con_id = _id, \
- .clk = _clk, \
- }
-
#endif
diff --git a/arch/arm/mach-versatile/include/mach/clkdev.h b/arch/arm/mach-versatile/include/mach/clkdev.h
index a9092a2..04b37a8 100644
--- a/arch/arm/mach-versatile/include/mach/clkdev.h
+++ b/arch/arm/mach-versatile/include/mach/clkdev.h
@@ -4,10 +4,4 @@
#define __clk_get(clk) ({ 1; })
#define __clk_put(clk) do { } while (0)
-#define CLKDEV_CON_ID(_id, _clk) \
- { \
- .con_id = _id, \
- .clk = _clk, \
- }
-
#endif
diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h
index ae38e1a..d2eca99 100644
--- a/include/linux/clkdev.h
+++ b/include/linux/clkdev.h
@@ -33,4 +33,23 @@ void clkdev_drop(struct clk_lookup *cl);
void clkdev_add_table(struct clk_lookup *, size_t);
int clk_add_alias(const char *, const char *, char *, struct device_d *);
+#define CLKDEV_DEV_ID(_id, _clk) \
+ { \
+ .dev_id = _id, \
+ .clk = _clk, \
+ }
+
+#define CLKDEV_CON_ID(_id, _clk) \
+ { \
+ .con_id = _id, \
+ .clk = _clk, \
+ }
+
+#define CLKDEV_CON_DEV_ID(_con_id, _dev_id, _clk) \
+ { \
+ .con_id = _con_id, \
+ .dev_id = _dev_id, \
+ .clk = _clk, \
+ }
+
#endif
--
1.7.5.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/3] nomadik: fix static allocation clkdev
2011-08-11 15:07 [PATCH 1/3] clkdev: factorize macro Jean-Christophe PLAGNIOL-VILLARD
@ 2011-08-11 15:07 ` Jean-Christophe PLAGNIOL-VILLARD
2011-08-11 15:07 ` [PATCH 3/3] versatile: " Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 0 replies; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-08-11 15:07 UTC (permalink / raw)
To: barebox
it's DEV_ID not CON_ID
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/mach-nomadik/8815.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-nomadik/8815.c b/arch/arm/mach-nomadik/8815.c
index 3138045..69aacd5 100644
--- a/arch/arm/mach-nomadik/8815.c
+++ b/arch/arm/mach-nomadik/8815.c
@@ -37,8 +37,8 @@ void st8815_add_device_sdram(u32 size)
}
static struct clk_lookup clocks_lookups[] = {
- CLKDEV_CON_ID("uart-pl0110", &st8815_clk_48),
- CLKDEV_CON_ID("uart-pl0111", &st8815_clk_48),
+ CLKDEV_DEV_ID("uart-pl0110", &st8815_clk_48),
+ CLKDEV_DEV_ID("uart-pl0111", &st8815_clk_48),
};
static int st8815_clkdev_init(void)
--
1.7.5.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 3/3] versatile: fix static allocation clkdev
2011-08-11 15:07 [PATCH 1/3] clkdev: factorize macro Jean-Christophe PLAGNIOL-VILLARD
2011-08-11 15:07 ` [PATCH 2/3] nomadik: fix static allocation clkdev Jean-Christophe PLAGNIOL-VILLARD
@ 2011-08-11 15:07 ` Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 0 replies; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-08-11 15:07 UTC (permalink / raw)
To: barebox
it's DEV_ID not CON_ID
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/mach-versatile/core.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index f58e3bd..1231a7d 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -145,10 +145,10 @@ static int vpb_clocksource_init(void)
core_initcall(vpb_clocksource_init);
static struct clk_lookup clocks_lookups[] = {
- CLKDEV_CON_ID("uart-pl0110", &ref_clk_24),
- CLKDEV_CON_ID("uart-pl0111", &ref_clk_24),
- CLKDEV_CON_ID("uart-pl0112", &ref_clk_24),
- CLKDEV_CON_ID("uart-pl0113", &ref_clk_24),
+ CLKDEV_DEV_ID("uart-pl0110", &ref_clk_24),
+ CLKDEV_DEV_ID("uart-pl0111", &ref_clk_24),
+ CLKDEV_DEV_ID("uart-pl0112", &ref_clk_24),
+ CLKDEV_DEV_ID("uart-pl0113", &ref_clk_24),
};
static int versatile_clkdev_init(void)
--
1.7.5.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-11 15:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-11 15:07 [PATCH 1/3] clkdev: factorize macro Jean-Christophe PLAGNIOL-VILLARD
2011-08-11 15:07 ` [PATCH 2/3] nomadik: fix static allocation clkdev Jean-Christophe PLAGNIOL-VILLARD
2011-08-11 15:07 ` [PATCH 3/3] versatile: " Jean-Christophe PLAGNIOL-VILLARD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox