Skip to contentSkip to conversation

pxa: Remove INIT_CLKREG macro, replace it with the equivalent CLKDEV_INIT

PATCH New Philipp Zabel 1 participant 1 message Mar 15, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support
lore
Share & tools
lore

Philipp Zabel

author
#0 lore raw

PATCH 1/1 pxa: Remove INIT_CLKREG macro, replace it with the equivalent CLKDEV_INIT

Only the struct clk pointer parameter had to be moved to the end. The CLKDEV_INIT macro was added in 196a57c2749119be4732cc2b2adb8aafcb4fcb14 (ARM: 7131/1: clkdev: Add Common Macro for clk_lookup) for this purpose.

Signed-off-by Philipp Zabel <[email protected]>
---
 arch/arm/mach-pxa/clock.h   |    7 -----
 arch/arm/mach-pxa/eseries.c |    2 +-
 arch/arm/mach-pxa/pxa25x.c  |   42 ++++++++++++++++----------------
 arch/arm/mach-pxa/pxa27x.c  |   56 +++++++++++++++++++++---------------------
 arch/arm/mach-pxa/pxa300.c  |    6 ++--
 arch/arm/mach-pxa/pxa320.c  |    4 +-
 arch/arm/mach-pxa/pxa3xx.c  |   48 ++++++++++++++++++------------------
 arch/arm/mach-pxa/pxa95x.c  |   32 ++++++++++++------------
 8 files changed, 95 insertions(+), 102 deletions(-)
arch/arm/mach-pxa/clock.h +0 -7
index 3a258b1..2946fa2 100644
@@ -22,13 +22,6 @@ void clk_dummy_disable(struct clk *);
 extern const struct clkops clk_dummy_ops;
 extern struct clk clk_dummy;
 
-#define INIT_CLKREG(_clk,_devname,_conname)		\
-	{						\
-		.clk		= _clk,			\
-		.dev_id		= _devname,		\
-		.con_id		= _conname,		\
-	}
-
 #define DEFINE_CK(_name, _cken, _ops)			\
 struct clk clk_##_name = {				\
 		.ops	= _ops,				\
arch/arm/mach-pxa/eseries.c +1 -1
index 4cb2391..3c29343 100644
@@ -141,7 +141,7 @@ static struct clk tmio_dummy_clk = {
 };
 
 static struct clk_lookup eseries_clkregs[] = {
-	INIT_CLKREG(&tmio_dummy_clk, NULL, "CLK_CK32K"),
+	CLKDEV_INIT(NULL, "CLK_CK32K", &tmio_dummy_clk),
 };
 
 static void __init eseries_register_clks(void)
arch/arm/mach-pxa/pxa25x.c +21 -21

51 lines not on this page · raw message

arch/arm/mach-pxa/pxa27x.c +28 -28

62 lines not on this page · raw message

arch/arm/mach-pxa/pxa300.c +3 -3
index 40bb165..0cdab8c 100644
@@ -87,14 +87,14 @@ static DEFINE_PXA3_CKEN(common_nand, NAND, 156000000, 0);
 static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0);
 
 static struct clk_lookup common_clkregs[] = {
-	INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),
-	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
+	CLKDEV_INIT("pxa3xx-nand", NULL, &clk_common_nand),
+	CLKDEV_INIT("pxa3xx-gcu", NULL, &clk_gcu),
 };
 
 static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);
 
 static struct clk_lookup pxa310_clkregs[] = {
-	INIT_CLKREG(&clk_pxa310_mmc3, "pxa2xx-mci.2", NULL),
+	CLKDEV_INIT("pxa2xx-mci.2", NULL, &clk_pxa310_mmc3),
 };
 
 static int __init pxa300_init(void)
arch/arm/mach-pxa/pxa320.c +2 -2
index 8d614ec..994e991 100644
@@ -81,8 +81,8 @@ static DEFINE_PXA3_CKEN(pxa320_nand, NAND, 104000000, 0);
 static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0);
 
 static struct clk_lookup pxa320_clkregs[] = {
-	INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL),
-	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
+	CLKDEV_INIT("pxa3xx-nand", NULL, &clk_pxa320_nand),
+	CLKDEV_INIT("pxa3xx-gcu", NULL, &clk_gcu),
 };
 
 static int __init pxa320_init(void)
