diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-10 18:59:21 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-10 18:59:21 +0100 |
| commit | 8e1c9f59442dd4fc80914c224dfd032ca2c284d2 (patch) | |
| tree | 69f03f96ca80c34ff251225e13390de5cbf71b24 /arch/arm/mach-at91/setup.c | |
| parent | Merge tag 'mvebu-dt-3.14-2' of git://git.infradead.org/linux-mvebu into next/dt (diff) | |
| parent | Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/c... (diff) | |
| download | linux-8e1c9f59442dd4fc80914c224dfd032ca2c284d2.tar.xz linux-8e1c9f59442dd4fc80914c224dfd032ca2c284d2.zip | |
Merge branch 'next/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 094b3459c288..7d3f7cc61081 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -11,6 +11,7 @@ #include <linux/pm.h> #include <linux/of_address.h> #include <linux/pinctrl/machine.h> +#include <linux/clk/at91_pmc.h> #include <asm/system_misc.h> #include <asm/mach/map.h> @@ -18,7 +19,6 @@ #include <mach/hardware.h> #include <mach/cpu.h> #include <mach/at91_dbgu.h> -#include <mach/at91_pmc.h> #include "at91_shdwc.h" #include "soc.h" @@ -491,7 +491,8 @@ void __init at91rm9200_dt_initialize(void) at91_dt_clock_init(); /* Register the processor-specific clocks */ - at91_boot_soc.register_clocks(); + if (at91_boot_soc.register_clocks) + at91_boot_soc.register_clocks(); at91_boot_soc.init(); } @@ -506,7 +507,8 @@ void __init at91_dt_initialize(void) at91_dt_clock_init(); /* Register the processor-specific clocks */ - at91_boot_soc.register_clocks(); + if (at91_boot_soc.register_clocks) + at91_boot_soc.register_clocks(); if (at91_boot_soc.init) at91_boot_soc.init(); |