diff options
Diffstat (limited to 'arch/arm/mach-sa1100/jornada720.c')
| -rw-r--r-- | arch/arm/mach-sa1100/jornada720.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 52ac37d1e23aa9..0066974d47d159 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c @@ -226,12 +226,30 @@ static struct platform_device jornada_ssp_device = { .id = -1, }; +static struct platform_device jornada_bllcd_device = { + .name = "jornada_bllcd", + .id = -1, +}; + +static struct platform_device jornada_kbd_device = { + .name = "jornada720_kbd", + .id = -1, +}; + +static struct platform_device jornada_ts_device = { + .name = "jornada_ts", + .id = -1, +}; + static struct platform_device *devices[] __initdata = { &sa1111_device, #ifdef CONFIG_SA1100_JORNADA720_SSP &jornada_ssp_device, #endif &s1d13xxxfb_device, + &jornada_bllcd_device, + &jornada_kbd_device, + &jornada_ts_device, }; static int __init jornada720_init(void) @@ -285,6 +303,7 @@ static void __init jornada720_map_io(void) sa1100_register_uart(1, 1); } +#ifdef CONFIG_SA1100_JORNADA720_FLASHROM_OLD static struct mtd_partition jornada720_partitions[] = { { .name = "JORNADA720 boot firmware", @@ -346,6 +365,7 @@ static void __init jornada720_mach_init(void) { sa11x0_set_flash_data(&jornada720_flash_data, &jornada720_flash_resource, 1); } +#endif MACHINE_START(JORNADA720, "HP Jornada 720") /* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */ @@ -355,5 +375,7 @@ MACHINE_START(JORNADA720, "HP Jornada 720") .map_io = jornada720_map_io, .init_irq = sa1100_init_irq, .timer = &sa1100_timer, +#ifdef CONFIG_JORNADA720_FLASHROM_OLD .init_machine = jornada720_mach_init, +#endif MACHINE_END |