arch/arm/mach-pxa/pxa3xx.c +24 -24

55 lines not on this page · raw message

arch/arm/mach-pxa/pxa95x.c +16 -16
index 5ce434b..2b29a45 100644
@@ -214,23 +214,23 @@ static DEFINE_PXA3_CKEN(pxa95x_pwm1, PWM1, 13000000, 0);
 static DEFINE_PXA3_CKEN(pxa95x_gpio, GPIO, 13000000, 0);
 
 static struct clk_lookup pxa95x_clkregs[] = {
-	INIT_CLKREG(&clk_pxa95x_pout, NULL, "CLK_POUT"),
+	CLKDEV_INIT(NULL, "CLK_POUT", &clk_pxa95x_pout),
 	/* Power I2C clock is always on */
-	INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
-	INIT_CLKREG(&clk_pxa95x_lcd, "pxa2xx-fb", NULL),
-	INIT_CLKREG(&clk_pxa95x_ffuart, "pxa2xx-uart.0", NULL),
-	INIT_CLKREG(&clk_pxa95x_btuart, "pxa2xx-uart.1", NULL),
-	INIT_CLKREG(&clk_pxa95x_stuart, "pxa2xx-uart.2", NULL),
-	INIT_CLKREG(&clk_pxa95x_stuart, "pxa2xx-ir", "UARTCLK"),
-	INIT_CLKREG(&clk_pxa95x_i2c, "pxa2xx-i2c.0", NULL),
-	INIT_CLKREG(&clk_pxa95x_keypad, "pxa27x-keypad", NULL),
-	INIT_CLKREG(&clk_pxa95x_ssp1, "pxa27x-ssp.0", NULL),
-	INIT_CLKREG(&clk_pxa95x_ssp2, "pxa27x-ssp.1", NULL),
-	INIT_CLKREG(&clk_pxa95x_ssp3, "pxa27x-ssp.2", NULL),
-	INIT_CLKREG(&clk_pxa95x_ssp4, "pxa27x-ssp.3", NULL),
-	INIT_CLKREG(&clk_pxa95x_pwm0, "pxa27x-pwm.0", NULL),
-	INIT_CLKREG(&clk_pxa95x_pwm1, "pxa27x-pwm.1", NULL),
-	INIT_CLKREG(&clk_pxa95x_gpio, "pxa-gpio", NULL),
+	CLKDEV_INIT("pxa3xx-pwri2c.1", NULL, &clk_dummy),
+	CLKDEV_INIT("pxa2xx-fb", NULL, &clk_pxa95x_lcd),
+	CLKDEV_INIT("pxa2xx-uart.0", NULL, &clk_pxa95x_ffuart),
+	CLKDEV_INIT("pxa2xx-uart.1", NULL, &clk_pxa95x_btuart),
+	CLKDEV_INIT("pxa2xx-uart.2", NULL, &clk_pxa95x_stuart),
+	CLKDEV_INIT("pxa2xx-ir", "UARTCLK", &clk_pxa95x_stuart),
+	CLKDEV_INIT("pxa2xx-i2c.0", NULL, &clk_pxa95x_i2c),
+	CLKDEV_INIT("pxa27x-keypad", NULL, &clk_pxa95x_keypad),
+	CLKDEV_INIT("pxa27x-ssp.0", NULL, &clk_pxa95x_ssp1),
+	CLKDEV_INIT("pxa27x-ssp.1", NULL, &clk_pxa95x_ssp2),
+	CLKDEV_INIT("pxa27x-ssp.2", NULL, &clk_pxa95x_ssp3),
+	CLKDEV_INIT("pxa27x-ssp.3", NULL, &clk_pxa95x_ssp4),
+	CLKDEV_INIT("pxa27x-pwm.0", NULL, &clk_pxa95x_pwm0),
+	CLKDEV_INIT("pxa27x-pwm.1", NULL, &clk_pxa95x_pwm1),
+	CLKDEV_INIT("pxa-gpio", NULL, &clk_pxa95x_gpio),
 };
 
 void __init pxa95x_init_irq(void)
Signature · 1 line
1.7.9.1