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 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
board-kzm9g.c
diff --git
a/arch/arm/mach-shmobile/board-kzm9g.c
b/arch/arm/mach-shmobile/board-kzm9g.c
index
3b8a017
..
773a2b9
100644
(file)
--- a/
arch/arm/mach-shmobile/board-kzm9g.c
+++ b/
arch/arm/mach-shmobile/board-kzm9g.c
@@
-133,8
+133,8
@@
static struct platform_device usb_host_device = {
/* USB Func CN17 */
struct usbhs_private {
/* USB Func CN17 */
struct usbhs_private {
-
unsigned int
phy;
-
unsigned int
cr2;
+
void __iomem *
phy;
+
void __iomem *
cr2;
struct renesas_usbhs_platform_info info;
};
struct renesas_usbhs_platform_info info;
};
@@
-232,8
+232,8
@@
static u32 usbhs_pipe_cfg[] = {
};
static struct usbhs_private usbhs_private = {
};
static struct usbhs_private usbhs_private = {
- .phy =
0xe60781e0,
/* USBPHYINT */
- .cr2 =
0xe605810c,
/* USBCR2 */
+ .phy =
IOMEM(0xe60781e0),
/* USBPHYINT */
+ .cr2 =
IOMEM(0xe605810c),
/* USBCR2 */
.info = {
.platform_callback = {
.hardware_init = usbhs_hardware_init,
.info = {
.platform_callback = {
.hardware_init = usbhs_hardware_init,
@@
-763,12
+763,20
@@
static void __init kzm_init(void)
platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices));
}
platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices));
}
+static void kzm9g_restart(char mode, const char *cmd)
+{
+#define RESCNT2 IOMEM(0xe6188020)
+ /* Do soft power on reset */
+ writel((1 << 31), RESCNT2);
+}
+
static const char *kzm9g_boards_compat_dt[] __initdata = {
"renesas,kzm9g",
NULL,
};
DT_MACHINE_START(KZM9G_DT, "kzm9g")
static const char *kzm9g_boards_compat_dt[] __initdata = {
"renesas,kzm9g",
NULL,
};
DT_MACHINE_START(KZM9G_DT, "kzm9g")
+ .smp = smp_ops(sh73a0_smp_ops),
.map_io = sh73a0_map_io,
.init_early = sh73a0_add_early_devices,
.nr_irqs = NR_IRQS_LEGACY,
.map_io = sh73a0_map_io,
.init_early = sh73a0_add_early_devices,
.nr_irqs = NR_IRQS_LEGACY,
@@
-777,5
+785,6
@@
DT_MACHINE_START(KZM9G_DT, "kzm9g")
.init_machine = kzm_init,
.init_late = shmobile_init_late,
.timer = &shmobile_timer,
.init_machine = kzm_init,
.init_late = shmobile_init_late,
.timer = &shmobile_timer,
+ .restart = kzm9g_restart,
.dt_compat = kzm9g_boards_compat_dt,
MACHINE_END
.dt_compat = kzm9g_boards_compat_dt,
MACHINE_END