Commit 8e093102 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" 

After discussing it, this feature is dropped as it is not considered
adequate:

	https://patchwork.kernel.org/patch/9639317/



There is no user of this macro yet, so there is no impact on the drivers.

This reverts commit 376bc271.

Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent ef89718a

drivers/clocksource/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ config CLKSRC_OF 
	bool

	select CLKSRC_PROBE



config CLKEVT_OF

	bool

	select CLKEVT_PROBE



config CLKSRC_ACPI

	bool

	select CLKSRC_PROBE
@@ -16,9 +12,6 @@ config CLKSRC_ACPI 
config CLKSRC_PROBE

	bool



config CLKEVT_PROBE

	bool



config CLKSRC_I8253

	bool

drivers/clocksource/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_CLKSRC_PROBE)	+= clksrc-probe.o

obj-$(CONFIG_CLKEVT_PROBE)	+= clkevt-probe.o

obj-$(CONFIG_ATMEL_PIT)		+= timer-atmel-pit.o

obj-$(CONFIG_ATMEL_ST)		+= timer-atmel-st.o

obj-$(CONFIG_ATMEL_TCB_CLKSRC)	+= tcb_clksrc.o

drivers/clocksource/clkevt-probe.c

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, Linaro Ltd.  All rights reserved.

 * Daniel Lezcano <daniel.lezcano@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/init.h>

#include <linux/of.h>

#include <linux/clockchips.h>



extern struct of_device_id __clkevt_of_table[];



static const struct of_device_id __clkevt_of_table_sentinel

	__used __section(__clkevt_of_table_end);



int __init clockevent_probe(void)

{

	struct device_node *np;

	const struct of_device_id *match;

	of_init_fn_1_ret init_func;

	int ret, clockevents = 0;



	for_each_matching_node_and_match(np, __clkevt_of_table, &match) {

		if (!of_device_is_available(np))

			continue;



		init_func = match->data;



		ret = init_func(np);

		if (ret) {

			pr_warn("Failed to initialize '%s' (%d)\n",

				np->name, ret);

			continue;

		}



		clockevents++;

	}



	if (!clockevents) {

		pr_crit("%s: no matching clockevent found\n", __func__);

		return -ENODEV;

	}



	return 0;

}

include/asm-generic/vmlinux.lds.h

+0 −2
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ 
	KEEP(*(__##name##_of_table_end))



#define CLKSRC_OF_TABLES()	OF_TABLE(CONFIG_CLKSRC_OF, clksrc)

#define CLKEVT_OF_TABLES()	OF_TABLE(CONFIG_CLKEVT_OF, clkevt)

#define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)

#define CLK_OF_TABLES()		OF_TABLE(CONFIG_COMMON_CLK, clk)

#define IOMMU_OF_TABLES()	OF_TABLE(CONFIG_OF_IOMMU, iommu)
@@ -558,7 +557,6 @@ 
	CLK_OF_TABLES()							\

	RESERVEDMEM_OF_TABLES()						\

	CLKSRC_OF_TABLES()						\

	CLKEVT_OF_TABLES()						\

	IOMMU_OF_TABLES()						\

	CPU_METHOD_OF_TABLES()						\

	CPUIDLE_METHOD_OF_TABLES()					\

include/linux/clockchips.h

+0 −9
Original line number Diff line number Diff line
@@ -223,13 +223,4 @@ static inline void tick_setup_hrtimer_broadcast(void) { } 


#endif /* !CONFIG_GENERIC_CLOCKEVENTS */



#define CLOCKEVENT_OF_DECLARE(name, compat, fn) \

	OF_DECLARE_1_RET(clkevt, name, compat, fn)



#ifdef CONFIG_CLKEVT_PROBE

extern int clockevent_probe(void);

#else

static inline int clockevent_probe(void) { return 0; }

#endif



#endif /* _LINUX_CLOCKCHIPS_H */