From: Mateusz Kulikowski Date: Thu, 31 Mar 2016 21:12:25 +0000 (+0200) Subject: ehci-ci.h: drop generic USBCMD fields X-Git-Tag: v2016.05-rc1~51 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d144f96a48a3dccb1c5db7a865f64996095b63fb;p=oweals%2Fu-boot.git ehci-ci.h: drop generic USBCMD fields Use definitions from ehci.h instead. Signed-off-by: Mateusz Kulikowski Acked-by: Marek Vasut Tested-by: Simon Glass --- diff --git a/drivers/usb/host/ehci-mpc512x.c b/drivers/usb/host/ehci-mpc512x.c index 4b50ac8ca1..bb4f461613 100644 --- a/drivers/usb/host/ehci-mpc512x.c +++ b/drivers/usb/host/ehci-mpc512x.c @@ -93,7 +93,7 @@ static int reset_usb_controller(volatile struct usb_ehci *ehci) unsigned int i; /* Command a reset of the USB Controller */ - out_be32(&(ehci->usbcmd), EHCI_FSL_USBCMD_RST); + out_be32(&(ehci->usbcmd), CMD_RESET); /* Wait for the reset process to finish */ for (i = 65535 ; i > 0 ; i--) { @@ -101,7 +101,7 @@ static int reset_usb_controller(volatile struct usb_ehci *ehci) * The host will set this bit to zero once the * reset process is complete */ - if ((in_be32(&(ehci->usbcmd)) & EHCI_FSL_USBCMD_RST) == 0) + if ((in_be32(&(ehci->usbcmd)) & CMD_RESET) == 0) return 0; } diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index 305b180bc1..586d32ab52 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -97,10 +97,6 @@ #define INTR_DATA_PULSING_EN (0x1<<30) #define INTSTS_MASK (0x00ff0000) -/* USBCMD Bits of interest */ -#define EHCI_FSL_USBCMD_RST (1 << 1) -#define EHCI_FSL_USBCMD_RS (1 << 0) - #define INTERRUPT_ENABLE_BITS_MASK \ (INTR_USB_ID_EN | \ INTR_1MS_TIMER_EN | \