KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor cleanups

Browse source 
SVN-Revision: 12387
This commit is contained in:
Gabor Juhos 2008-08-25 07:28:04 +00:00
parent 1673462564
commit e8422131f1
16 changed files with 34 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.h
View file

@ -12,6 +12,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/irq.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
@ -19,7 +20,6 @@
#include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_info.h>
#include <asm/mach-adm5120/adm5120_board.h> #include <asm/mach-adm5120/adm5120_board.h>
#include <asm/mach-adm5120/adm5120_platform.h> #include <asm/mach-adm5120/adm5120_platform.h>
#include <asm/mach-adm5120/adm5120_irq.h>
extern void cellvision_mac_setup(void) __init; extern void cellvision_mac_setup(void) __init;

6
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c
View file

@ -12,6 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/string.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -19,7 +20,6 @@
#include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_info.h>
#include <asm/mach-adm5120/adm5120_defs.h> #include <asm/mach-adm5120/adm5120_defs.h>
#include <asm/mach-adm5120/adm5120_irq.h>
#include <asm/mach-adm5120/adm5120_board.h> #include <asm/mach-adm5120/adm5120_board.h>
#include <asm/mach-adm5120/adm5120_platform.h> #include <asm/mach-adm5120/adm5120_platform.h>
@ -60,9 +60,9 @@ static int __init adm5120_board_setup(void)
mips_machtype); mips_machtype);
if (board->name[0]) if (board->name[0])
memcpy(adm5120_board_name, board->name, ADM5120_BOARD_NAMELEN); strlcpy(adm5120_board_name, board->name, ADM5120_BOARD_NAMELEN);
printk(KERN_INFO PFX "board is '%s'\n", board->name); printk(KERN_INFO PFX "board is '%s'\n", adm5120_board_name);
adm5120_gpio_init(); adm5120_gpio_init();

4
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/gpio.c
View file

@ -13,17 +13,17 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/irq.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/gpio.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <linux/gpio.h>
#include <asm/mach-adm5120/adm5120_defs.h> #include <asm/mach-adm5120/adm5120_defs.h>
#include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_info.h>
#include <asm/mach-adm5120/adm5120_switch.h> #include <asm/mach-adm5120/adm5120_switch.h>
#include <asm/mach-adm5120/adm5120_irq.h>
#define GPIO_READ(r) __raw_readl((r)) #define GPIO_READ(r) __raw_readl((r))
#define GPIO_WRITE(v, r) __raw_writel((v), (r)) #define GPIO_WRITE(v, r) __raw_writel((v), (r))

5
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/irq.c
View file

@ -12,17 +12,16 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/mach-adm5120/adm5120_defs.h> #include <asm/mach-adm5120/adm5120_defs.h>
#include <asm/mach-adm5120/adm5120_irq.h>
static void adm5120_intc_irq_unmask(unsigned int irq); static void adm5120_intc_irq_unmask(unsigned int irq);
static void adm5120_intc_irq_mask(unsigned int irq); static void adm5120_intc_irq_mask(unsigned int irq);
@ -121,9 +120,7 @@ static void adm5120_intc_irq_dispatch(void)
unsigned long status; unsigned long status;
int irq; int irq;
/* dispatch only one IRQ at a time */
status = intc_read_reg(INTC_REG_IRQ_STATUS) & INTC_INT_ALL; status = intc_read_reg(INTC_REG_IRQ_STATUS) & INTC_INT_ALL;
if (status) { if (status) {
irq = ADM5120_INTC_IRQ_BASE + fls(status) - 1; irq = ADM5120_INTC_IRQ_BASE + fls(status) - 1;
do_IRQ(irq); do_IRQ(irq);

2
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/platform.c
View file

@ -16,12 +16,12 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/irq.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/mach-adm5120/adm5120_defs.h> #include <asm/mach-adm5120/adm5120_defs.h>
#include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_info.h>
#include <asm/mach-adm5120/adm5120_irq.h>
#include <asm/mach-adm5120/adm5120_switch.h> #include <asm/mach-adm5120/adm5120_switch.h>
#include <asm/mach-adm5120/adm5120_nand.h> #include <asm/mach-adm5120/adm5120_nand.h>
#include <asm/mach-adm5120/adm5120_platform.h> #include <asm/mach-adm5120/adm5120_platform.h>

5
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/prom.c
View file

@ -241,9 +241,7 @@ static void __init prom_init_cmdline(void)
/* init command line, register a default kernel command line */ /* init command line, register a default kernel command line */
cmd = &_image_cmdline + 8; cmd = &_image_cmdline + 8;
if (strlen(cmd) > 0) if (strlen(cmd) > 0)
strcpy(arcs_cmdline, cmd); strlcpy(arcs_cmdline, cmd, sizeof(arcs_cmdline));
else
strcpy(arcs_cmdline, CONFIG_CMDLINE);
} }
@ -262,7 +260,6 @@ void __init prom_putchar(char ch)
void __init prom_init(void) void __init prom_init(void)
{ {
prom_detect_machtype(); prom_detect_machtype();
prom_init_cmdline(); prom_init_cmdline();
} }

