Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a0300dc authored by Russell King's avatar Russell King
Browse files

ARM: Consolidate clks_register() and similar 



Most machine classes want some way to register a block of clk_lookup
structures, and most do it by implementing a clks_register() type
function which walks an array, or by open-coding a loop.

Consolidate all this into clkdev_add_table().

Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 92dcffb9

arch/arm/common/clkdev.c

+10 −0
Original line number Diff line number Diff line
@@ -99,6 +99,16 @@ void clkdev_add(struct clk_lookup *cl) 
}

EXPORT_SYMBOL(clkdev_add);



void __init clkdev_add_table(struct clk_lookup *cl, size_t num)

{

	mutex_lock(&clocks_mutex);

	while (num--) {

		list_add_tail(&cl->node, &clocks);

		cl++;

	}

	mutex_unlock(&clocks_mutex);

}



#define MAX_DEV_ID	20

#define MAX_CON_ID	16

arch/arm/include/asm/clkdev.h

+3 −0
Original line number Diff line number Diff line
@@ -27,4 +27,7 @@ struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, 
void clkdev_add(struct clk_lookup *cl);

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 *);



#endif

arch/arm/mach-bcmring/core.c

+1 −2
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ void __init bcmring_amba_init(void) 


	chipcHw_busInterfaceClockEnable(bus_clock);



	for (i = 0; i < ARRAY_SIZE(lookups); i++)

		clkdev_add(&lookups[i]);

	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {

		struct amba_device *d = amba_devs[i];

arch/arm/mach-ep93xx/clock.c

+1 −3
Original line number Diff line number Diff line
@@ -445,7 +445,6 @@ static void __init ep93xx_dma_clock_init(void) 
static int __init ep93xx_clock_init(void)

{

	u32 value;

	int i;



	value = __raw_readl(EP93XX_SYSCON_CLOCK_SET1);

	if (!(value & 0x00800000)) {			/* PLL1 bypassed?  */
@@ -474,8 +473,7 @@ static int __init ep93xx_clock_init(void) 
		clk_f.rate / 1000000, clk_h.rate / 1000000,

		clk_p.rate / 1000000);



	for (i = 0; i < ARRAY_SIZE(clocks); i++)

		clkdev_add(&clocks[i]);

	clkdev_add_table(clocks, ARRAY_SIZE(clocks));

	return 0;

}

arch_initcall(ep93xx_clock_init);

arch/arm/mach-integrator/core.c

+1 −2
Original line number Diff line number Diff line
@@ -144,8 +144,7 @@ static int __init integrator_init(void) 
{

	int i;



	for (i = 0; i < ARRAY_SIZE(lookups); i++)

		clkdev_add(&lookups[i]);

	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {

		struct amba_device *d = amba_devs[i];