MIPS: Netlogic: Merge platform usb.h to usb-init.c
The definitions are not used anywhere else, and merging it will make adding the new USB definitions for XLPII series easier. While there, cleanup some whitespace in usb-init.c. There is no change to logic due to this commit. Signed-off-by: Jayachandran C <jchandra@broadcom.com> Patchwork: http://patchwork.linux-mips.org/patch/5027/ Acked-by: John Crispin <blogic@openwrt.org>
This commit is contained in:
Jayachandran C
Ralf Baechle
parent
035114fbdb
commit
c80dd3b679
|
|
@ -1,64 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2003-2012 Broadcom Corporation
|
||||
* All Rights Reserved
|
||||
*
|
||||
* This software is available to you under a choice of one of two
|
||||
* licenses. You may choose to be licensed under the terms of the GNU
|
||||
* General Public License (GPL) Version 2, available from the file
|
||||
* COPYING in the main directory of this source tree, or the Broadcom
|
||||
* license below:
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY BROADCOM ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef __NLM_HAL_USB_H__
|
||||
#define __NLM_HAL_USB_H__
|
||||
|
||||
#define USB_CTL_0 0x01
|
||||
#define USB_PHY_0 0x0A
|
||||
#define USB_PHY_RESET 0x01
|
||||
#define USB_PHY_PORT_RESET_0 0x10
|
||||
#define USB_PHY_PORT_RESET_1 0x20
|
||||
#define USB_CONTROLLER_RESET 0x01
|
||||
#define USB_INT_STATUS 0x0E
|
||||
#define USB_INT_EN 0x0F
|
||||
#define USB_PHY_INTERRUPT_EN 0x01
|
||||
#define USB_OHCI_INTERRUPT_EN 0x02
|
||||
#define USB_OHCI_INTERRUPT1_EN 0x04
|
||||
#define USB_OHCI_INTERRUPT2_EN 0x08
|
||||
#define USB_CTRL_INTERRUPT_EN 0x10
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#define nlm_read_usb_reg(b, r) nlm_read_reg(b, r)
|
||||
#define nlm_write_usb_reg(b, r, v) nlm_write_reg(b, r, v)
|
||||
#define nlm_get_usb_pcibase(node, inst) \
|
||||
nlm_pcicfg_base(XLP_IO_USB_OFFSET(node, inst))
|
||||
#define nlm_get_usb_hcd_base(node, inst) \
|
||||
nlm_xkphys_map_pcibar0(nlm_get_usb_pcibase(node, inst))
|
||||
#define nlm_get_usb_regbase(node, inst) \
|
||||
(nlm_get_usb_pcibase(node, inst) + XLP_IO_PCI_HDRSZ)
|
||||
|
||||
#endif
|
||||
#endif /* __NLM_HAL_USB_H__ */
|
||||
|
|
@ -42,7 +42,30 @@
|
|||
#include <asm/netlogic/haldefs.h>
|
||||
#include <asm/netlogic/xlp-hal/iomap.h>
|
||||
#include <asm/netlogic/xlp-hal/xlp.h>
|
||||
#include <asm/netlogic/xlp-hal/usb.h>
|
||||
|
||||
/*
|
||||
* USB glue logic registers, used only during initialization
|
||||
*/
|
||||
#define USB_CTL_0 0x01
|
||||
#define USB_PHY_0 0x0A
|
||||
#define USB_PHY_RESET 0x01
|
||||
#define USB_PHY_PORT_RESET_0 0x10
|
||||
#define USB_PHY_PORT_RESET_1 0x20
|
||||
#define USB_CONTROLLER_RESET 0x01
|
||||
#define USB_INT_STATUS 0x0E
|
||||
#define USB_INT_EN 0x0F
|
||||
#define USB_PHY_INTERRUPT_EN 0x01
|
||||
#define USB_OHCI_INTERRUPT_EN 0x02
|
||||
#define USB_OHCI_INTERRUPT1_EN 0x04
|
||||
#define USB_OHCI_INTERRUPT2_EN 0x08
|
||||
#define USB_CTRL_INTERRUPT_EN 0x10
|
||||
|
||||
#define nlm_read_usb_reg(b, r) nlm_read_reg(b, r)
|
||||
#define nlm_write_usb_reg(b, r, v) nlm_write_reg(b, r, v)
|
||||
#define nlm_get_usb_pcibase(node, inst) \
|
||||
nlm_pcicfg_base(XLP_IO_USB_OFFSET(node, inst))
|
||||
#define nlm_get_usb_regbase(node, inst) \
|
||||
(nlm_get_usb_pcibase(node, inst) + XLP_IO_PCI_HDRSZ)
|
||||
|
||||
static void nlm_usb_intr_en(int node, int port)
|
||||
{
|
||||
|
|
@ -99,23 +122,23 @@ static void nlm_usb_fixup_final(struct pci_dev *dev)
|
|||
dev->dev.coherent_dma_mask = DMA_BIT_MASK(64);
|
||||
switch (dev->devfn) {
|
||||
case 0x10:
|
||||
dev->irq = PIC_EHCI_0_IRQ;
|
||||
break;
|
||||
dev->irq = PIC_EHCI_0_IRQ;
|
||||
break;
|
||||
case 0x11:
|
||||
dev->irq = PIC_OHCI_0_IRQ;
|
||||
break;
|
||||
dev->irq = PIC_OHCI_0_IRQ;
|
||||
break;
|
||||
case 0x12:
|
||||
dev->irq = PIC_OHCI_1_IRQ;
|
||||
break;
|
||||
dev->irq = PIC_OHCI_1_IRQ;
|
||||
break;
|
||||
case 0x13:
|
||||
dev->irq = PIC_EHCI_1_IRQ;
|
||||
break;
|
||||
dev->irq = PIC_EHCI_1_IRQ;
|
||||
break;
|
||||
case 0x14:
|
||||
dev->irq = PIC_OHCI_2_IRQ;
|
||||
break;
|
||||
dev->irq = PIC_OHCI_2_IRQ;
|
||||
break;
|
||||
case 0x15:
|
||||
dev->irq = PIC_OHCI_3_IRQ;
|
||||
break;
|
||||
dev->irq = PIC_OHCI_3_IRQ;
|
||||
break;
|
||||
}
|
||||
}
|
||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_NETLOGIC, PCI_DEVICE_ID_NLM_EHCI,
|
||||
|
|
|
|||
Loading…
Reference in New Issue