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

Commit f1bbbb13 authored by Tarun Kanti DebBarma's avatar Tarun Kanti DebBarma Committed by Paul Walmsley
Browse files

ARM: OMAP2+: dmtimer: cleanup iclk usage 



We do not use iclk anywhere in the dmtimer driver and so removing it.
Hence removing the timer iclk entries from OMAP4 clkdev table as well.

Signed-off-by: default avatarTarun Kanti DebBarma <tarun.kanti@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 96566043

arch/arm/mach-omap2/clock44xx_data.c

+0 −11
Original line number Diff line number Diff line
@@ -3355,17 +3355,6 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK(NULL,	"auxclk5_ck",			&auxclk5_ck,	CK_443X),

	CLK(NULL,	"auxclkreq5_ck",		&auxclkreq5_ck,	CK_443X),

	CLK(NULL,	"gpmc_ck",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt1_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt2_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt3_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt4_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt5_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt6_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt7_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt8_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt9_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt10_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt11_ick",			&dummy_ck,	CK_443X),

	CLK("omap_i2c.1",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap_i2c.2",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap_i2c.3",	"ick",				&dummy_ck,	CK_443X),

arch/arm/mach-omap2/timer.c

+0 −7
Original line number Diff line number Diff line
@@ -178,13 +178,6 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, 
	if (IS_ERR(timer->fclk))

		return -ENODEV;



	sprintf(name, "gpt%d_ick", gptimer_id);

	timer->iclk = clk_get(NULL, name);

	if (IS_ERR(timer->iclk)) {

		clk_put(timer->fclk);

		return -ENODEV;

	}



	omap_hwmod_enable(oh);



	sys_timer_reserved |= (1 << (gptimer_id - 1));

arch/arm/plat-omap/include/plat/dmtimer.h

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ struct omap_dm_timer { 
	unsigned long phys_base;

	int id;

	int irq;

	struct clk *iclk, *fclk;

	struct clk *fclk;



	void __iomem	*io_base;

	void __iomem	*sys_stat;	/* TISTAT timer status */