2
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/setup.c
View file

@ -69,7 +69,7 @@ static void adm5120_halt(void)
while (1) { while (1) {
if (cpu_wait) if (cpu_wait)
cpu_wait(); cpu_wait();
}; }
} }
void __init plat_time_init(void) void __init plat_time_init(void)

4
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c
View file

@ -34,8 +34,8 @@ void __init compex_mac_setup(void)
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
if (is_valid_ether_addr(myloader_info.macs[i])) if (is_valid_ether_addr(myloader_info.macs[i]))
memcpy(myloader_info.macs[i], memcpy(adm5120_eth_macs[i],
adm5120_eth_macs[i], ETH_ALEN); myloader_info.macs[i], ETH_ALEN);
else else
random_ether_addr(adm5120_eth_macs[i]); random_ether_addr(adm5120_eth_macs[i]);
} }

2
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.h
View file

@ -12,6 +12,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/irq.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
@ -19,6 +20,5 @@
#include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_info.h>
#include <asm/mach-adm5120/adm5120_board.h> #include <asm/mach-adm5120/adm5120_board.h>
#include <asm/mach-adm5120/adm5120_platform.h> #include <asm/mach-adm5120/adm5120_platform.h>
#include <asm/mach-adm5120/adm5120_irq.h>
extern void compex_generic_setup(void) __init; extern void compex_generic_setup(void) __init;

2
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.h
View file

@ -12,12 +12,12 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/irq.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/mach-adm5120/adm5120_board.h> #include <asm/mach-adm5120/adm5120_board.h>
#include <asm/mach-adm5120/adm5120_irq.h>
#include <asm/mach-adm5120/adm5120_platform.h> #include <asm/mach-adm5120/adm5120_platform.h>
extern void __init br61xx_generic_setup(void) __init; extern void __init br61xx_generic_setup(void) __init;

2
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.h
View file

@ -12,12 +12,12 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/irq.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/mach-adm5120/adm5120_defs.h> #include <asm/mach-adm5120/adm5120_defs.h>
#include <asm/mach-adm5120/adm5120_irq.h>
#include <asm/mach-adm5120/adm5120_board.h> #include <asm/mach-adm5120/adm5120_board.h>
#include <asm/mach-adm5120/adm5120_platform.h> #include <asm/mach-adm5120/adm5120_platform.h>
#include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_info.h>

2
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.h
View file

@ -13,12 +13,12 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/irq.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/mach-adm5120/adm5120_defs.h> #include <asm/mach-adm5120/adm5120_defs.h>
#include <asm/mach-adm5120/adm5120_irq.h>
#include <asm/mach-adm5120/adm5120_nand.h> #include <asm/mach-adm5120/adm5120_nand.h>
#include <asm/mach-adm5120/adm5120_board.h> #include <asm/mach-adm5120/adm5120_board.h>
#include <asm/mach-adm5120/adm5120_platform.h> #include <asm/mach-adm5120/adm5120_platform.h>

2
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.h
View file

@ -12,11 +12,11 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/irq.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/mach-adm5120/adm5120_board.h> #include <asm/mach-adm5120/adm5120_board.h>
#include <asm/mach-adm5120/adm5120_platform.h> #include <asm/mach-adm5120/adm5120_platform.h>
#include <asm/mach-adm5120/adm5120_irq.h>
extern void p33x_generic_setup(void) __init; extern void p33x_generic_setup(void) __init;

6
target/linux/adm5120/files-2.6.26/drivers/net/adm5120sw.c
View file

@ -24,19 +24,17 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_info.h>
#include <asm/mach-adm5120/adm5120_defs.h> #include <asm/mach-adm5120/adm5120_defs.h>
#include <asm/mach-adm5120/adm5120_irq.h>
#include <asm/mach-adm5120/adm5120_switch.h> #include <asm/mach-adm5120/adm5120_switch.h>
#include "adm5120sw.h" #include "adm5120sw.h"

