USB: FHCI: Reusing QUICC Engine USB Controller registers from immap_qe.h

The struct fhci_regs (in drivers/usb/host/fhci.h) is basically a redefinition
of the struct qe_usb_ctlr (in arch/powerpc/include/asm/immap_qe.h).

The qe_usb_ctlr struct is preferrable once it uses accurately the registers'
names found in the Freescale's QUICC Engine Block Reference Manuals (QEIWRM.pdf
Rev.4.4 Chapter 19 for MPC836xE series and MPC8323ERM.pdf Rev.2 Chapter 36 for
MPC832xE series), making easier to map the FHCI device driver to the hardware
manual. Also, as the FHCI driver uses the USB Controller registers, the name
qe_usb_ctlr is a more precise representation of the hardware than fhci_regs.

Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/host/fhci-hub.c b/drivers/usb/host/fhci-hub.c
index 348fe62e94f7..6af2512f8378 100644
--- a/drivers/usb/host/fhci-hub.c
+++ b/drivers/usb/host/fhci-hub.c
@@ -97,7 +97,7 @@ void fhci_port_disable(struct fhci_hcd *fhci)
 
         /* Enable IDLE since we want to know if something comes along */
         usb->saved_msk |= USB_E_IDLE_MASK;
-        out_be16(&usb->fhci->regs->usb_mask, usb->saved_msk);
+        out_be16(&usb->fhci->regs->usb_usbmr, usb->saved_msk);
 
         /* check if during the disconnection process attached new device */
         if (port_status == FHCI_PORT_WAITING)
@@ -158,21 +158,21 @@ void fhci_port_reset(void *lld)
 
         fhci_stop_sof_timer(fhci);
         /* disable the USB controller */
-        mode = in_8(&fhci->regs->usb_mod);
-        out_8(&fhci->regs->usb_mod, mode & (~USB_MODE_EN));
+        mode = in_8(&fhci->regs->usb_usmod);
+        out_8(&fhci->regs->usb_usmod, mode & (~USB_MODE_EN));
 
         /* disable idle interrupts */
-        mask = in_be16(&fhci->regs->usb_mask);
-        out_be16(&fhci->regs->usb_mask, mask & (~USB_E_IDLE_MASK));
+        mask = in_be16(&fhci->regs->usb_usbmr);
+        out_be16(&fhci->regs->usb_usbmr, mask & (~USB_E_IDLE_MASK));
 
         fhci_io_port_generate_reset(fhci);
 
         /* enable interrupt on this endpoint */
-        out_be16(&fhci->regs->usb_mask, mask);
+        out_be16(&fhci->regs->usb_usbmr, mask);
 
         /* enable the USB controller */
-        mode = in_8(&fhci->regs->usb_mod);
-        out_8(&fhci->regs->usb_mod, mode | USB_MODE_EN);
+        mode = in_8(&fhci->regs->usb_usmod);
+        out_8(&fhci->regs->usb_usmod, mode | USB_MODE_EN);
         fhci_start_sof_timer(fhci);
 
         fhci_dbg(fhci, "<- %s\n", __func__);