[MIPS] XXS1500 code style cleanup
Fix several errors and warnings given by checkpatch.pl: - use of C99 // comments; - using simple_strtol() where strict_strtol() could be used. In addition to these changes, also do the following: - remove needless parentheses; - remove unneeded numeric literal type cast; - insert spaces between operator and its operands; - remove excess new lines; - remove space after the type cast's closing parenthesis; - insert missing space before closing brace in the structure initializer; - fix typos, capitalize acronyms, etc. in the comments; - update MontaVista copyright; - remove Pete Popov's old email address... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
1ff1a78cbb
commit
7ff83f21d2
arch/mips/au1000/xxs1500
|
@ -1,7 +1,6 @@
|
|||
#
|
||||
# Copyright 2003 MontaVista Software Inc.
|
||||
# Author: MontaVista Software, Inc.
|
||||
# ppopov@mvista.com or source@mvista.com
|
||||
# Author: MontaVista Software, Inc. <source@mvista.com>
|
||||
#
|
||||
# Makefile for MyCable XXS1500 board.
|
||||
#
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
/*
|
||||
* Copyright 2000-2003 MontaVista Software Inc.
|
||||
* Author: MontaVista Software, Inc.
|
||||
* ppopov@mvista.com or source@mvista.com
|
||||
* Copyright 2000-2003, 2008 MontaVista Software Inc.
|
||||
* Author: MontaVista Software, Inc. <source@mvista.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
|
@ -39,40 +38,40 @@ void __init board_setup(void)
|
|||
{
|
||||
u32 pin_func;
|
||||
|
||||
// set multiple use pins (UART3/GPIO) to UART (it's used as UART too)
|
||||
pin_func = au_readl(SYS_PINFUNC) & (u32)(~SYS_PF_UR3);
|
||||
/* Set multiple use pins (UART3/GPIO) to UART (it's used as UART too) */
|
||||
pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_UR3;
|
||||
pin_func |= SYS_PF_UR3;
|
||||
au_writel(pin_func, SYS_PINFUNC);
|
||||
|
||||
// enable UART
|
||||
au_writel(0x01, UART3_ADDR+UART_MOD_CNTRL); // clock enable (CE)
|
||||
/* Enable UART */
|
||||
au_writel(0x01, UART3_ADDR + UART_MOD_CNTRL); /* clock enable (CE) */
|
||||
mdelay(10);
|
||||
au_writel(0x03, UART3_ADDR+UART_MOD_CNTRL); // CE and "enable"
|
||||
au_writel(0x03, UART3_ADDR + UART_MOD_CNTRL); /* CE and "enable" */
|
||||
mdelay(10);
|
||||
|
||||
// enable DTR = USB power up
|
||||
au_writel(0x01, UART3_ADDR+UART_MCR); //? UART_MCR_DTR is 0x01???
|
||||
/* Enable DTR = USB power up */
|
||||
au_writel(0x01, UART3_ADDR + UART_MCR); /* UART_MCR_DTR is 0x01??? */
|
||||
|
||||
#ifdef CONFIG_PCMCIA_XXS1500
|
||||
/* setup pcmcia signals */
|
||||
/* Setup PCMCIA signals */
|
||||
au_writel(0, SYS_PININPUTEN);
|
||||
|
||||
/* gpio 0, 1, and 4 are inputs */
|
||||
au_writel(1 | (1<<1) | (1<<4), SYS_TRIOUTCLR);
|
||||
/* GPIO 0, 1, and 4 are inputs */
|
||||
au_writel(1 | (1 << 1) | (1 << 4), SYS_TRIOUTCLR);
|
||||
|
||||
/* enable GPIO2 if not already enabled */
|
||||
/* Enable GPIO2 if not already enabled */
|
||||
au_writel(1, GPIO2_ENABLE);
|
||||
/* gpio2 208/9/10/11 are inputs */
|
||||
au_writel((1<<8) | (1<<9) | (1<<10) | (1<<11), GPIO2_DIR);
|
||||
/* GPIO2 208/9/10/11 are inputs */
|
||||
au_writel((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11), GPIO2_DIR);
|
||||
|
||||
/* turn off power */
|
||||
au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<14))|(1<<30), GPIO2_OUTPUT);
|
||||
/* Turn off power */
|
||||
au_writel((au_readl(GPIO2_PINSTATE) & ~(1 << 14)) | (1 << 30),
|
||||
GPIO2_OUTPUT);
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
#if defined(__MIPSEB__)
|
||||
au_writel(0xf | (2<<6) | (1<<4), Au1500_PCI_CFG);
|
||||
au_writel(0xf | (2 << 6) | (1 << 4), Au1500_PCI_CFG);
|
||||
#else
|
||||
au_writel(0xf, Au1500_PCI_CFG);
|
||||
#endif
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
* BRIEF MODULE DESCRIPTION
|
||||
* XXS1500 board setup
|
||||
*
|
||||
* Copyright 2003 MontaVista Software Inc.
|
||||
* Author: MontaVista Software, Inc.
|
||||
* ppopov@mvista.com or source@mvista.com
|
||||
* Copyright 2003, 2008 MontaVista Software Inc.
|
||||
* Author: MontaVista Software, Inc. <source@mvista.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
|
@ -45,8 +44,8 @@ void __init prom_init(void)
|
|||
unsigned long memsize;
|
||||
|
||||
prom_argc = fw_arg0;
|
||||
prom_argv = (char **) fw_arg1;
|
||||
prom_envp = (char **) fw_arg2;
|
||||
prom_argv = (char **)fw_arg1;
|
||||
prom_envp = (char **)fw_arg2;
|
||||
|
||||
prom_init_cmdline();
|
||||
|
||||
|
@ -54,6 +53,6 @@ void __init prom_init(void)
|
|||
if (!memsize_str)
|
||||
memsize = 0x04000000;
|
||||
else
|
||||
memsize = simple_strtol(memsize_str, NULL, 0);
|
||||
memsize = strict_strtol(memsize_str, 0, NULL);
|
||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <asm/mach-au1x00/au1000.h>
|
||||
|
||||
struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
|
||||
{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
|
||||
{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0 },
|
||||
{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
|
||||
{ AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
|
||||
{ AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 },
|
||||
|
|
Loading…
Reference in New Issue