From 83301480111c9ac3fbd03ec5b0c90c21c5aa39f7 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 12 Dec 2013 17:00:45 +0100 Subject: ARM: at91: remove AT91_PROGRAMMABLE_CLOCKS configuration option This AT91 specific Kconfig option removed the code that dealt with programmable clocks. Each AT91 SoC embeds programmable clocks and there is little gain to remove this code in case that such a clock is not used. If this option is not selected, it causes certain drivers to fail to build. We simply remove this option instead of adding code just to build a workaround. Signed-off-by: Nicolas Ferre Signed-off-by: Kevin Hilman --- drivers/clk/at91/Makefile | 3 +-- drivers/clk/at91/pmc.c | 2 -- drivers/clk/at91/pmc.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) (limited to 'drivers/clk/at91') diff --git a/drivers/clk/at91/Makefile b/drivers/clk/at91/Makefile index 0e92b71..46c1d3d 100644 --- a/drivers/clk/at91/Makefile +++ b/drivers/clk/at91/Makefile @@ -4,9 +4,8 @@ obj-y += pmc.o obj-y += clk-main.o clk-pll.o clk-plldiv.o clk-master.o -obj-y += clk-system.o clk-peripheral.o +obj-y += clk-system.o clk-peripheral.o clk-programmable.o -obj-$(CONFIG_AT91_PROGRAMMABLE_CLOCKS) += clk-programmable.o obj-$(CONFIG_HAVE_AT91_UTMI) += clk-utmi.o obj-$(CONFIG_HAVE_AT91_USB_CLK) += clk-usb.o obj-$(CONFIG_HAVE_AT91_SMD) += clk-smd.o diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index 7b9db60..11fceff 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -279,7 +279,6 @@ static const struct of_device_id pmc_clk_ids[] __initdata = { .data = of_at91sam9x5_clk_periph_setup, }, /* Programmable clocks */ -#if defined(CONFIG_AT91_PROGRAMMABLE_CLOCKS) { .compatible = "atmel,at91rm9200-clk-programmable", .data = of_at91rm9200_clk_prog_setup, @@ -292,7 +291,6 @@ static const struct of_device_id pmc_clk_ids[] __initdata = { .compatible = "atmel,at91sam9x5-clk-programmable", .data = of_at91sam9x5_clk_prog_setup, }, -#endif /* UTMI clock */ #if defined(CONFIG_HAVE_AT91_UTMI) { diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h index ba8d142..4413509 100644 --- a/drivers/clk/at91/pmc.h +++ b/drivers/clk/at91/pmc.h @@ -85,14 +85,12 @@ extern void __init of_at91rm9200_clk_periph_setup(struct device_node *np, extern void __init of_at91sam9x5_clk_periph_setup(struct device_node *np, struct at91_pmc *pmc); -#if defined(CONFIG_AT91_PROGRAMMABLE_CLOCKS) extern void __init of_at91rm9200_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc); extern void __init of_at91sam9g45_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc); extern void __init of_at91sam9x5_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc); -#endif #if defined(CONFIG_HAVE_AT91_UTMI) extern void __init of_at91sam9x5_clk_utmi_setup(struct device_node *np, -- cgit v1.1