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

Commit 2a6a8e2d authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Thomas Gleixner
Browse files

clocksource/drivers/clps711x: Remove board support 



Since board support for the CLPS711X platform was removed,
remove the board support from the clps711x-timer driver.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lkml.kernel.org/r/20181220111626.17140-1-shc_work@mail.ru
parent 32d0be01

drivers/clocksource/clps711x-timer.c

+13 −32
Original line number Diff line number Diff line
@@ -31,16 +31,9 @@ static u64 notrace clps711x_sched_clock_read(void) 
	return ~readw(tcd);

}



static int __init _clps711x_clksrc_init(struct clk *clock, void __iomem *base)

static void __init clps711x_clksrc_init(struct clk *clock, void __iomem *base)

{

	unsigned long rate;



	if (!base)

		return -ENOMEM;

	if (IS_ERR(clock))

		return PTR_ERR(clock);



	rate = clk_get_rate(clock);

	unsigned long rate = clk_get_rate(clock);



	tcd = base;
@@ -48,8 +41,6 @@ static int __init _clps711x_clksrc_init(struct clk *clock, void __iomem *base) 
			      clocksource_mmio_readw_down);



	sched_clock_register(clps711x_sched_clock_read, 16, rate);



	return 0;

}



static irqreturn_t clps711x_timer_interrupt(int irq, void *dev_id)
@@ -67,13 +58,6 @@ static int __init _clps711x_clkevt_init(struct clk *clock, void __iomem *base, 
	struct clock_event_device *clkevt;

	unsigned long rate;



	if (!irq)

		return -EINVAL;

	if (!base)

		return -ENOMEM;

	if (IS_ERR(clock))

		return PTR_ERR(clock);



	clkevt = kzalloc(sizeof(*clkevt), GFP_KERNEL);

	if (!clkevt)

		return -ENOMEM;
@@ -93,32 +77,29 @@ static int __init _clps711x_clkevt_init(struct clk *clock, void __iomem *base, 
			   "clps711x-timer", clkevt);

}



static void __init clps711x_clksrc_init(void __iomem *tc1_base,

					void __iomem *tc2_base,

					unsigned int irq)

{

	struct clk *tc1 = clk_get_sys("clps711x-timer.0", NULL);

	struct clk *tc2 = clk_get_sys("clps711x-timer.1", NULL);



	BUG_ON(_clps711x_clksrc_init(tc1, tc1_base));

	BUG_ON(_clps711x_clkevt_init(tc2, tc2_base, irq));

}



#ifdef CONFIG_TIMER_OF

static int __init clps711x_timer_init(struct device_node *np)

{

	unsigned int irq = irq_of_parse_and_map(np, 0);

	struct clk *clock = of_clk_get(np, 0);

	void __iomem *base = of_iomap(np, 0);



	if (!base)

		return -ENOMEM;

	if (!irq)

		return -EINVAL;

	if (IS_ERR(clock))

		return PTR_ERR(clock);



	switch (of_alias_get_id(np, "timer")) {

	case CLPS711X_CLKSRC_CLOCKSOURCE:

		return _clps711x_clksrc_init(clock, base);

		clps711x_clksrc_init(clock, base);

		break;

	case CLPS711X_CLKSRC_CLOCKEVENT:

		return _clps711x_clkevt_init(clock, base, irq);

	default:

		return -EINVAL;

	}



	return 0;

}

TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init);
 
#endif