Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+12
-11
+1
arch/mips/au1000/common/pci.c
+1
arch/mips/au1000/common/pci.c
+2
-2
arch/mips/au1000/mtx-1/board_setup.c
+2
-2
arch/mips/au1000/mtx-1/board_setup.c
···
54
54
55
55
void __init board_setup(void)
56
56
{
57
-
#ifdef CONFIG_USB_OHCI
57
+
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
58
58
// enable USB power switch
59
59
au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
60
60
au_writel( 0x100000, GPIO2_OUTPUT );
61
-
#endif // defined (CONFIG_USB_OHCI)
61
+
#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
62
62
63
63
#ifdef CONFIG_PCI
64
64
#if defined(__MIPSEB__)
+3
-3
arch/mips/au1000/pb1000/board_setup.c
+3
-3
arch/mips/au1000/pb1000/board_setup.c
···
54
54
au_writel(0, SYS_PINSTATERD);
55
55
udelay(100);
56
56
57
-
#ifdef CONFIG_USB_OHCI
57
+
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
58
58
/* zero and disable FREQ2 */
59
59
sys_freqctrl = au_readl(SYS_FREQCTRL0);
60
60
sys_freqctrl &= ~0xFFF00000;
···
102
102
/*
103
103
* Route 48MHz FREQ2 into USB Host and/or Device
104
104
*/
105
-
#ifdef CONFIG_USB_OHCI
105
+
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
106
106
sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
107
107
#endif
108
108
au_writel(sys_clksrc, SYS_CLKSRC);
···
116
116
au_writel(pin_func, SYS_PINFUNC);
117
117
au_writel(0x2800, SYS_TRIOUTCLR);
118
118
au_writel(0x0030, SYS_OUTPUTCLR);
119
-
#endif // defined (CONFIG_USB_OHCI)
119
+
#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
120
120
121
121
// make gpio 15 an input (for interrupt line)
122
122
pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100);
+2
-2
arch/mips/au1000/pb1100/board_setup.c
+2
-2
arch/mips/au1000/pb1100/board_setup.c
···
54
54
au_writel(0, SYS_PININPUTEN);
55
55
udelay(100);
56
56
57
-
#ifdef CONFIG_USB_OHCI
57
+
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
58
58
{
59
59
u32 pin_func, sys_freqctrl, sys_clksrc;
60
60
···
98
98
pin_func |= 0x8000;
99
99
au_writel(pin_func, SYS_PINFUNC);
100
100
}
101
-
#endif // defined (CONFIG_USB_OHCI)
101
+
#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
102
102
103
103
/* Enable sys bus clock divider when IDLE state or no bus activity. */
104
104
au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
+3
-3
arch/mips/au1000/pb1500/board_setup.c
+3
-3
arch/mips/au1000/pb1500/board_setup.c
···
56
56
au_writel(0, SYS_PINSTATERD);
57
57
udelay(100);
58
58
59
-
#ifdef CONFIG_USB_OHCI
59
+
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
60
60
61
61
/* GPIO201 is input for PCMCIA card detect */
62
62
/* GPIO203 is input for PCMCIA interrupt request */
···
85
85
/*
86
86
* Route 48MHz FREQ2 into USB Host and/or Device
87
87
*/
88
-
#ifdef CONFIG_USB_OHCI
88
+
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
89
89
sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
90
90
#endif
91
91
au_writel(sys_clksrc, SYS_CLKSRC);
···
95
95
// 2nd USB port is USB host
96
96
pin_func |= 0x8000;
97
97
au_writel(pin_func, SYS_PINFUNC);
98
-
#endif // defined (CONFIG_USB_OHCI)
98
+
#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
99
99
100
100
101
101