i386: Replace [read, write]_mmcr_[byte, word, long] with memory mapped structure

[oweals/u-boot.git] / cpu / mpc83xx / cpu_init.c

diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c
index 414565cb65bb94e477ae1798851a1b154f8cb68d..5c930d38880f431b29c80ab2ad69b8ab49a2d1c0 100644 (file)
--- a/cpu/mpc83xx/cpu_init.c
+++ b/cpu/mpc83xx/cpu_init.c
@@ -299,18 +299,20 @@ void cpu_init_f (volatile immap_t * im)
        im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR;
 #endif
 #ifdef CONFIG_USB_EHCI_FSL
+#ifndef CONFIG_MPC834x
        uint32_t temp;
        struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_MPC8xxx_USB_ADDR;
 
        /* Configure interface. */
-       setbits_be32((void *)ehci->control, REFSEL_16MHZ | UTMI_PHY_EN);
+       setbits_be32(&ehci->control, REFSEL_16MHZ | UTMI_PHY_EN);
 
        /* Wait for clock to stabilize */
        do {
-               temp = in_be32((void *)ehci->control);
+               temp = in_be32(&ehci->control);
                udelay(1000);
        } while (!(temp & PHY_CLK_VALID));
 #endif
+#endif
 }
 
 int cpu_init_r (void)