projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-devkit8000.c
diff --git
a/arch/arm/mach-omap2/board-devkit8000.c
b/arch/arm/mach-omap2/board-devkit8000.c
index
77cade5
..
53056c3
100644
(file)
--- a/
arch/arm/mach-omap2/board-devkit8000.c
+++ b/
arch/arm/mach-omap2/board-devkit8000.c
@@
-436,7
+436,7
@@
static struct platform_device *devkit8000_devices[] __initdata = {
&omap_dm9000_dev,
};
&omap_dm9000_dev,
};
-static
const struct usbhs_omap_board_data usbhs_bdata __initconst
= {
+static
struct usbhs_omap_platform_data usbhs_bdata __initdata
= {
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
@@
-629,7
+629,7
@@
static void __init devkit8000_init(void)
board_nand_init(devkit8000_nand_partitions,
ARRAY_SIZE(devkit8000_nand_partitions), NAND_CS,
NAND_BUSWIDTH_16, NULL);
board_nand_init(devkit8000_nand_partitions,
ARRAY_SIZE(devkit8000_nand_partitions), NAND_CS,
NAND_BUSWIDTH_16, NULL);
- omap_twl4030_audio_init("omap3beagle");
+ omap_twl4030_audio_init("omap3beagle"
, NULL
);
/* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
/* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
@@
-645,6
+645,6
@@
MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000")
.handle_irq = omap3_intc_handle_irq,
.init_machine = devkit8000_init,
.init_late = omap35xx_init_late,
.handle_irq = omap3_intc_handle_irq,
.init_machine = devkit8000_init,
.init_late = omap35xx_init_late,
- .
timer = &omap3_secure_timer
,
+ .
init_time = omap3_secure_sync32k_timer_init
,
.restart = omap3xxx_restart,
MACHINE_END
.restart = omap3xxx_restart,
MACHINE_END