4
target/linux/adm5120/files-2.6.26/drivers/watchdog/adm5120_wdt.c
View file

@ -12,21 +12,19 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
* *
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/irq.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_info.h>
#include <asm/mach-adm5120/adm5120_defs.h> #include <asm/mach-adm5120/adm5120_defs.h>
#include <asm/mach-adm5120/adm5120_irq.h>
#include <asm/mach-adm5120/adm5120_switch.h> #include <asm/mach-adm5120/adm5120_switch.h>
#define DEFAULT_TIMEOUT 15 /* (secs) Default is 15 seconds */ #define DEFAULT_TIMEOUT 15 /* (secs) Default is 15 seconds */
#define MAX_TIMEOUT 327 #define MAX_TIMEOUT 327
/* Max is 327 seconds, counter is 15-bit integer, step is 10 ms */ /* Max is 327 seconds, counter is 15-bit integer, step is 10 ms */

26
target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_irq.h → target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/irq.h
View file

@ -8,24 +8,26 @@
* by the Free Software Foundation. * by the Free Software Foundation.
* *
*/ */
#ifndef _MACH_ADM5120_IRQ_H #ifndef _ASM_MIPS_MACH_ADM5120_IRQ_H
#define _MACH_ADM5120_IRQ_H #define _ASM_MIPS_MACH_ADM5120_IRQ_H
#define MIPS_CPU_IRQ_BASE 0
#define NR_IRQS 24
#include_next <irq.h>
#include <asm/mach-adm5120/adm5120_intc.h> #include <asm/mach-adm5120/adm5120_intc.h>
#define MIPS_IRQ_HW0 2 #define NO_IRQ (-1)
#define MIPS_IRQ_COUNTER 7
#define MIPS_IRQ_COUNT 8
#define ADM5120_CPU_IRQ_BASE 0 #define MIPS_CPU_IRQ_COUNT 8
#define ADM5120_INTC_IRQ_BASE (ADM5120_CPU_IRQ_BASE + MIPS_IRQ_COUNT) #define MIPS_CPU_IRQ(x) (MIPS_CPU_IRQ_BASE + (x))
#define ADM5120_SWITCH_IRQ_BASE (ADM5120_INTC_IRQ_BASE + INTC_IRQ_COUNT)
#define ADM5120_CPU_IRQ(x) (ADM5120_CPU_IRQ_BASE + (x)) #define ADM5120_INTC_IRQ_BASE (MIPS_CPU_IRQ_BASE + MIPS_CPU_IRQ_COUNT)
#define ADM5120_INTC_IRQ(x) (ADM5120_INTC_IRQ_BASE + (x)) #define ADM5120_INTC_IRQ(x) (ADM5120_INTC_IRQ_BASE + (x))
#define ADM5120_IRQ_INTC ADM5120_CPU_IRQ(MIPS_IRQ_HW0) #define ADM5120_IRQ_INTC MIPS_CPU_IRQ(2)
#define ADM5120_IRQ_COUNTER ADM5120_CPU_IRQ(MIPS_IRQ_COUNTER) #define ADM5120_IRQ_COUNTER MIPS_CPU_IRQ(7)
#define ADM5120_IRQ_TIMER ADM5120_INTC_IRQ(INTC_IRQ_TIMER) #define ADM5120_IRQ_TIMER ADM5120_INTC_IRQ(INTC_IRQ_TIMER)
#define ADM5120_IRQ_UART0 ADM5120_INTC_IRQ(INTC_IRQ_UART0) #define ADM5120_IRQ_UART0 ADM5120_INTC_IRQ(INTC_IRQ_UART0)
@ -38,4 +40,4 @@
#define ADM5120_IRQ_PCI2 ADM5120_INTC_IRQ(INTC_IRQ_PCI2) #define ADM5120_IRQ_PCI2 ADM5120_INTC_IRQ(INTC_IRQ_PCI2)
#define ADM5120_IRQ_SWITCH ADM5120_INTC_IRQ(INTC_IRQ_SWITCH) #define ADM5120_IRQ_SWITCH ADM5120_INTC_IRQ(INTC_IRQ_SWITCH)
#endif /* _MACH_ADM5120_IRQ_H */ #endif /* _ASM_MIPS_MACH_ADM5120_IRQ_H */