Commit 3f21cdee authored by Ralf Baechle's avatar Ralf Baechle

[MIPS] PB1100: Fix pile of warnings

  CC      arch/mips/au1000/pb1100/board_setup.o
arch/mips/au1000/pb1100/board_setup.c: In function ‘board_setup’:
arch/mips/au1000/pb1100/board_setup.c:104: warning: passing argument 1 of ‘readb’ makes pointer from integer without a cast
arch/mips/au1000/pb1100/board_setup.c:105: warning: passing argument 1 of ‘readb’ makes pointer from integer without a cast
arch/mips/au1000/pb1100/board_setup.c:105: warning: passing argument 2 of ‘writeb’ makes pointer from integer without a cast
arch/mips/au1000/pb1100/board_setup.c:109: warning: passing argument 1 of ‘readb’ makes pointer from integer without a cast
arch/mips/au1000/pb1100/board_setup.c:110: warning: passing argument 1 of ‘readb’ makes pointer from integer without a cast
arch/mips/au1000/pb1100/board_setup.c:110: warning: passing argument 2 of ‘writeb’ makes pointer from integer without a cast
arch/mips/au1000/pb1100/board_setup.c:51: warning: unused variable ‘sys_clksrc’
arch/mips/au1000/pb1100/board_setup.c:51: warning: unused variable ‘sys_freqctrl’
arch/mips/au1000/pb1100/board_setup.c:50: warning: unused variable ‘pin_func’
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 786d7cdd
...@@ -47,8 +47,7 @@ void board_reset (void) ...@@ -47,8 +47,7 @@ void board_reset (void)
void __init board_setup(void) void __init board_setup(void)
{ {
u32 pin_func; volatile void __iomem * base = (volatile void __iomem *) 0xac000000UL;
u32 sys_freqctrl, sys_clksrc;
// set AUX clock to 12MHz * 8 = 96 MHz // set AUX clock to 12MHz * 8 = 96 MHz
au_writel(8, SYS_AUXPLL); au_writel(8, SYS_AUXPLL);
...@@ -56,58 +55,62 @@ void __init board_setup(void) ...@@ -56,58 +55,62 @@ void __init board_setup(void)
udelay(100); udelay(100);
#ifdef CONFIG_USB_OHCI #ifdef CONFIG_USB_OHCI
// configure pins GPIO[14:9] as GPIO {
pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x80); u32 pin_func, sys_freqctrl, sys_clksrc;
/* zero and disable FREQ2 */ // configure pins GPIO[14:9] as GPIO
sys_freqctrl = au_readl(SYS_FREQCTRL0); pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x80);
sys_freqctrl &= ~0xFFF00000;
au_writel(sys_freqctrl, SYS_FREQCTRL0); /* zero and disable FREQ2 */
sys_freqctrl = au_readl(SYS_FREQCTRL0);
/* zero and disable USBH/USBD/IrDA clock */ sys_freqctrl &= ~0xFFF00000;
sys_clksrc = au_readl(SYS_CLKSRC); au_writel(sys_freqctrl, SYS_FREQCTRL0);
sys_clksrc &= ~0x0000001F;
au_writel(sys_clksrc, SYS_CLKSRC); /* zero and disable USBH/USBD/IrDA clock */
sys_clksrc = au_readl(SYS_CLKSRC);
sys_freqctrl = au_readl(SYS_FREQCTRL0); sys_clksrc &= ~0x0000001F;
sys_freqctrl &= ~0xFFF00000; au_writel(sys_clksrc, SYS_CLKSRC);
sys_clksrc = au_readl(SYS_CLKSRC); sys_freqctrl = au_readl(SYS_FREQCTRL0);
sys_clksrc &= ~0x0000001F; sys_freqctrl &= ~0xFFF00000;
// FREQ2 = aux/2 = 48 MHz sys_clksrc = au_readl(SYS_CLKSRC);
sys_freqctrl |= ((0<<22) | (1<<21) | (1<<20)); sys_clksrc &= ~0x0000001F;
au_writel(sys_freqctrl, SYS_FREQCTRL0);
// FREQ2 = aux/2 = 48 MHz
/* sys_freqctrl |= ((0<<22) | (1<<21) | (1<<20));
* Route 48MHz FREQ2 into USBH/USBD/IrDA au_writel(sys_freqctrl, SYS_FREQCTRL0);
*/
sys_clksrc |= ((4<<2) | (0<<1) | 0 ); /*
au_writel(sys_clksrc, SYS_CLKSRC); * Route 48MHz FREQ2 into USBH/USBD/IrDA
*/
/* setup the static bus controller */ sys_clksrc |= ((4<<2) | (0<<1) | 0 );
au_writel(0x00000002, MEM_STCFG3); /* type = PCMCIA */ au_writel(sys_clksrc, SYS_CLKSRC);
au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */ /* setup the static bus controller */
au_writel(0x00000002, MEM_STCFG3); /* type = PCMCIA */
// get USB Functionality pin state (device vs host drive pins) au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000); au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
// 2nd USB port is USB host
pin_func |= 0x8000; // get USB Functionality pin state (device vs host drive pins)
au_writel(pin_func, SYS_PINFUNC); pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
// 2nd USB port is USB host
pin_func |= 0x8000;
au_writel(pin_func, SYS_PINFUNC);
}
#endif // defined (CONFIG_USB_OHCI) #endif // defined (CONFIG_USB_OHCI)
/* 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);
// Enable the RTC if not already enabled // Enable the RTC if not already enabled
if (!(readb(0xac000028) & 0x20)) { if (!(readb(base + 0x28) & 0x20)) {
writeb(readb(0xac000028) | 0x20, 0xac000028); writeb(readb(base + 0x28) | 0x20, base + 0x28);
au_sync(); au_sync();
} }
// Put the clock in BCD mode // Put the clock in BCD mode
if (readb(0xac00002C) & 0x4) { /* reg B */ if (readb(base + 0x2C) & 0x4) { /* reg B */
writeb(readb(0xac00002c) & ~0x4, 0xac00002c); writeb(readb(base + 0x2c) & ~0x4, base + 0x2c);
au_sync(); au_sync();
} }
} }
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