Commit 5df3e0d9 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Au1000: set the PCI controller IO base
  [MIPS] Alchemy: Fix USB initialization.
  [MIPS] IP32: Fix fatal typo in address computation.
parents a6d85430 2da23247
...@@ -74,6 +74,7 @@ static int __init au1x_pci_setup(void) ...@@ -74,6 +74,7 @@ static int __init au1x_pci_setup(void)
printk(KERN_ERR "Unable to ioremap pci space\n"); printk(KERN_ERR "Unable to ioremap pci space\n");
return 1; return 1;
} }
au1x_controller.io_map_base = virt_io_addr;
#ifdef CONFIG_DMA_NONCOHERENT #ifdef CONFIG_DMA_NONCOHERENT
{ {
......
...@@ -54,11 +54,11 @@ void board_reset (void) ...@@ -54,11 +54,11 @@ void board_reset (void)
void __init board_setup(void) void __init board_setup(void)
{ {
#ifdef CONFIG_USB_OHCI #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
// enable USB power switch // enable USB power switch
au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR ); au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
au_writel( 0x100000, GPIO2_OUTPUT ); au_writel( 0x100000, GPIO2_OUTPUT );
#endif // defined (CONFIG_USB_OHCI) #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#if defined(__MIPSEB__) #if defined(__MIPSEB__)
......
...@@ -54,7 +54,7 @@ void __init board_setup(void) ...@@ -54,7 +54,7 @@ void __init board_setup(void)
au_writel(0, SYS_PINSTATERD); au_writel(0, SYS_PINSTATERD);
udelay(100); udelay(100);
#ifdef CONFIG_USB_OHCI #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
/* zero and disable FREQ2 */ /* zero and disable FREQ2 */
sys_freqctrl = au_readl(SYS_FREQCTRL0); sys_freqctrl = au_readl(SYS_FREQCTRL0);
sys_freqctrl &= ~0xFFF00000; sys_freqctrl &= ~0xFFF00000;
...@@ -102,7 +102,7 @@ void __init board_setup(void) ...@@ -102,7 +102,7 @@ void __init board_setup(void)
/* /*
* Route 48MHz FREQ2 into USB Host and/or Device * Route 48MHz FREQ2 into USB Host and/or Device
*/ */
#ifdef CONFIG_USB_OHCI #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
sys_clksrc |= ((4<<12) | (0<<11) | (0<<10)); sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
#endif #endif
au_writel(sys_clksrc, SYS_CLKSRC); au_writel(sys_clksrc, SYS_CLKSRC);
...@@ -116,7 +116,7 @@ void __init board_setup(void) ...@@ -116,7 +116,7 @@ void __init board_setup(void)
au_writel(pin_func, SYS_PINFUNC); au_writel(pin_func, SYS_PINFUNC);
au_writel(0x2800, SYS_TRIOUTCLR); au_writel(0x2800, SYS_TRIOUTCLR);
au_writel(0x0030, SYS_OUTPUTCLR); au_writel(0x0030, SYS_OUTPUTCLR);
#endif // defined (CONFIG_USB_OHCI) #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
// make gpio 15 an input (for interrupt line) // make gpio 15 an input (for interrupt line)
pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100); pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100);
......
...@@ -54,7 +54,7 @@ void __init board_setup(void) ...@@ -54,7 +54,7 @@ void __init board_setup(void)
au_writel(0, SYS_PININPUTEN); au_writel(0, SYS_PININPUTEN);
udelay(100); udelay(100);
#ifdef CONFIG_USB_OHCI #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
{ {
u32 pin_func, sys_freqctrl, sys_clksrc; u32 pin_func, sys_freqctrl, sys_clksrc;
...@@ -98,7 +98,7 @@ void __init board_setup(void) ...@@ -98,7 +98,7 @@ void __init board_setup(void)
pin_func |= 0x8000; pin_func |= 0x8000;
au_writel(pin_func, SYS_PINFUNC); au_writel(pin_func, SYS_PINFUNC);
} }
#endif // defined (CONFIG_USB_OHCI) #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
/* Enable sys bus clock divider when IDLE state or no bus activity. */ /* Enable sys bus clock divider when IDLE state or no bus activity. */
au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL); au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
......
...@@ -56,7 +56,7 @@ void __init board_setup(void) ...@@ -56,7 +56,7 @@ void __init board_setup(void)
au_writel(0, SYS_PINSTATERD); au_writel(0, SYS_PINSTATERD);
udelay(100); udelay(100);
#ifdef CONFIG_USB_OHCI #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
/* GPIO201 is input for PCMCIA card detect */ /* GPIO201 is input for PCMCIA card detect */
/* GPIO203 is input for PCMCIA interrupt request */ /* GPIO203 is input for PCMCIA interrupt request */
...@@ -85,7 +85,7 @@ void __init board_setup(void) ...@@ -85,7 +85,7 @@ void __init board_setup(void)
/* /*
* Route 48MHz FREQ2 into USB Host and/or Device * Route 48MHz FREQ2 into USB Host and/or Device
*/ */
#ifdef CONFIG_USB_OHCI #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
sys_clksrc |= ((4<<12) | (0<<11) | (0<<10)); sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
#endif #endif
au_writel(sys_clksrc, SYS_CLKSRC); au_writel(sys_clksrc, SYS_CLKSRC);
...@@ -95,7 +95,7 @@ void __init board_setup(void) ...@@ -95,7 +95,7 @@ void __init board_setup(void)
// 2nd USB port is USB host // 2nd USB port is USB host
pin_func |= 0x8000; pin_func |= 0x8000;
au_writel(pin_func, SYS_PINFUNC); au_writel(pin_func, SYS_PINFUNC);
#endif // defined (CONFIG_USB_OHCI) #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
......
...@@ -33,7 +33,7 @@ static inline int mkaddr(struct pci_bus *bus, unsigned int devfn, ...@@ -33,7 +33,7 @@ static inline int mkaddr(struct pci_bus *bus, unsigned int devfn,
unsigned int reg) unsigned int reg)
{ {
return ((bus->number & 0xff) << 16) | return ((bus->number & 0xff) << 16) |
(devfn & 0xff) << 8) | ((devfn & 0xff) << 8) |
(reg & 0xfc); (reg & 0xfc);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment