diff options
| author | Rob Herring <robh@kernel.org> | 2015-12-08 14:44:16 -0600 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-15 23:53:21 +0100 |
| commit | 16956fed35fecde2201e23458cda193526b19559 (patch) | |
| tree | 540334f3232efb2bd79c00aaa75dca6d4a7bea5f /arch/arm/mach-versatile/core.h | |
| parent | a8e2894c125f69aaea474592ebebd463bb7e1b0a (diff) | |
ARM: versatile: switch to DT only booting and remove legacy code
With DT support for clocks, irqchips, timers, and PCI now in place, DT
based booting has feature parity with non-DT legacy boot. The final
piece is actually enabling common clock support on Versatile. Enabling
full DT support requires either removing the old Versatile clock code,
updating the legacy boot to use the common clock code, or making DT and
legacy boot mutually exclusive. Given that removing legacy boot code is
the goal anyway, I am going with the 1st option.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-versatile/core.h')
| -rw-r--r-- | arch/arm/mach-versatile/core.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-versatile/core.h b/arch/arm/mach-versatile/core.h index f06d5768e428..c3d71571fc7a 100644 --- a/arch/arm/mach-versatile/core.h +++ b/arch/arm/mach-versatile/core.h @@ -26,7 +26,8 @@ #include <linux/of_platform.h> #include <linux/reboot.h> -extern void __init versatile_init(void); +extern struct platform_device versatile_flash_device; + extern void __init versatile_init_early(void); extern void __init versatile_init_irq(void); extern void __init versatile_map_io(void); @@ -37,10 +38,4 @@ extern unsigned int mmc_status(struct device *dev); extern struct of_dev_auxdata versatile_auxdata_lookup[]; #endif -#define APB_DEVICE(name, busid, base, plat) \ -static AMBA_APB_DEVICE(name, busid, 0, VERSATILE_##base##_BASE, base##_IRQ, plat) - -#define AHB_DEVICE(name, busid, base, plat) \ -static AMBA_AHB_DEVICE(name, busid, 0, VERSATILE_##base##_BASE, base##_IRQ, plat) - #endif |