diff options
| author | Linus Walleij | 2012-11-11 19:12:33 +0100 |
|---|---|---|
| committer | Linus Walleij | 2012-11-11 19:12:33 +0100 |
| commit | e59d969f441fb8e25b30125bdf201153adc5a7e3 (patch) | |
| tree | e18250fbc1bc9e2ca864292d2390325f8ac84c80 /arch/arm/mach-at91/setup.c | |
| parent | ARM: SPEAr: Add plgpio node in device tree dtsi files (diff) | |
| parent | pinctrl: at91: Staticize non-exported symbols (diff) | |
| download | kernel-qcow2-linux-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.gz kernel-qcow2-linux-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.xz kernel-qcow2-linux-e59d969f441fb8e25b30125bdf201153adc5a7e3.zip | |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 0b32c81730a5..80f4bfd913b3 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -10,6 +10,7 @@ #include <linux/mm.h> #include <linux/pm.h> #include <linux/of_address.h> +#include <linux/pinctrl/machine.h> #include <asm/system_misc.h> #include <asm/mach/map.h> @@ -448,7 +449,8 @@ void __init at91_dt_initialize(void) /* Register the processor-specific clocks */ at91_boot_soc.register_clocks(); - at91_boot_soc.init(); + if (at91_boot_soc.init) + at91_boot_soc.init(); } #endif @@ -463,4 +465,6 @@ void __init at91_initialize(unsigned long main_clock) at91_boot_soc.register_clocks(); at91_boot_soc.init(); + + pinctrl_provide_dummies(); } |