git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3beagle.c
diff --git
a/arch/arm/mach-omap2/board-omap3beagle.c
b/arch/arm/mach-omap2/board-omap3beagle.c
index
22c483d
..
70bc1fc
100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3beagle.c
+++ b/
arch/arm/mach-omap2/board-omap3beagle.c
@@
-30,6
+30,7
@@
#include <linux/mtd/partitions.h>
#include <linux/mtd/nand.h>
#include <linux/mmc/host.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/nand.h>
#include <linux/mmc/host.h>
+#include <linux/usb/phy.h>
#include <linux/regulator/machine.h>
#include <linux/i2c/twl.h>
#include <linux/regulator/machine.h>
#include <linux/i2c/twl.h>
@@
-430,7
+431,7
@@
static struct platform_device *omap3_beagle_devices[] __initdata = {
&madc_hwmon,
};
&madc_hwmon,
};
-static
const struct usbhs_omap_board_data usbhs_bdata __initconst
= {
+static
struct usbhs_omap_platform_data usbhs_bdata __initdata
= {
.port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
.port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
@@
-494,7
+495,7
@@
static int __init beagle_opp_init(void)
}
return 0;
}
}
return 0;
}
-device_initcall(beagle_opp_init);
+
omap_
device_initcall(beagle_opp_init);
static void __init omap3_beagle_init(void)
{
static void __init omap3_beagle_init(void)
{
@@
-519,6
+520,7
@@
static void __init omap3_beagle_init(void)
omap_sdrc_init(mt46h32m32lf6_sdrc_params,
mt46h32m32lf6_sdrc_params);
omap_sdrc_init(mt46h32m32lf6_sdrc_params,
mt46h32m32lf6_sdrc_params);
+ usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb");
usb_musb_init(NULL);
usbhs_init(&usbhs_bdata);
board_nand_init(omap3beagle_nand_partitions,
usb_musb_init(NULL);
usbhs_init(&usbhs_bdata);
board_nand_init(omap3beagle_nand_partitions,
@@
-544,6
+546,6
@@
MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
.handle_irq = omap3_intc_handle_irq,
.init_machine = omap3_beagle_init,
.init_late = omap3_init_late,
.handle_irq = omap3_intc_handle_irq,
.init_machine = omap3_beagle_init,
.init_late = omap3_init_late,
- .
timer = &omap3_secure_timer
,
+ .
init_time = omap3_secure_sync32k_timer_init
,
.restart = omap3xxx_restart,
MACHINE_END
.restart = omap3xxx_restart,
MACHINE_END