diff options
author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-08 22:24:49 +0000 |
---|---|---|
committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-08 22:24:49 +0000 |
commit | 9d03573661b506cccf95810176c2a1c0a23ad399 (patch) | |
tree | e263c035214c31d62f8665c339ba16b257c4667c /target/linux/ifxmips/files | |
parent | 3da392ac87a80a47131c4c8e28796e9a7281cfc7 (diff) |
ifxmips: move header files, split up patches, rename some files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18010 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/files')
29 files changed, 59 insertions, 58 deletions
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig b/target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig index 621020f83..549ffe2bb 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig @@ -6,18 +6,6 @@ config MTD_IFXMIPS bool "IFXMips flash map" default y -config IFXMIPS_SSC - bool "IFXMips ssc" - default y - -config IFXMIPS_EEPROM - bool "IFXMips eeprom" - default y - -config IFXMIPS_MEI - bool "IFXMips mei" - default y - config IFXMIPS_GPIO_RST_BTN bool "Reset Button" default y diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile b/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile index a2cc69dc3..9710645b9 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile @@ -1 +1 @@ -obj-y := reset.o prom.o setup.o interrupt.o dma-core.o pmu.o board.o clock.o gpio.o +obj-y := reset.o prom.o setup.o irq.o dma-core.o pmu.o board.o clock.o gpio.o diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/board.c b/target/linux/ifxmips/files/arch/mips/ifxmips/board.c index 364d33baa..7d77e9ce6 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/board.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/board.c @@ -31,10 +31,12 @@ #include <linux/time.h> #include <linux/io.h> #include <linux/gpio.h> + #include <asm/bootinfo.h> #include <asm/irq.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_irq.h> + +#include <ifxmips.h> +#include <ifxmips_irq.h> #define MAX_BOARD_NAME_LEN 32 #define MAX_IFXMIPS_DEVS 9 diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/clock.c b/target/linux/ifxmips/files/arch/mips/ifxmips/clock.c index a8d198479..d951be8f4 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/clock.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/clock.c @@ -26,11 +26,13 @@ #include <linux/init.h> #include <linux/uaccess.h> #include <linux/unistd.h> +#include <linux/errno.h> + #include <asm/irq.h> #include <asm/div64.h> -#include <linux/errno.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/mach-ifxmips/cgu.h> + +#include <ifxmips.h> +#include <ifxmips_cgu.h> static unsigned int cgu_get_pll0_fdiv(void); unsigned int ifxmips_clocks[] = {CLOCK_167M, CLOCK_133M, CLOCK_111M, CLOCK_83M }; diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c b/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c index 5271e6be4..084b2839a 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c @@ -19,10 +19,10 @@ #include <linux/errno.h> #include <linux/io.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_irq.h> -#include <asm/ifxmips/ifxmips_dma.h> -#include <asm/ifxmips/ifxmips_pmu.h> +#include <ifxmips.h> +#include <ifxmips_irq.h> +#include <ifxmips_dma.h> +#include <ifxmips_pmu.h> /*25 descriptors for each dma channel,4096/8/20=25.xx*/ #define IFXMIPS_DMA_DESCRIPTOR_OFFSET 25 diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c index 2100ebb4c..3ef5100ab 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c @@ -34,10 +34,12 @@ #include <linux/skbuff.h> #include <linux/netlink.h> #include <linux/platform_device.h> -#include <net/sock.h> #include <linux/uaccess.h> #include <linux/semaphore.h> -#include <asm/ifxmips/ifxmips.h> + +#include <net/sock.h> + +#include <ifxmips.h> #define MAX_PORTS 2 #define PINS_PER_PORT 16 diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/interrupt.c b/target/linux/ifxmips/files/arch/mips/ifxmips/irq.c index 0552a1332..b7326c72d 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/interrupt.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/irq.c @@ -26,10 +26,11 @@ #include <asm/bootinfo.h> #include <asm/irq.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_irq.h> #include <asm/irq_cpu.h> +#include <ifxmips.h> +#include <ifxmips_irq.h> + void ifxmips_disable_irq(unsigned int irq_nr) { int i; diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c b/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c index d78ed4d08..29d710451 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c @@ -22,7 +22,8 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/version.h> -#include <asm/ifxmips/ifxmips.h> + +#include <ifxmips.h> void ifxmips_pmu_enable(unsigned int module) { diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c index 1a27f1a96..ef5a68a81 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c @@ -20,8 +20,10 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/bootmem.h> + #include <asm/bootinfo.h> -#include <asm/ifxmips/ifxmips.h> + +#include <ifxmips.h> static char buf[1024]; /* for prom_printf() */ diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c b/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c index 0446b9747..c3119bce7 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c @@ -19,9 +19,10 @@ #include <linux/kernel.h> #include <linux/pm.h> #include <linux/io.h> + #include <asm/reboot.h> #include <asm/system.h> -#include <asm/ifxmips/ifxmips.h> +#include <ifxmips.h> static void ifxmips_machine_restart(char *command) { diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c b/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c index 2ba0592f6..06fa2f0b4 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c @@ -18,8 +18,6 @@ */ #include <linux/init.h> - - #include <linux/cpu.h> #include <asm/time.h> @@ -27,11 +25,11 @@ #include <asm/irq.h> #include <asm/bootinfo.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_irq.h> -#include <asm/ifxmips/ifxmips_pmu.h> -#include <asm/mach-ifxmips/cgu.h> -#include <asm/ifxmips/ifxmips_prom.h> +#include <ifxmips.h> +#include <ifxmips_irq.h> +#include <ifxmips_pmu.h> +#include <ifxmips_cgu.h> +#include <ifxmips_prom.h> static unsigned int r4k_offset; static unsigned int r4k_cur; diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/gpio.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/gpio.h index fa70ebcac..6f05e38ea 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/gpio.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/gpio.h @@ -22,8 +22,8 @@ #ifndef _IFXMIPS_GPIO_H_ #define _IFXMIPS_GPIO_H_ -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_gpio.h> +#include <ifxmips.h> +#include <ifxmips_gpio.h> #define GPIO_TO_PORT(x) ((x > 15) ? (1) : (0)) #define GPIO_TO_GPIO(x) ((x > 15) ? (x-16) : (x)) diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips.h index c8cf0aef5..c8cf0aef5 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips.h diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/cgu.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_cgu.h index 9ee287b42..9ee287b42 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/cgu.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_cgu.h diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_dma.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_dma.h index 8ba852a1e..8ba852a1e 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_dma.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_dma.h diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_ebu.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_ebu.h index 4c9396ae8..4c9396ae8 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_ebu.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_ebu.h diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_gpio.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_gpio.h index a4c8c3ffb..a4c8c3ffb 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_gpio.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_gpio.h diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_gptu.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_gptu.h index 330c3cfd5..330c3cfd5 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_gptu.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_gptu.h diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_irq.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h index f84fdcb12..f84fdcb12 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_irq.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_led.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_led.h index c97657a89..c97657a89 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_led.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_led.h diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_pmu.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_pmu.h index dd1f0d6f1..dd1f0d6f1 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_pmu.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_pmu.h diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_prom.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_prom.h index e640ad7ac..e640ad7ac 100644 --- a/target/linux/ifxmips/files/arch/mips/include/asm/ifxmips/ifxmips_prom.h +++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_prom.h diff --git a/target/linux/ifxmips/files/arch/mips/pci/ops-ifxmips.c b/target/linux/ifxmips/files/arch/mips/pci/ops-ifxmips.c index e04c246ea..fde6357e4 100644 --- a/target/linux/ifxmips/files/arch/mips/pci/ops-ifxmips.c +++ b/target/linux/ifxmips/files/arch/mips/pci/ops-ifxmips.c @@ -4,11 +4,11 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/mm.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_irq.h> #include <asm/addrspace.h> #include <linux/vmalloc.h> -#include <asm/ifxmips/ifxmips_ebu.h> +#include <ifxmips.h> +#include <ifxmips_irq.h> +#include <ifxmips_ebu.h> #define IFXMIPS_PCI_CFG_BUSNUM_SHF 16 #define IFXMIPS_PCI_CFG_DEVNUM_SHF 11 diff --git a/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c b/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c index 47bb1e612..e50cb3bdc 100644 --- a/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c +++ b/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c @@ -4,11 +4,11 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/mm.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_irq.h> -#include <asm/mach-ifxmips/cgu.h> #include <asm/addrspace.h> #include <linux/vmalloc.h> +#include <ifxmips.h> +#include <ifxmips_irq.h> +#include <ifxmips_cgu.h> #define IFXMIPS_PCI_MEM_BASE 0x18000000 #define IFXMIPS_PCI_MEM_SIZE 0x02000000 @@ -49,6 +49,8 @@ static struct pci_controller ifxmips_pci_controller = .io_offset = 0x00000000UL, }; +/* the cpu can can generate the 33Mhz or rely on an external clock the cgu needs the + proper setting, otherwise the cpu hangs. we have no way of runtime detecting this */ u32 ifxmips_pci_mapped_cfg; int ifxmips_pci_external_clock = 0; diff --git a/target/linux/ifxmips/files/drivers/leds/leds-ifxmips.c b/target/linux/ifxmips/files/drivers/leds/leds-ifxmips.c index 86116d654..3123d8218 100644 --- a/target/linux/ifxmips/files/drivers/leds/leds-ifxmips.c +++ b/target/linux/ifxmips/files/drivers/leds/leds-ifxmips.c @@ -31,9 +31,9 @@ #include <linux/leds.h> #include <linux/delay.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_gpio.h> -#include <asm/ifxmips/ifxmips_pmu.h> +#include <ifxmips.h> +#include <ifxmips_gpio.h> +#include <ifxmips_pmu.h> #define DRVNAME "ifxmips_led" diff --git a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c index 6498d12cb..3a3569ac8 100644 --- a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c +++ b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c @@ -29,9 +29,9 @@ #include <linux/magic.h> #include <linux/platform_device.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_prom.h> -#include <asm/ifxmips/ifxmips_ebu.h> +#include <ifxmips.h> +#include <ifxmips_prom.h> +#include <ifxmips_ebu.h> #ifndef CONFIG_MTD_PARTITIONS #error Please enable CONFIG_MTD_PARTITIONS @@ -244,7 +244,7 @@ static int ifxmips_mtd_probe(struct platform_device *dev) add_mtd_partitions(ifxmips_mtd, &ifxmips_meta_partition, 1); printk(KERN_INFO "ifxmips_mtd: added %s flash with %dMB\n", - ifxmips_map.name, ifxmips_mtd->size >> 20); + ifxmips_map.name, ifxmips_mtd->size); return 0; } diff --git a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c index 43fe73551..9af0e385a 100644 --- a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c +++ b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c @@ -34,10 +34,12 @@ #include <linux/ethtool.h> #include <linux/init.h> #include <linux/delay.h> + #include <asm/checksum.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_dma.h> -#include <asm/ifxmips/ifxmips_pmu.h> + +#include <ifxmips.h> +#include <ifxmips_dma.h> +#include <ifxmips_pmu.h> struct ifxmips_mii_priv { struct net_device_stats stats; diff --git a/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c b/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c index d6bf1803f..55bf41ada 100644 --- a/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c +++ b/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c @@ -48,8 +48,8 @@ #include <asm/system.h> -#include <asm/ifxmips/ifxmips.h> -#include <asm/ifxmips/ifxmips_irq.h> +#include <ifxmips.h> +#include <ifxmips_irq.h> #define PORT_IFXMIPSASC 111 diff --git a/target/linux/ifxmips/files/drivers/watchdog/ifxmips_wdt.c b/target/linux/ifxmips/files/drivers/watchdog/ifxmips_wdt.c index d75eeeac2..b06307cb7 100644 --- a/target/linux/ifxmips/files/drivers/watchdog/ifxmips_wdt.c +++ b/target/linux/ifxmips/files/drivers/watchdog/ifxmips_wdt.c @@ -25,8 +25,8 @@ #include <linux/platform_device.h> #include <linux/uaccess.h> -#include <asm/mach-ifxmips/cgu.h> -#include <asm/ifxmips/ifxmips.h> +#include <ifxmips.h> +#include <ifxmips_cgu.h> #define IFXMIPS_WDT_PW1 0x00BE0000 #define IFXMIPS_WDT_PW2 0x00DC0000 |