diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 18:43:40 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 18:43:40 +0200 |
| commit | e1ddcdef841f68d175b1a4a5c91d55f383ce5241 (patch) | |
| tree | 69122e47ea903b99c5e7a6c871deb7717663bf5f /arch/arm/mach-shmobile/board-lager.c | |
| parent | Merge tag 'renesas-r8a7779-multiplatform2-for-v3.17' of git://git.kernel.org/... (diff) | |
| parent | ARM: shmobile: Move sh7372.h (diff) | |
| download | linux-e1ddcdef841f68d175b1a4a5c91d55f383ce5241.tar.xz linux-e1ddcdef841f68d175b1a4a5c91d55f383ce5241.zip | |
Merge branch 'renesas/cleanup2' into next/soc
Merging in as base to resolve a merge conflict with later soc branch
locally.
Diffstat (limited to 'arch/arm/mach-shmobile/board-lager.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-lager.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index 83bbb5c48863..bfd9e4846fc9 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -31,6 +31,8 @@ #include <linux/mmc/host.h> #include <linux/mmc/sh_mmcif.h> #include <linux/mmc/sh_mobile_sdhi.h> +#include <linux/mtd/partitions.h> +#include <linux/mtd/mtd.h> #include <linux/pinctrl/machine.h> #include <linux/platform_data/camera-rcar.h> #include <linux/platform_data/gpio-rcar.h> @@ -43,21 +45,21 @@ #include <linux/regulator/gpio-regulator.h> #include <linux/regulator/machine.h> #include <linux/sh_eth.h> +#include <linux/spi/flash.h> +#include <linux/spi/rspi.h> +#include <linux/spi/spi.h> #include <linux/usb/phy.h> #include <linux/usb/renesas_usbhs.h> -#include <mach/r8a7790.h> + #include <media/soc_camera.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <linux/mtd/partitions.h> -#include <linux/mtd/mtd.h> -#include <linux/spi/flash.h> -#include <linux/spi/rspi.h> -#include <linux/spi/spi.h> #include <sound/rcar_snd.h> #include <sound/simple_card.h> + #include "common.h" #include "irqs.h" +#include "r8a7790.h" #include "rcar-gen2.h" /* @@ -887,7 +889,7 @@ static const char * const lager_boards_compat_dt[] __initconst = { DT_MACHINE_START(LAGER_DT, "lager") .smp = smp_ops(r8a7790_smp_ops), - .init_early = r8a7790_init_early, + .init_early = shmobile_init_delay, .init_time = rcar_gen2_timer_init, .init_machine = lager_init, .init_late = shmobile_init_late, |