ARM platform spring cleaning
Subsystems (5)
cover ARM platform spring cleaning
We have discussed cleaning these up before, but we never actually removed them. For all I can tell, none of these have any users in the upstream kernel, so they can be removed. If you know of anyone using them, please yell now, or send a revert patch later if you really want them back.
Arnd Bergmann (6):
ARM: gemini: get platform to build again
ARM: gemini: remove platform support
ARM: remove fa526 CPU support
ARM: l7200: remove zombie file
ARM: kill Hynix h720x platform
mtd: remove h720x flash support
MAINTAINERS | 14 -- arch/arm/Kconfig | 22 +- arch/arm/Makefile | 3 - arch/arm/boot/compressed/head.S | 28 --- arch/arm/configs/h7201_defconfig | 27 --- arch/arm/configs/h7202_defconfig | 47 ---- arch/arm/include/asm/barrier.h | 6 - arch/arm/include/asm/glue-cache.h | 8 - arch/arm/include/asm/glue-proc.h | 9 - arch/arm/include/asm/page.h | 8 - arch/arm/include/asm/tlbflush.h | 19 -- arch/arm/mach-gemini/Kconfig | 40 ---- arch/arm/mach-gemini/Makefile | 13 -- arch/arm/mach-gemini/Makefile.boot | 9 - arch/arm/mach-gemini/board-nas4220b.c | 106 --------- arch/arm/mach-gemini/board-rut1xx.c | 90 -------- arch/arm/mach-gemini/board-wbd111.c | 133 ------------ arch/arm/mach-gemini/board-wbd222.c | 133 ------------ arch/arm/mach-gemini/common.h | 29 --- arch/arm/mach-gemini/devices.c | 118 ---------- arch/arm/mach-gemini/gpio.c | 230 -------------------- arch/arm/mach-gemini/idle.c | 29 --- arch/arm/mach-gemini/include/mach/debug-macro.S | 21 -- arch/arm/mach-gemini/include/mach/entry-macro.S | 33 --- arch/arm/mach-gemini/include/mach/global_reg.h | 278 ------------------------ arch/arm/mach-gemini/include/mach/gpio.h | 20 -- arch/arm/mach-gemini/include/mach/hardware.h | 74 ------- arch/arm/mach-gemini/include/mach/irqs.h | 53 ----- arch/arm/mach-gemini/include/mach/system.h | 23 -- arch/arm/mach-gemini/include/mach/timex.h | 13 -- arch/arm/mach-gemini/include/mach/uncompress.h | 42 ---- arch/arm/mach-gemini/irq.c | 103 --------- arch/arm/mach-gemini/mm.c | 82 ------- arch/arm/mach-gemini/time.c | 89 -------- arch/arm/mach-h720x/Kconfig | 40 ---- arch/arm/mach-h720x/Makefile | 16 -- arch/arm/mach-h720x/Makefile.boot | 2 - arch/arm/mach-h720x/common.c | 268 ----------------------- arch/arm/mach-h720x/common.h | 30 --- arch/arm/mach-h720x/cpu-h7201.c | 57 ----- arch/arm/mach-h720x/cpu-h7202.c | 225 ------------------- arch/arm/mach-h720x/h7201-eval.c | 38 ---- arch/arm/mach-h720x/h7202-eval.c | 81 ------- arch/arm/mach-h720x/include/mach/boards.h | 53 ----- arch/arm/mach-h720x/include/mach/debug-macro.S | 40 ---- arch/arm/mach-h720x/include/mach/entry-macro.S | 57 ----- arch/arm/mach-h720x/include/mach/h7201-regs.h | 67 ------ arch/arm/mach-h720x/include/mach/h7202-regs.h | 155 ------------- arch/arm/mach-h720x/include/mach/hardware.h | 190 ---------------- arch/arm/mach-h720x/include/mach/irqs.h | 116 ---------- arch/arm/mach-h720x/include/mach/isa-dma.h | 19 -- arch/arm/mach-h720x/include/mach/timex.h | 15 -- arch/arm/mach-h720x/include/mach/uncompress.h | 36 --- arch/arm/mach-l7200/include/mach/debug-macro.S | 38 ---- arch/arm/mm/Kconfig | 32 +-- arch/arm/mm/Makefile | 4 - arch/arm/mm/cache-fa.S | 249 --------------------- arch/arm/mm/copypage-fa.c | 86 -------- arch/arm/mm/proc-fa526.S | 221 ------------------- arch/arm/mm/tlb-fa.S | 69 ------ drivers/mtd/maps/Kconfig | 7 - drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/h720x-flash.c | 120 ---------- 63 files changed, 3 insertions(+), 4281 deletions(-) delete mode 100644 arch/arm/configs/h7201_defconfig delete mode 100644 arch/arm/configs/h7202_defconfig delete mode 100644 arch/arm/mach-gemini/Kconfig delete mode 100644 arch/arm/mach-gemini/Makefile delete mode 100644 arch/arm/mach-gemini/Makefile.boot delete mode 100644 arch/arm/mach-gemini/board-nas4220b.c delete mode 100644 arch/arm/mach-gemini/board-rut1xx.c delete mode 100644 arch/arm/mach-gemini/board-wbd111.c delete mode 100644 arch/arm/mach-gemini/board-wbd222.c delete mode 100644 arch/arm/mach-gemini/common.h delete mode 100644 arch/arm/mach-gemini/devices.c delete mode 100644 arch/arm/mach-gemini/gpio.c delete mode 100644 arch/arm/mach-gemini/idle.c delete mode 100644 arch/arm/mach-gemini/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-gemini/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-gemini/include/mach/global_reg.h delete mode 100644 arch/arm/mach-gemini/include/mach/gpio.h delete mode 100644 arch/arm/mach-gemini/include/mach/hardware.h delete mode 100644 arch/arm/mach-gemini/include/mach/irqs.h delete mode 100644 arch/arm/mach-gemini/include/mach/system.h delete mode 100644 arch/arm/mach-gemini/include/mach/timex.h delete mode 100644 arch/arm/mach-gemini/include/mach/uncompress.h delete mode 100644 arch/arm/mach-gemini/irq.c delete mode 100644 arch/arm/mach-gemini/mm.c delete mode 100644 arch/arm/mach-gemini/time.c delete mode 100644 arch/arm/mach-h720x/Kconfig delete mode 100644 arch/arm/mach-h720x/Makefile delete mode 100644 arch/arm/mach-h720x/Makefile.boot delete mode 100644 arch/arm/mach-h720x/common.c delete mode 100644 arch/arm/mach-h720x/common.h delete mode 100644 arch/arm/mach-h720x/cpu-h7201.c delete mode 100644 arch/arm/mach-h720x/cpu-h7202.c delete mode 100644 arch/arm/mach-h720x/h7201-eval.c delete mode 100644 arch/arm/mach-h720x/h7202-eval.c delete mode 100644 arch/arm/mach-h720x/include/mach/boards.h delete mode 100644 arch/arm/mach-h720x/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/h7201-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/h7202-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/hardware.h delete mode 100644 arch/arm/mach-h720x/include/mach/irqs.h delete mode 100644 arch/arm/mach-h720x/include/mach/isa-dma.h delete mode 100644 arch/arm/mach-h720x/include/mach/timex.h delete mode 100644 arch/arm/mach-h720x/include/mach/uncompress.h delete mode 100644 arch/arm/mach-l7200/include/mach/debug-macro.S delete mode 100644 arch/arm/mm/cache-fa.S delete mode 100644 arch/arm/mm/copypage-fa.c delete mode 100644 arch/arm/mm/proc-fa526.S delete mode 100644 arch/arm/mm/tlb-fa.S delete mode 100644 drivers/mtd/maps/h720x-flash.c
Signature · 1 line
1.8.1.2
PATCH 1/6 ARM: gemini: get platform to build again
There is no defconfig file for gemini, which has lead to a lot of bitrot. This makes the broken board files, the gpio implementation and the reset logic work again, and fixes the build warnings that got introduced with the changes to the readl/writel prototypes.
---
arch/arm/Kconfig | 1 +
arch/arm/mach-gemini/Makefile | 2 +-
arch/arm/mach-gemini/board-nas4220b.c | 1 +
arch/arm/mach-gemini/board-rut1xx.c | 2 ++
arch/arm/mach-gemini/board-wbd111.c | 1 +
arch/arm/mach-gemini/board-wbd222.c | 1 +
arch/arm/mach-gemini/common.h | 2 ++
arch/arm/mach-gemini/gpio.c | 19 ++++++++++---------
arch/arm/mach-gemini/include/mach/hardware.h | 2 +-
arch/arm/mach-gemini/irq.c | 4 ++--
arch/arm/mach-gemini/mm.c | 22 +++++++++++-----------
.../mach-gemini/{include/mach/system.h => reset.c} | 2 +-
12 files changed, 34 insertions(+), 25 deletions(-)
rename arch/arm/mach-gemini/{include/mach/system.h => reset.c} (91%)arch/arm/Kconfig +1 -0
@@ -411,6 +411,7 @@ config ARCH_GEMINI bool "Cortina Systems Gemini" select ARCH_REQUIRE_GPIOLIB select ARCH_USES_GETTIMEOFFSET + select NEED_MACH_GPIO_H select CPU_FA526 help Support for the Cortina Systems Gemini family SoCs
arch/arm/mach-gemini/Makefile +1 -1
@@ -4,7 +4,7 @@ # Object file lists. -obj-y := irq.o mm.o time.o devices.o gpio.o idle.o +obj-y := irq.o mm.o time.o devices.o gpio.o idle.o reset.o # Board-specific support obj-$(CONFIG_MACH_NAS4220B) += board-nas4220b.o
arch/arm/mach-gemini/board-nas4220b.c +1 -0
@@ -103,4 +103,5 @@ MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B") .init_irq = gemini_init_irq, .init_time = gemini_timer_init, .init_machine = ib4220b_init, + .restart = gemini_restart,MACHINE_END
arch/arm/mach-gemini/board-rut1xx.c +2 -0
@@ -14,6 +14,7 @@#include <linux/leds.h> #include <linux/input.h> #include <linux/gpio_keys.h> +#include <linux/sizes.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -87,4 +88,5 @@ MACHINE_START(RUT100, "Teltonika RUT100") .init_irq = gemini_init_irq, .init_time = gemini_timer_init, .init_machine = rut1xx_init, + .restart = gemini_restart,MACHINE_END
arch/arm/mach-gemini/board-wbd111.c +1 -0
@@ -130,4 +130,5 @@ MACHINE_START(WBD111, "Wiliboard WBD-111") .init_irq = gemini_init_irq, .init_time = gemini_timer_init, .init_machine = wbd111_init, + .restart = gemini_restart,MACHINE_END
arch/arm/mach-gemini/board-wbd222.c +1 -0
@@ -130,4 +130,5 @@ MACHINE_START(WBD222, "Wiliboard WBD-222") .init_irq = gemini_init_irq, .init_time = gemini_timer_init, .init_machine = wbd222_init, + .restart = gemini_restart,MACHINE_END
arch/arm/mach-gemini/common.h +2 -0
@@ -26,4 +26,6 @@ extern int platform_register_pflash(unsigned int size,struct mtd_partition *parts, unsigned int nr_parts); +extern void gemini_restart (char mode,const char *cmd); +#endif /* __GEMINI_COMMON_H__ */
arch/arm/mach-gemini/gpio.c +10 -9
@@ -21,6 +21,7 @@#include <mach/hardware.h> #include <mach/irqs.h> +#include <mach/gpio.h> #define GPIO_BASE (x) IO_ADDRESS(GEMINI_GPIO_BASE(x))
@@ -44,7 +45,7 @@#define GPIO_PORT_NUM 3 -static void _set_gpio_irqenable (unsigned int base,unsigned int index, +static void _set_gpio_irqenable (void __iomem *base,unsigned int index,int enable) {unsigned int reg;
@@ -57,7 +58,7 @@ static void _set_gpio_irqenable(unsigned int base, unsigned int index,static void gpio_ack_irq (struct irq_data *d) {unsigned int gpio =irq_to_gpio (d->irq); -unsigned int base =GPIO_BASE (gpio /32 ); +void __iomem *base =GPIO_BASE (gpio /32 );__raw_writel (1 << (gpio %32 ), base +GPIO_INT_CLR ); }
@@ -65,7 +66,7 @@ static void gpio_ack_irq(struct irq_data *d)static void gpio_mask_irq (struct irq_data *d) {unsigned int gpio =irq_to_gpio (d->irq); -unsigned int base =GPIO_BASE (gpio /32 ); +void __iomem *base =GPIO_BASE (gpio /32 );_set_gpio_irqenable (base, gpio %32 ,0 ); }
@@ -73,7 +74,7 @@ static void gpio_mask_irq(struct irq_data *d)static void gpio_unmask_irq (struct irq_data *d) {unsigned int gpio =irq_to_gpio (d->irq); -unsigned int base =GPIO_BASE (gpio /32 ); +void __iomem *base =GPIO_BASE (gpio /32 );_set_gpio_irqenable (base, gpio %32 ,1 ); }
@@ -82,7 +83,7 @@ static int gpio_set_irq_type(struct irq_data *d, unsigned int type) {unsigned int gpio =irq_to_gpio (d->irq);unsigned int gpio_mask =1 << (gpio %32 ); -unsigned int base =GPIO_BASE (gpio /32 ); +void __iomem *base =GPIO_BASE (gpio /32 );unsigned int reg_both, reg_level, reg_type; reg_type =__raw_readl (base +GPIO_INT_TYPE );
@@ -120,7 +121,7 @@ static int gpio_set_irq_type(struct irq_data *d, unsigned int type)__raw_writel (reg_level, base +GPIO_INT_LEVEL );__raw_writel (reg_both, base +GPIO_INT_BOTH_EDGE ); -gpio_ack_irq (d->irq); +gpio_ack_irq (d);return 0 ; }
@@ -153,7 +154,7 @@ static struct irq_chip gpio_irq_chip = {static void _set_gpio_direction (struct gpio_chip *chip,unsigned offset,int dir) { -unsigned int base =GPIO_BASE (offset /32 ); +void __iomem *base =GPIO_BASE (offset /32 );unsigned int reg; reg =__raw_readl (base +GPIO_DIR );
@@ -166,7 +167,7 @@ static void _set_gpio_direction(struct gpio_chip *chip, unsigned offset,static void gemini_gpio_set (struct gpio_chip *chip,unsigned offset,int value) { -unsigned int base =GPIO_BASE (offset /32 ); +void __iomem *base =GPIO_BASE (offset /32 );if (value)__raw_writel (1 << (offset %32 ), base +GPIO_DATA_SET );
@@ -176,7 +177,7 @@ static void gemini_gpio_set(struct gpio_chip *chip, unsigned offset, int value)static int gemini_gpio_get (struct gpio_chip *chip,unsigned offset) { -unsigned int base =GPIO_BASE (offset /32 ); +void __iomem *base =GPIO_BASE (offset /32 );return (__raw_readl (base +GPIO_DATA_IN ) >> (offset %32 )) &1 ; }
arch/arm/mach-gemini/include/mach/hardware.h +1 -1
@@ -69,6 +69,6 @@/* * macro to get at IO space when running virtually */ -#define IO_ADDRESS (x) ((((x) & 0xFFF00000) >> 4) | ((x) & 0x000FFFFF) | 0xF0000000) +#define IO_ADDRESS (x) IOMEM((((x) & 0xFFF00000) >> 4) | ((x) & 0x000FFFFF) | 0xF0000000)#endif
arch/arm/mach-gemini/irq.c +2 -2
@@ -65,8 +65,8 @@ static struct irq_chip gemini_irq_chip = {static struct resource irq_resource = { .name ="irq_handler" , - .start =IO_ADDRESS (GEMINI_INTERRUPT_BASE ), - .end =IO_ADDRESS (FIQ_STATUS (GEMINI_INTERRUPT_BASE )) +4 , + .start =GEMINI_INTERRUPT_BASE , + .end =FIQ_STATUS (GEMINI_INTERRUPT_BASE ) +4 , };void __init gemini_init_irq (void )
arch/arm/mach-gemini/mm.c +11 -11
@@ -19,57 +19,57 @@/* Page table mapping for I/O region */ static struct map_desc gemini_io_desc[]__initdata = { { - .virtual =IO_ADDRESS (GEMINI_GLOBAL_BASE ), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_GLOBAL_BASE ), .pfn =__phys_to_pfn (GEMINI_GLOBAL_BASE ), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_UART_BASE ), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_UART_BASE ), .pfn =__phys_to_pfn (GEMINI_UART_BASE ), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_TIMER_BASE ), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_TIMER_BASE ), .pfn =__phys_to_pfn (GEMINI_TIMER_BASE ), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_INTERRUPT_BASE ), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_INTERRUPT_BASE ), .pfn =__phys_to_pfn (GEMINI_INTERRUPT_BASE ), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_POWER_CTRL_BASE ), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_POWER_CTRL_BASE ), .pfn =__phys_to_pfn (GEMINI_POWER_CTRL_BASE ), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_GPIO_BASE (0 )), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_GPIO_BASE (0 )), .pfn =__phys_to_pfn (GEMINI_GPIO_BASE (0 )), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_GPIO_BASE (1 )), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_GPIO_BASE (1 )), .pfn =__phys_to_pfn (GEMINI_GPIO_BASE (1 )), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_GPIO_BASE (2 )), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_GPIO_BASE (2 )), .pfn =__phys_to_pfn (GEMINI_GPIO_BASE (2 )), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_FLASH_CTRL_BASE ), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_FLASH_CTRL_BASE ), .pfn =__phys_to_pfn (GEMINI_FLASH_CTRL_BASE ), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_DRAM_CTRL_BASE ), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_DRAM_CTRL_BASE ), .pfn =__phys_to_pfn (GEMINI_DRAM_CTRL_BASE ), .length =SZ_512K , .type =MT_DEVICE , }, { - .virtual =IO_ADDRESS (GEMINI_GENERAL_DMA_BASE ), + .virtual = (unsigned long )IO_ADDRESS (GEMINI_GENERAL_DMA_BASE ), .pfn =__phys_to_pfn (GEMINI_GENERAL_DMA_BASE ), .length =SZ_512K , .type =MT_DEVICE ,
arch/arm/mach-gemini/reset.c renamed from arch/arm/mach-gemini/include/mach/system.h +1 -1
@@ -14,7 +14,7 @@#include <mach/hardware.h> #include <mach/global_reg.h> -static inline void arch_reset (char mode,const char *cmd) +void gemini_restart (char mode,const char *cmd) {__raw_writel (RESET_GLOBAL |RESET_CPU1 ,IO_ADDRESS (GEMINI_GLOBAL_BASE ) +GLOBAL_RESET );
Signature · 1 line
1.8.1.2
PATCH 2/6 ARM: gemini: remove platform support
In reply to Arnd BergmannThe gemini platform has not seen any updates from its maintainer since 2010, and has no defconfig file, which has lead to bitrot in a number of places:
* System restart has been broken for a long time despite repeated attempts from Russell to get the obvious fix at least acknowledged by someone who can test it.
* The platform still uses mach/gpio.h, which has been deprecated for some time, and since Kconfig does not select NEED_MACH_GPIO_H, it actually failed to build because of this.
* A change to asm/io.h introduced a number of compiler warnings for gemini specific code that confuses physical and virtual addresses.
This removes gemini support entirely under the assumption that nobody uses it on mainline kernels. Of course, if there are still active users out there, they should let us know so we can put support back in and get it better tested.
--- MAINTAINERS | 7 - arch/arm/Kconfig | 11 - arch/arm/Makefile | 1 - arch/arm/mach-gemini/Kconfig | 40 ---- arch/arm/mach-gemini/Makefile | 13 -- arch/arm/mach-gemini/Makefile.boot | 9 - arch/arm/mach-gemini/board-nas4220b.c | 107 --------- arch/arm/mach-gemini/board-rut1xx.c | 92 -------- arch/arm/mach-gemini/board-wbd111.c | 134 ------------ arch/arm/mach-gemini/board-wbd222.c | 134 ------------ arch/arm/mach-gemini/common.h | 31 --- arch/arm/mach-gemini/devices.c | 118 ---------- arch/arm/mach-gemini/gpio.c | 231 -------------------- arch/arm/mach-gemini/idle.c | 29 --- arch/arm/mach-gemini/include/mach/debug-macro.S | 21 -- arch/arm/mach-gemini/include/mach/entry-macro.S | 33 --- arch/arm/mach-gemini/include/mach/global_reg.h | 278 ------------------------ arch/arm/mach-gemini/include/mach/gpio.h | 20 -- arch/arm/mach-gemini/include/mach/hardware.h | 74 ------- arch/arm/mach-gemini/include/mach/irqs.h | 53 ----- arch/arm/mach-gemini/include/mach/timex.h | 13 -- arch/arm/mach-gemini/include/mach/uncompress.h | 42 ---- arch/arm/mach-gemini/irq.c | 103 --------- arch/arm/mach-gemini/mm.c | 82 ------- arch/arm/mach-gemini/reset.c | 23 -- arch/arm/mach-gemini/time.c | 89 -------- 26 files changed, 1788 deletions(-) delete mode 100644 arch/arm/mach-gemini/Kconfig delete mode 100644 arch/arm/mach-gemini/Makefile delete mode 100644 arch/arm/mach-gemini/Makefile.boot delete mode 100644 arch/arm/mach-gemini/board-nas4220b.c delete mode 100644 arch/arm/mach-gemini/board-rut1xx.c delete mode 100644 arch/arm/mach-gemini/board-wbd111.c delete mode 100644 arch/arm/mach-gemini/board-wbd222.c delete mode 100644 arch/arm/mach-gemini/common.h delete mode 100644 arch/arm/mach-gemini/devices.c delete mode 100644 arch/arm/mach-gemini/gpio.c delete mode 100644 arch/arm/mach-gemini/idle.c delete mode 100644 arch/arm/mach-gemini/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-gemini/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-gemini/include/mach/global_reg.h delete mode 100644 arch/arm/mach-gemini/include/mach/gpio.h delete mode 100644 arch/arm/mach-gemini/include/mach/hardware.h delete mode 100644 arch/arm/mach-gemini/include/mach/irqs.h delete mode 100644 arch/arm/mach-gemini/include/mach/timex.h delete mode 100644 arch/arm/mach-gemini/include/mach/uncompress.h delete mode 100644 arch/arm/mach-gemini/irq.c delete mode 100644 arch/arm/mach-gemini/mm.c delete mode 100644 arch/arm/mach-gemini/reset.c delete mode 100644 arch/arm/mach-gemini/time.c
MAINTAINERS +0 -7
@@ -785,13 +785,6 @@ ARM/CORGI MACHINE SUPPORT M: Richard Purdie <[email protected]> S: Maintained -ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE -M: Hans Ulli Kroll <[email protected]> -L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers) -T: git git://git.berlios.de/gemini-board -S: Maintained -F: arch/arm/mach-gemini/ - ARM/CSR SIRFPRIMA2 MACHINE SUPPORT M: Barry Song <[email protected]> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
arch/arm/Kconfig +0 -11
@@ -407,15 +407,6 @@ config ARCH_CLPS711X help Support for Cirrus Logic 711x/721x/731x based boards. -config ARCH_GEMINI - bool "Cortina Systems Gemini" - select ARCH_REQUIRE_GPIOLIB - select ARCH_USES_GETTIMEOFFSET - select NEED_MACH_GPIO_H - select CPU_FA526 - help - Support for the Cortina Systems Gemini family SoCs - config ARCH_SIRF bool "CSR SiRF" select ARCH_REQUIRE_GPIOLIB
@@ -1050,8 +1041,6 @@ source "arch/arm/mach-ep93xx/Kconfig" source "arch/arm/mach-footbridge/Kconfig" -source "arch/arm/mach-gemini/Kconfig" - source "arch/arm/mach-h720x/Kconfig" source "arch/arm/mach-highbank/Kconfig"
arch/arm/Makefile +0 -1
@@ -146,7 +146,6 @@ machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_DOVE) += dove machine-$(CONFIG_ARCH_EBSA110) += ebsa110 machine-$(CONFIG_ARCH_EP93XX) += ep93xx -machine-$(CONFIG_ARCH_GEMINI) += gemini machine-$(CONFIG_ARCH_H720X) += h720x machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_INTEGRATOR) += integrator
arch/arm/mach-gemini/Kconfig deleted +0 -40
@@ -1,40 +0,0 @@ -if ARCH_GEMINI - -menu "Cortina Systems Gemini Implementations" - -config MACH_NAS4220B - bool "Raidsonic NAS-4220-B" - select GEMINI_MEM_SWAP - help - Say Y here if you intend to run this kernel on a - Raidsonic NAS-4220-B. - -config MACH_RUT100 - bool "Teltonika RUT100" - select GEMINI_MEM_SWAP - help - Say Y here if you intend to run this kernel on a - Teltonika 3G Router RUT100. - -config MACH_WBD111 - bool "Wiliboard WBD-111" - select GEMINI_MEM_SWAP - help - Say Y here if you intend to run this kernel on a - Wiliboard WBD-111. - -config MACH_WBD222 - bool "Wiliboard WBD-222" - select GEMINI_MEM_SWAP - help - Say Y here if you intend to run this kernel on a - Wiliboard WBD-222. - -endmenu - -config GEMINI_MEM_SWAP - bool "Gemini memory is swapped" - help - Say Y here if Gemini memory is swapped by bootloader. - -endif
arch/arm/mach-gemini/Makefile deleted +0 -13
@@ -1,13 +0,0 @@ -# -# Makefile for the linux kernel. -# - -# Object file lists. - -obj-y := irq.o mm.o time.o devices.o gpio.o idle.o reset.o - -# Board-specific support -obj-$(CONFIG_MACH_NAS4220B) += board-nas4220b.o -obj-$(CONFIG_MACH_RUT100) += board-rut1xx.o -obj-$(CONFIG_MACH_WBD111) += board-wbd111.o -obj-$(CONFIG_MACH_WBD222) += board-wbd222.o
arch/arm/mach-gemini/Makefile.boot deleted +0 -9
@@ -1,9 +0,0 @@ -ifeq ($(CONFIG_GEMINI_MEM_SWAP),y) - zreladdr-y += 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000 -else - zreladdr-y += 0x10008000 -params_phys-y := 0x10000100 -initrd_phys-y := 0x10800000 -endif
arch/arm/mach-gemini/board-nas4220b.c deleted +0 -107
107 lines not on this page · raw message
arch/arm/mach-gemini/board-rut1xx.c deleted +0 -92
92 lines not on this page · raw message
arch/arm/mach-gemini/board-wbd111.c deleted +0 -134
134 lines not on this page · raw message
arch/arm/mach-gemini/board-wbd222.c deleted +0 -134
134 lines not on this page · raw message
arch/arm/mach-gemini/common.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* -* Common Gemini architecture functions -* -* Copyright (C) 2008-2009 Paulius Zaleckas <[email protected]> -* -* 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 Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -*/ - -#ifndef __GEMINI_COMMON_H__ -#define __GEMINI_COMMON_H__ - -struct mtd_partition ; - -extern void gemini_map_io (void ); -extern void gemini_init_irq (void ); -extern void gemini_timer_init (void ); -extern void gemini_gpio_init (void ); -extern void platform_register_rtc (void ); - -/* Common platform devices registration functions */ -extern int platform_register_uart (void ); -extern int platform_register_pflash (unsigned int size, -struct mtd_partition *parts, -unsigned int nr_parts); - -extern void gemini_restart (char mode,const char *cmd); - -#endif /* __GEMINI_COMMON_H__ */
arch/arm/mach-gemini/devices.c deleted +0 -118
118 lines not on this page · raw message
arch/arm/mach-gemini/gpio.c deleted +0 -231
231 lines not on this page · raw message
arch/arm/mach-gemini/idle.c deleted +0 -29
@@ -1,29 +0,0 @@ -/* -* arch/arm/mach-gemini/idle.c -*/ - -#include <linux/init.h> -#include <asm/system.h> -#include <asm/proc-fns.h> - -static void gemini_idle (void ) -{ -/* -* Because of broken hardware we have to enable interrupts or the CPU -* will never wakeup... Acctualy it is not very good to enable -* interrupts first since scheduler can miss a tick, but there is -* no other way around this. Platforms that needs it for power saving -* should call enable_hlt() in init code, since by default it is -* disabled. -*/ -local_irq_enable (); -cpu_do_idle (); -} - -static int __init gemini_idle_init (void ) -{ - arm_pm_idle = gemini_idle; -return 0 ; -} - -arch_initcall (gemini_idle_init);
arch/arm/mach-gemini/include/mach/debug-macro.S deleted +0 -21
@@ -1,21 +0,0 @@ -/* - * Debugging macro include header - * - * Copyright (C) 1994-1999 Russell King - * Copyright (C) 2001-2006 Storlink, Corp. - * Copyright (C) 2008-2009 Paulius Zaleckas <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#include <mach/hardware.h> - - .macro addruart, rp, rv, tmp - ldr \rp, =GEMINI_UART_BASE @ physical - ldr \rv, =IO_ADDRESS(GEMINI_UART_BASE) @ virtual - .endm - -#define UART_SHIFT 2 -#define FLOW_CONTROL -#include <asm/hardware/debug-8250.S>
arch/arm/mach-gemini/include/mach/entry-macro.S deleted +0 -33
@@ -1,33 +0,0 @@ -/* - * Low-level IRQ helper macros for Gemini platform. - * - * Copyright (C) 2001-2006 Storlink, Corp. - * Copyright (C) 2008-2009 Paulius Zaleckas <[email protected]> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ -#include <mach/hardware.h> - -#define IRQ_STATUS 0x14 - - .macro get_irqnr_preamble, base, tmp - .endm - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - ldr \irqstat, =IO_ADDRESS(GEMINI_INTERRUPT_BASE + IRQ_STATUS) - ldr \irqnr, [\irqstat] - cmp \irqnr, #0 - beq 2313f - mov \tmp, \irqnr - mov \irqnr, #0 -2312: - tst \tmp, #1 - bne 2313f - add \irqnr, \irqnr, #1 - mov \tmp, \tmp, lsr #1 - cmp \irqnr, #31 - bcc 2312b -2313: - .endm
arch/arm/mach-gemini/include/mach/global_reg.h deleted +0 -278
278 lines not on this page · raw message
arch/arm/mach-gemini/include/mach/gpio.h deleted +0 -20
@@ -1,20 +0,0 @@ -/* -* Gemini gpiolib specific defines -* -* Copyright (C) 2008-2009 Paulius Zaleckas <[email protected]> -* -* 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 Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -*/ - -#ifndef __MACH_GPIO_H__ -#define __MACH_GPIO_H__ - -#include <mach/irqs.h> - -#define gpio_to_irq (x) ((x) + GPIO_IRQ_BASE) -#define irq_to_gpio (x) ((x) - GPIO_IRQ_BASE) - -#endif /* __MACH_GPIO_H__ */
arch/arm/mach-gemini/include/mach/hardware.h deleted +0 -74
74 lines not on this page · raw message
arch/arm/mach-gemini/include/mach/irqs.h deleted +0 -53
53 lines not on this page · raw message
arch/arm/mach-gemini/include/mach/timex.h deleted +0 -13
@@ -1,13 +0,0 @@ -/* -* Gemini timex specifications -* -* Copyright (C) 2008-2009 Paulius Zaleckas <[email protected]> -* -* 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 Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -*/ - -/* When AHB bus frequency is 150MHz */ -#define CLOCK_TICK_RATE 38000000
arch/arm/mach-gemini/include/mach/uncompress.h deleted +0 -42
42 lines not on this page · raw message
arch/arm/mach-gemini/irq.c deleted +0 -103
103 lines not on this page · raw message
arch/arm/mach-gemini/mm.c deleted +0 -82
82 lines not on this page · raw message
arch/arm/mach-gemini/reset.c deleted +0 -23
@@ -1,23 +0,0 @@ -/* -* Copyright (C) 2001-2006 Storlink, Corp. -* Copyright (C) 2008-2009 Paulius Zaleckas <[email protected]> -* -* 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 Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -*/ -#ifndef __MACH_SYSTEM_H -#define __MACH_SYSTEM_H - -#include <linux/io.h> -#include <mach/hardware.h> -#include <mach/global_reg.h> - -void gemini_restart (char mode,const char *cmd) -{ -__raw_writel (RESET_GLOBAL |RESET_CPU1 , -IO_ADDRESS (GEMINI_GLOBAL_BASE ) +GLOBAL_RESET ); -} - -#endif /* __MACH_SYSTEM_H */
arch/arm/mach-gemini/time.c deleted +0 -89
89 lines not on this page · raw message
Signature · 1 line
1.8.1.2
PATCH 2/6 ARM: gemini: remove platform support
Le 03/14/13 23:12, Arnd Bergmann a ?crit :
Quoted 4 lines
The gemini platform has not seen any updates from its maintainer since 2010, and has no defconfig file, which has lead to bitrot in a number of places:
Quoted 10 lines
* System restart has been broken for a long time despite repeated attempts from Russell to get the obvious fix at least acknowledged by someone who can test it.
* The platform still usesmach/gpio.h, which has been deprecated for some time, and sinceKconfigdoes not selectNEED_MACH_GPIO_H, it actually failed to build because of this.
* A change toasm/io.hintroduced a number of compiler warnings for gemini specific code that confuses physical and virtual addresses.
Imre, you are the one maintaining gemini support in OpenWrt, do you have any objections removing this platform or?
--
Florian
PATCH 3/6 ARM: remove fa526 CPU support
In reply to Arnd BergmannWith the Cortina Gemini platform gone, nothing in ARM uses the Faraday 526 CPU core support any more. There is at least one other platform using this (Moschip MCS814x), but the efforts to get that merged into mainline appear to have stalled.
If someone still needs this code, please speak up now, otherwise we will remove it now. Of course there is always the option to revert this patch if we need it again later.
--- MAINTAINERS | 7 -- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 - arch/arm/boot/compressed/head.S | 28 ----- arch/arm/include/asm/barrier.h | 6 - arch/arm/include/asm/glue-cache.h | 8 -- arch/arm/include/asm/glue-proc.h | 9 -- arch/arm/include/asm/page.h | 8 -- arch/arm/include/asm/tlbflush.h | 19 --- arch/arm/mm/Kconfig | 32 +---- arch/arm/mm/Makefile | 4 - arch/arm/mm/cache-fa.S | 249 -------------------------------------- arch/arm/mm/copypage-fa.c | 86 ------------- arch/arm/mm/proc-fa526.S | 221 --------------------------------- arch/arm/mm/tlb-fa.S | 69 ----------- 15 files changed, 3 insertions(+), 746 deletions(-) delete mode 100644 arch/arm/mm/cache-fa.S delete mode 100644 arch/arm/mm/copypage-fa.c delete mode 100644 arch/arm/mm/proc-fa526.S delete mode 100644 arch/arm/mm/tlb-fa.S
MAINTAINERS +0 -7
@@ -813,13 +813,6 @@ S: Maintained T: topgit git://git.openezx.org/openezx.git F: arch/arm/mach-pxa/ezx.c -ARM/FARADAY FA526 PORT -M: Hans Ulli Kroll <[email protected]> -L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers) -S: Maintained -T: git git://git.berlios.de/gemini-board -F: arch/arm/mm/*-fa* - ARM/FOOTBRIDGE ARCHITECTURE M: Russell King <[email protected]> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
arch/arm/Kconfig +1 -1
@@ -980,7 +980,7 @@ menu "Multiple platform selection" comment "CPU Core family selection" config ARCH_MULTI_V4 - bool "ARMv4 based platforms (FA526, StrongARM)" + bool "ARMv4 based platforms (StrongARM)" depends on !ARCH_MULTI_V6_V7 select ARCH_MULTI_V4_V5
arch/arm/Makefile +0 -1
@@ -82,7 +82,6 @@ tune-$(CONFIG_CPU_ARM920T) :=-mtune=arm9tdmi tune-$(CONFIG_CPU_ARM922T) :=-mtune=arm9tdmi tune-$(CONFIG_CPU_ARM925T) :=-mtune=arm9tdmi tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi -tune-$(CONFIG_CPU_FA526) :=-mtune=arm9tdmi tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
arch/arm/boot/compressed/head.S +0 -28
@@ -726,21 +726,6 @@ __armv7_mmu_cache_on: mcr p15, 0, r0, c7, c5, 4 @ ISB mov pc, r12 -__fa526_cache_on: - mov r12, lr - mov r6, #CB_BITS | 0x12 @ U - bl __setup_mmu - mov r0, #0 - mcr p15, 0, r0, c7, c7, 0 @ Invalidate whole cache - mcr p15, 0, r0, c7, c10, 4 @ drain write buffer - mcr p15, 0, r0, c8, c7, 0 @ flush UTLB - mrc p15, 0, r0, c1, c0, 0 @ read control reg - orr r0, r0, #0x1000 @ I-cache enable - bl __common_mmu_cache_on - mov r0, #0 - mcr p15, 0, r0, c8, c7, 0 @ flush UTLB - mov pc, r12 - __common_mmu_cache_on: #ifndef CONFIG_THUMB2_KERNEL #ifndef DEBUG
@@ -898,12 +883,6 @@ proc_types: b __armv5tej_mmu_cache_flush #endif - .word 0x66015261 @ FA526 - .word 0xff01fff1 - W(b) __fa526_cache_on - W(b) __armv4_mmu_cache_off - W(b) __fa526_cache_flush - @ These match on the architecture ID .word 0x00020000 @ ARMv4T
@@ -1048,13 +1027,6 @@ __armv4_mpu_cache_flush: mcr p15, 0, ip, c7, c10, 4 @ drain WB mov pc, lr -__fa526_cache_flush: - mov r1, #0 - mcr p15, 0, r1, c7, c14, 0 @ clean and invalidate D cache - mcr p15, 0, r1, c7, c5, 0 @ flush I cache - mcr p15, 0, r1, c7, c10, 4 @ drain WB - mov pc, lr - __armv6_mmu_cache_flush: mov r1, #0 mcr p15, 0, r1, c7, c14, 0 @ clean+invalidate D
arch/arm/include/asm/barrier.h +0 -6
@@ -24,12 +24,6 @@ : : "r" (0) : "memory")#define dmb () __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" \ : : "r" (0) : "memory") -#elif defined(CONFIG_CPU_FA526 ) -#define isb () __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \ - : : "r" (0) : "memory") -#define dsb () __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \ - : : "r" (0) : "memory") -#define dmb () __asm__ __volatile__ ("" : : : "memory")#else #define isb () __asm__ __volatile__ ("" : : : "memory")#define dsb () __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \
arch/arm/include/asm/glue-cache.h +0 -8
@@ -41,14 +41,6 @@# define MULTI_CACHE 1#endif -#if defined(CONFIG_CPU_FA526 ) -# ifdef _CACHE -# define MULTI_CACHE 1 -# else -# define _CACHE fa -# endif -#endif -#if defined(CONFIG_CPU_ARM926T )# ifdef _CACHE# define MULTI_CACHE 1
arch/arm/include/asm/glue-proc.h +0 -9
@@ -77,15 +77,6 @@# endif #endif -#ifdef CONFIG_CPU_FA526 -# ifdef CPU_NAME -# undef MULTI_CPU -# define MULTI_CPU -# else -# define CPU_NAME cpu_fa526 -# endif -#endif -#ifdef CONFIG_CPU_ARM925T # ifdef CPU_NAME # undef MULTI_CPU
arch/arm/include/asm/page.h +0 -8
@@ -67,14 +67,6 @@# endif #endif -#ifdef CONFIG_CPU_COPY_FA -# ifdef _USER -# define MULTI_USER 1 -# else -# define _USER fa -# endif -#endif -#ifdef CONFIG_CPU_SA1100 # ifdef _USER# define MULTI_USER 1
arch/arm/include/asm/tlbflush.h +0 -19
@@ -57,7 +57,6 @@* v4wb - ARMv4 with write buffer without I TLB flush entry instruction * v4wbi - ARMv4 with write buffer with I TLB flush entry instruction * fr - Feroceon (v4wbi with non-outer-cacheable page table walks) -* fa - Faraday (v4 with write buffer with UTLB) * v6wbi - ARMv6 with write buffer with I TLB flush entry instruction * v7wbi - identical to v6wbi */
@@ -83,22 +82,6 @@# define v4_always_flags (-1UL)#endif -#define fa_tlb_flags (TLB_WB | TLB_DCLEAN | TLB_BARRIER | \ - TLB_V4_U_FULL | TLB_V4_U_PAGE) - -#ifdef CONFIG_CPU_TLB_FA -# define fa_possible_flags fa_tlb_flags -# define fa_always_flags fa_tlb_flags -# ifdef _TLB -# define MULTI_TLB 1 -# else -# define _TLB fa -# endif -#else -# define fa_possible_flags 0 -# define fa_always_flags (-1UL) -#endif -#define v4wbi_tlb_flags (TLB_WB | TLB_DCLEAN | \ TLB_V4_I_FULL | TLB_V4_D_FULL | \ TLB_V4_I_PAGE | TLB_V4_D_PAGE)
@@ -293,7 +276,6 @@ extern struct cpu_tlb_fns cpu_tlb; v4wbi_possible_flags | \ fr_possible_flags | \ v4wb_possible_flags | \ - fa_possible_flags | \ v6wbi_possible_flags | \ v7wbi_possible_flags)
@@ -301,7 +283,6 @@ extern struct cpu_tlb_fns cpu_tlb; v4wbi_always_flags & \ fr_always_flags & \ v4wb_always_flags & \ - fa_always_flags & \ v6wbi_always_flags & \ v7wbi_always_flags)
arch/arm/mm/Kconfig +2 -30
@@ -143,24 +143,6 @@ config CPU_ARM926T Say Y if you want support for the ARM926T processor. Otherwise, say N. -# FA526 -config CPU_FA526 - bool - select CPU_32v4 - select CPU_ABRT_EV4 - select CPU_CACHE_FA - select CPU_CACHE_VIVT - select CPU_COPY_FA if MMU - select CPU_CP15_MMU - select CPU_PABRT_LEGACY - select CPU_TLB_FA if MMU - help - The FA526 is a version of the ARMv4 compatible processor with - Branch Target Buffer, Unified TLB and cache line size 16. - - Say Y if you want support for the FA526 processor. - Otherwise, say N. - # ARM940T config CPU_ARM940T bool "Support ARM940T processor" if ARCH_INTEGRATOR
@@ -507,9 +489,6 @@ config CPU_COPY_V4WB config CPU_COPY_FEROCEON bool -config CPU_COPY_FA - bool - config CPU_COPY_V6 bool
@@ -535,13 +514,6 @@ config CPU_TLB_FEROCEON help Feroceon TLB (v4wbi with non-outer-cachable page table walks). -config CPU_TLB_FA - bool - help - Faraday ARM FA526 architecture, unified TLB with writeback cache - and invalidate instruction cache entry. Branch target buffer is - also supported. - config CPU_TLB_V6 bool
@@ -731,7 +703,7 @@ config CPU_DCACHE_SIZE config CPU_DCACHE_WRITETHROUGH bool "Force write through D-cache" - depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020 || CPU_FA526) && !CPU_DCACHE_DISABLE + depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020) && !CPU_DCACHE_DISABLE default y if CPU_ARM925T help Say Y here to use the data cache in writethrough mode. Unless you
@@ -746,7 +718,7 @@ config CPU_CACHE_ROUND_ROBIN config CPU_BPREDICT_DISABLE bool "Disable branch prediction" - depends on CPU_ARM1020 || CPU_V6 || CPU_V6K || CPU_MOHAWK || CPU_XSC3 || CPU_V7 || CPU_FA526 + depends on CPU_ARM1020 || CPU_V6 || CPU_V6K || CPU_MOHAWK || CPU_XSC3 || CPU_V7 help Say Y here to disable branch prediction. If unsure, say N.
arch/arm/mm/Makefile +0 -4
@@ -39,7 +39,6 @@ obj-$(CONFIG_CPU_CACHE_V4WT) += cache-v4wt.o obj-$(CONFIG_CPU_CACHE_V4WB) += cache-v4wb.o obj-$(CONFIG_CPU_CACHE_V6) += cache-v6.o obj-$(CONFIG_CPU_CACHE_V7) += cache-v7.o -obj-$(CONFIG_CPU_CACHE_FA) += cache-fa.o AFLAGS_cache-v6.o :=-Wa,-march=armv6 AFLAGS_cache-v7.o :=-Wa,-march=armv7-a
@@ -51,7 +50,6 @@ obj-$(CONFIG_CPU_COPY_V6) += copypage-v6.o context.o obj-$(CONFIG_CPU_SA1100) += copypage-v4mc.o obj-$(CONFIG_CPU_XSCALE) += copypage-xscale.o obj-$(CONFIG_CPU_XSC3) += copypage-xsc3.o -obj-$(CONFIG_CPU_COPY_FA) += copypage-fa.o obj-$(CONFIG_CPU_TLB_V4WT) += tlb-v4.o obj-$(CONFIG_CPU_TLB_V4WB) += tlb-v4wb.o
@@ -59,7 +57,6 @@ obj-$(CONFIG_CPU_TLB_V4WBI) += tlb-v4wbi.o obj-$(CONFIG_CPU_TLB_FEROCEON) += tlb-v4wbi.o # reuse v4wbi TLB functions obj-$(CONFIG_CPU_TLB_V6) += tlb-v6.o obj-$(CONFIG_CPU_TLB_V7) += tlb-v7.o -obj-$(CONFIG_CPU_TLB_FA) += tlb-fa.o AFLAGS_tlb-v6.o :=-Wa,-march=armv6 AFLAGS_tlb-v7.o :=-Wa,-march=armv7-a
@@ -74,7 +71,6 @@ obj-$(CONFIG_CPU_ARM925T) += proc-arm925.o obj-$(CONFIG_CPU_ARM926T) += proc-arm926.o obj-$(CONFIG_CPU_ARM940T) += proc-arm940.o obj-$(CONFIG_CPU_ARM946E) += proc-arm946.o -obj-$(CONFIG_CPU_FA526) += proc-fa526.o obj-$(CONFIG_CPU_ARM1020) += proc-arm1020.o obj-$(CONFIG_CPU_ARM1020E) += proc-arm1020e.o obj-$(CONFIG_CPU_ARM1022) += proc-arm1022.o
arch/arm/mm/cache-fa.S deleted +0 -249
249 lines not on this page · raw message
arch/arm/mm/copypage-fa.c deleted +0 -86
86 lines not on this page · raw message
arch/arm/mm/proc-fa526.S deleted +0 -221
221 lines not on this page · raw message
arch/arm/mm/tlb-fa.S deleted +0 -69
69 lines not on this page · raw message
Signature · 1 line
1.8.1.2
PATCH 3/6 ARM: remove fa526 CPU support
Le 03/14/13 23:12, Arnd Bergmann a ?crit :
Quoted 5 lines
With the Cortina Gemini platform gone, nothing in ARM uses the Faraday 526 CPU core support any more. There is at least one other platform using this (Moschip MCS814x), but the efforts to get that merged into mainline appear to have stalled.
I was actually wrong for MCS8140, they used a genuine ARM926EJS core, newer version like MCS8142 and MCS8144 use a FA626 core that the mainline kernel does not support anyway.
Someone recently announced support for a Moxart SoC which seems to use the FA526 core however.
Quoted 5 lines
If someone still needs this code, please speak up now, otherwise we will remove it now. Of course there is always the option to revert this patch if we need it again later.
--
Florian
PATCH 3/6 ARM: remove fa526 CPU support
Quoted 10 lines · Florian Fainelli
Le 03/14/13 23:12, Arnd Bergmann a ?crit :
Quoted 5 lines
With the Cortina Gemini platform gone, nothing in ARM uses the Faraday 526 CPU core support any more. There is at least one other platform using this (Moschip MCS814x), but the efforts to get that merged into mainline appear to have stalled.
I was actually wrong for MCS8140, they used a genuine ARM926EJS core, newer version like MCS8142 and MCS8144 use a FA626 core that the mainline kernel does not support anyway.
Ah, I see. FA626 seems quite different from FA526, and closer to an ARM926 if I'm reading the feature list correctly. There are apparently even a bunch of newer cores from Faraday (FA726, FA606, FA646, FMP626) including an SMP capable one.
Quoted 2 lines
Someone recently announced support for a Moxart SoC which seems to use the FA526 core however.
Yes, I saw that now. I'll drop the fa526 removal patch for now, we'll see how that work progresses. The platform port is unfortunately on an ancient kernel, and updating it will be a lot of work, so it might not happen in the end.
Arnd
PATCH 3/6 ARM: remove fa526 CPU support
In reply to Florian FainelliQuoted 2 lines · Florian Fainelli
Someone recently announced support for a Moxart SoC which seems to use the FA526 core however.
That was probably me, and I understand people want it gone. Even Debian wants v4:s gone because they're not strictly EABI (
http://lists.debian.org/debian-arm/2010/12/msg00044.html ).
The port is not near mainline but I think I'd prefer if CPU_FA526 wasn't removed. If someone stepped up to maintain ARCH_GEMINI (so I could peek at the changes) that would be even better :)
Best regards,
Jonas
PATCH 3/6 ARM: remove fa526 CPU support
Quoted 8 lines · Jonas Jensen
Quoted 2 lines · Florian Fainelli
Someone recently announced support for a Moxart SoC which seems to use the FA526 core however.
That was probably me, and I understand people want it gone. Even Debian wants v4:s gone because they're not strictly EABI (
http://lists.debian.org/debian-arm/2010/12/msg00044.html ).
It's not that we want it gone, it si that we want unmaintained code to be removed. ARMv4 support is going to stay at least for a couple more years, probably longer given the number of ARM7TDMI and StrongARM systems still in use.
There are probably no general purpose distros that will build for ARMv4 any more, but a lot of the embedded distros (OpenWRT, OpenEmbedded, Buildroot, ...) typically build all user space from source anyway, so there is no issue.
Quoted 3 lines
The port is not near mainline but I think I'd prefer if
CPU_FA526wasn't removed. If someone stepped up to maintainARCH_GEMINI(so I could peek at the changes) that would be even better :)
I've tried before to find someone who is still interested in Gemini, but it seems nobody has the hardware any more.
My plan right now is to leave CPU_FA526 alone but drop ARCH_GEMINI in 3.10. We can revisit the situation next year. If we don't hear back from you or someone else interested in this CPU type by then, we can still drop it then. It's not a maintainance burden anyway, the CPU specific code is well isolated and does not change a lot, compare to platform specific code.
Arnd
PATCH 3/6 ARM: remove fa526 CPU support
Le 03/18/13 12:16, Arnd Bergmann a ?crit :
Quoted 15 lines · Jonas Jensen
Quoted 8 lines · Florian Fainelli
Quoted 2 lines
Someone recently announced support for a Moxart SoC which seems to use the FA526 core however.
That was probably me, and I understand people want it gone. Even Debian wants v4:s gone because they're not strictly EABI (
http://lists.debian.org/debian-arm/2010/12/msg00044.html ).It's not that we want it gone, it si that we want unmaintained code to be removed. ARMv4 support is going to stay at least for a couple more years, probably longer given the number of ARM7TDMI and StrongARM systems still in use.
Quoted 4 lines
There are probably no general purpose distros that will build for ARMv4 any more, but a lot of the embedded distros (OpenWRT, OpenEmbedded, Buildroot, ...) typically build all user space from source anyway, so there is no issue.
Debian is still kind enough to provide an ARMv4t and higher port (ArmEabi) though I am not sure how long this is going to stay that way.
Quoted 7 lines
Quoted 4 lines
The port is not near mainline but I think I'd prefer if
CPU_FA526wasn't removed. If someone stepped up to maintainARCH_GEMINI(so I could peek at the changes) that would be even better :)I've tried before to find someone who is still interested in Gemini, but it seems nobody has the hardware any more.
Imre Kaloz is supposed to have some, if you want to get some hardware yourself it seems that the mainline boards (WBD111, WBD222, NAS4420) are the only hardware devices that OpenWrt also supports. The OpenWrt patches we have add support for Ethernet, watchdog, USB, PCI, but have not been submitted mainline.
Quoted 7 lines
My plan right now is to leave
CPU_FA526alone but dropARCH_GEMINIin 3.10. We can revisit the situation next year. If we don't hear back from you or someone else interested in this CPU type by then, we can still drop it then. It's not a maintainance burden anyway, the CPU specific code is well isolated and does not change a lot, compare to platform specific code.
Sounds good.
--
Florian
PATCH 3/6 ARM: remove fa526 CPU support
Quoted 1 line · Florian Fainelli
Debian is still kind enough to provide an ARMv4t and higher port
And I still build some ARMv4 OABI Fedora RPMs myself - but I don't distribute them because then people expect _me_ do fix their problems with them.
lists.arm.linux.org.uk / firewall / servers here are all still OABI, and I don't see any possible upgrade path away from OABI - which is something I brought up when EABI first reared its ugly head. Now, we have N different versions of EABI too. I'm sure its time we were discussing NABI - "Next ABI". :)
PATCH 3/6 ARM: remove fa526 CPU support
In reply to Florian FainelliHi,
Quoted 3 lines · Florian Fainelli
Le 03/18/13 12:16, Arnd Bergmann a ?crit :
Quoted 2 lines · Jonas Jensen
Quoted 1 line
<snip>
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
The port is not near mainline but I think I'd prefer if
CPU_FA526wasn't removed. If someone stepped up to maintainARCH_GEMINI(so I could peek at the changes) that would be even better :)
Quoted 8 lines
Quoted 2 lines
I've tried before to find someone who is still interested in Gemini, but it seems nobody has the hardware any more.
Imre Kaloz is supposed to have some, if you want to get some hardware yourself it seems that the mainline boards (WBD111, WBD222, NAS4420) are the only hardware devices that OpenWrt also supports. The OpenWrt patches we have add support for Ethernet, watchdog, USB, PCI, but have not been submitted mainline.
I have two wbd111 boards, but their bootloader is fubared - for whatever reason the bootloader's ethernet support works horribly for me, as in an image transfer takes well over 10 mins, and 90% of the time it fails meantime. I have another gemini based board, which doesn't have mainline support, yet.
So for gemini, what I can offer is digging up the wbd111 and testing your patches this weekend - if that works, it can stay in mainline for another kernel release, and I can try to add support for the other board (so there would be a sane platform to test on). If you are going to drop it, I will likely keep it working in OpenWrt as long as those boards don't die on me.
Imre
PATCH 3/6 ARM: remove fa526 CPU support
Quoted 6 lines · Imre Kaloz
I have two wbd111 boards, but their bootloader is fubared - for whatever reason the bootloader's ethernet support works horribly for me, as in an image transfer takes well over 10 mins, and 90% of the time it fails meantime. I have another gemini based board, which doesn't have mainline support, yet.
Quoted 6 lines
So for gemini, what I can offer is digging up the wbd111 and testing your patches this weekend - if that works, it can stay in mainline for another kernel release, and I can try to add support for the other board (so there would be a sane platform to test on). If you are going to drop it, I will likely keep it working in OpenWrt as long as those boards don't die on me.
Sounds good. If you are still interested in keeping the code alive, we shouldn't drop it upstream. Can you also add a defconfig file that enables all the gemini specific Kconfig code plus whatever you use in OpenWRT?
Part of the reason why the platform was so broken is that it never had a defconfig, and we didn't notice the bitrot.
Arnd
PATCH 3/6 ARM: remove fa526 CPU support
Quoted 14 lines · Arnd Bergmann
Quoted 6 lines · Imre Kaloz
I have two wbd111 boards, but their bootloader is fubared - for whatever reason the bootloader's ethernet support works horribly for me, as in an image transfer takes well over 10 mins, and 90% of the time it fails meantime. I have another gemini based board, which doesn't have mainline support, yet.
Quoted 6 lines
So for gemini, what I can offer is digging up the wbd111 and testing your patches this weekend - if that works, it can stay in mainline for another kernel release, and I can try to add support for the other board (so there would be a sane platform to test on). If you are going to drop it, I will likely keep it working in OpenWrt as long as those boards don't die on me.
Quoted 7 lines
Sounds good. If you are still interested in keeping the code alive, we shouldn't drop it upstream. Can you also add a defconfig file that enables all the gemini specific
Kconfigcode plus whatever you use in OpenWRT?Part of the reason why the platform was so broken is that it never had a defconfig, and we didn't notice the bitrot.
Sure, I'll try to get all of this done this weekend.
Imre
PATCH 3/6 ARM: remove fa526 CPU support
Quoted 21 lines · Imre Kaloz
Quoted 19 lines · Arnd Bergmann
Quoted 6 lines · Imre Kaloz
I have two wbd111 boards, but their bootloader is fubared - for whatever reason the bootloader's ethernet support works horribly for me, as in an image transfer takes well over 10 mins, and 90% of the time it fails meantime. I have another gemini based board, which doesn't have mainline support, yet.
Quoted 6 lines
So for gemini, what I can offer is digging up the wbd111 and testing your patches this weekend - if that works, it can stay in mainline for another kernel release, and I can try to add support for the other board (so there would be a sane platform to test on). If you are going to drop it, I will likely keep it working in OpenWrt as long as those boards don't die on me.
Sounds good. If you are still interested in keeping the code alive, we shouldn't drop it upstream. Can you also add a defconfig file that enables all the gemini specific
Kconfigcode plus whatever you use in OpenWRT?
Quoted 5 lines
Quoted 2 lines
Part of the reason why the platform was so broken is that it never had a defconfig, and we didn't notice the bitrot.
Sure, I'll try to get all of this done this weekend.
Just tested 3.9-rc4 with your "ARM: gemini: get platform to build again" patch and the ones we have in our tree and it works on my WBD111. Please apply that patch and with a little luck I can get the other board working for 3.11, with the additional defconfig and some more hw support as well -- or if you would like so, I can get a defconfig done for 3.10, but I'm not sure it makes too much sense.
Imre
PATCH 3/6 ARM: remove fa526 CPU support
Quoted 5 lines · Imre Kaloz
Just tested 3.9-rc4 with your "ARM: gemini: get platform to build again" patch and the ones we have in our tree and it works on my WBD111. Please apply that patch and with a little luck I can get the other board working for 3.11, with the additional defconfig and some more hw support as well
Ok, excellent. Thanks a lot for testing!
Quoted 3 lines
-- or if you would like so,
I can get a defconfig done for 3.10, but I'm not sure it makes too much sense.
I'd prefer to have the defconfig for 3.10, mainly so I notice when we introduce build errors. Ideally the defconfig should enable any code that is only available for gemini. I frequently build all defconfigs when I apply cross-platform patches, and try to use a clean build as the minimum acceptance criteria.
Arnd
PATCH 3/6 ARM: remove fa526 CPU support
In reply to Arnd BergmannQuoted 19 lines · On Monday 18 of March 2013 11:16:17 Arnd Bergmann wrote:
Quoted 7 lines · Jonas Jensen
Quoted 2 lines · Florian Fainelli
Someone recently announced support for a Moxart SoC which seems to use the FA526 core however.
That was probably me, and I understand people want it gone. Even Debian wants v4:s gone because they're not strictly EABI (
http://lists.debian.org/debian-arm/2010/12/msg00044.html ).It's not that we want it gone, it si that we want unmaintained code to be removed. ARMv4 support is going to stay at least for a couple more years, probably longer given the number of ARM7TDMI and StrongARM systems still in use.
There are probably no general purpose distros that will build for ARMv4 any more, but a lot of the embedded distros (OpenWRT, OpenEmbedded, Buildroot, ...) typically build all user space from source anyway, so there is no issue.
Quoted 6 lines
Quoted 3 lines
The port is not near mainline but I think I'd prefer if
CPU_FA526wasn't removed. If someone stepped up to maintainARCH_GEMINI(so I could peek at the changes) that would be even better :)I've tried before to find someone who is still interested in Gemini, but it seems nobody has the hardware any more.
I should still have a SquareOne SQ201 (Gemini-based NAS/router/WLAN AP) somewhere. However I doubt that I will be able to find time to do anything with it anytime soon, so I can give it to someone willing to do something with Gemini platform in mainline. (I would prefer someone from EU, though, as here in Poland the cost of sending anything outside the EU is awfully high...).
Best regards,
Tomasz
PATCH 3/6 ARM: remove fa526 CPU support
Quoted 3 lines · On Monday 25 of March 2013 21:11:33 Tomasz Figa wrote:
Quoted 2 lines · On Monday 18 of March 2013 11:16:17 Arnd Bergmann wrote:
Quoted 1 line · Jonas Jensen
On 15 March 2013 13:49, Florian Fainelli <[email protected]>
Quoted 24 lines · wrote:
Quoted 17 lines
Quoted 6 lines
Quoted 2 lines
Someone recently announced support for a Moxart SoC which seems to use the FA526 core however.
That was probably me, and I understand people want it gone. Even Debian wants v4:s gone because they're not strictly EABI (
http://lists.debian.org/debian-arm/2010/12/msg00044.html ).It's not that we want it gone, it si that we want unmaintained code to be removed. ARMv4 support is going to stay at least for a couple more years, probably longer given the number of ARM7TDMI and StrongARM systems still in use.
There are probably no general purpose distros that will build for ARMv4 any more, but a lot of the embedded distros (OpenWRT, OpenEmbedded, Buildroot, ...) typically build all user space from source anyway, so there is no issue.
Quoted 6 lines
Quoted 3 lines
The port is not near mainline but I think I'd prefer if
CPU_FA526wasn't removed. If someone stepped up to maintainARCH_GEMINI(so I could peek at the changes) that would be even better :)I've tried before to find someone who is still interested in Gemini, but it seems nobody has the hardware any more.
Quoted 6 lines
I should still have a SquareOne SQ201 (Gemini-based NAS/router/WLAN AP) somewhere. However I doubt that I will be able to find time to do anything with it anytime soon, so I can give it to someone willing to do something with Gemini platform in mainline. (I would prefer someone from EU, though, as here in Poland the cost of sending anything outside the EU is awfully high...).
Already taken by Florian. Good that it will finally find some use after spending several years in a cabinet.
Best regards,
Tomasz
PATCH 4/6 ARM: l7200: remove zombie file
In reply to Arnd BergmannThe l7200 platform was removed in 2.6.35, but one file came back due to a failed merge conflict resolution. Let's kill it again.
--- arch/arm/mach-l7200/include/mach/debug-macro.S | 38 -------------------------- 1 file changed, 38 deletions(-) delete mode 100644 arch/arm/mach-l7200/include/mach/debug-macro.S
arch/arm/mach-l7200/include/mach/debug-macro.S deleted +0 -38
@@ -1,38 +0,0 @@ -/* arch/arm/mach-l7200/include/mach/debug-macro.S - * - * Debugging macro include header - * - * Copyright (C) 1994-1999 Russell King - * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * -*/ - - .equ io_virt, IO_BASE - .equ io_phys, IO_START - - .macro addruart, rp, rv, tmp - mov \rp, #0x00044000 @ UART1 -@ mov \rp, #0x00045000 @ UART2 - add \rv, \rp, #io_virt @ virtual address - add \rp, \rp, #io_phys @ physical base address - .endm - - .macro senduart,rd,rx - str \rd, [\rx, #0x0] @ UARTDR - .endm - - .macro waituart,rd,rx -1001: ldr \rd, [\rx, #0x18] @ UARTFLG - tst \rd, #1 << 5 @ UARTFLGUTXFF - 1 when full - bne 1001b - .endm - - .macro busyuart,rd,rx -1001: ldr \rd, [\rx, #0x18] @ UARTFLG - tst \rd, #1 << 3 @ UARTFLGUBUSY - 1 when busy - bne 1001b - .endm
Signature · 1 line
1.8.1.2
PATCH 5/6 ARM: kill Hynix h720x platform
In reply to Arnd BergmannThe platform was merged about 10 years ago, and has seen few updates for most of the time since. The people that merged the code seem no longer interested in it either, so let's remove it now.
--- arch/arm/Kconfig | 10 - arch/arm/Makefile | 1 - arch/arm/configs/h7201_defconfig | 27 --- arch/arm/configs/h7202_defconfig | 47 ----- arch/arm/mach-h720x/Kconfig | 40 ---- arch/arm/mach-h720x/Makefile | 16 -- arch/arm/mach-h720x/Makefile.boot | 2 - arch/arm/mach-h720x/common.c | 268 ------------------------- arch/arm/mach-h720x/common.h | 30 --- arch/arm/mach-h720x/cpu-h7201.c | 57 ------ arch/arm/mach-h720x/cpu-h7202.c | 225 --------------------- arch/arm/mach-h720x/h7201-eval.c | 38 ---- arch/arm/mach-h720x/h7202-eval.c | 81 -------- arch/arm/mach-h720x/include/mach/boards.h | 53 ----- arch/arm/mach-h720x/include/mach/debug-macro.S | 40 ---- arch/arm/mach-h720x/include/mach/entry-macro.S | 57 ------ arch/arm/mach-h720x/include/mach/h7201-regs.h | 67 ------- arch/arm/mach-h720x/include/mach/h7202-regs.h | 155 -------------- arch/arm/mach-h720x/include/mach/hardware.h | 190 ------------------ arch/arm/mach-h720x/include/mach/irqs.h | 116 ----------- arch/arm/mach-h720x/include/mach/isa-dma.h | 19 -- arch/arm/mach-h720x/include/mach/timex.h | 15 -- arch/arm/mach-h720x/include/mach/uncompress.h | 36 ---- 23 files changed, 1590 deletions(-) delete mode 100644 arch/arm/configs/h7201_defconfig delete mode 100644 arch/arm/configs/h7202_defconfig delete mode 100644 arch/arm/mach-h720x/Kconfig delete mode 100644 arch/arm/mach-h720x/Makefile delete mode 100644 arch/arm/mach-h720x/Makefile.boot delete mode 100644 arch/arm/mach-h720x/common.c delete mode 100644 arch/arm/mach-h720x/common.h delete mode 100644 arch/arm/mach-h720x/cpu-h7201.c delete mode 100644 arch/arm/mach-h720x/cpu-h7202.c delete mode 100644 arch/arm/mach-h720x/h7201-eval.c delete mode 100644 arch/arm/mach-h720x/h7202-eval.c delete mode 100644 arch/arm/mach-h720x/include/mach/boards.h delete mode 100644 arch/arm/mach-h720x/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/h7201-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/h7202-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/hardware.h delete mode 100644 arch/arm/mach-h720x/include/mach/irqs.h delete mode 100644 arch/arm/mach-h720x/include/mach/isa-dma.h delete mode 100644 arch/arm/mach-h720x/include/mach/timex.h delete mode 100644 arch/arm/mach-h720x/include/mach/uncompress.h
arch/arm/Kconfig +0 -10
@@ -485,14 +485,6 @@ config ARCH_NETX help This enables support for systems based on the Hilscher NetX Soc -config ARCH_H720X - bool "Hynix HMS720x-based" - select ARCH_USES_GETTIMEOFFSET - select CPU_ARM720T - select ISA_DMA_API - help - This enables support for systems based on the Hynix HMS720x - config ARCH_IOP13XX bool "IOP13xx-based" depends on MMU
@@ -1041,8 +1033,6 @@ source "arch/arm/mach-ep93xx/Kconfig" source "arch/arm/mach-footbridge/Kconfig" -source "arch/arm/mach-h720x/Kconfig" - source "arch/arm/mach-highbank/Kconfig" source "arch/arm/mach-integrator/Kconfig"
arch/arm/Makefile +0 -1
@@ -145,7 +145,6 @@ machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_DOVE) += dove machine-$(CONFIG_ARCH_EBSA110) += ebsa110 machine-$(CONFIG_ARCH_EP93XX) += ep93xx -machine-$(CONFIG_ARCH_H720X) += h720x machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP13XX) += iop13xx
arch/arm/configs/h7201_defconfig deleted +0 -27
@@ -1,27 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_ARCH_H720X=y -CONFIG_ARCH_H7201=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=m -CONFIG_EXT2_FS=y -CONFIG_JFFS2_FS=y -CONFIG_DEBUG_USER=y
arch/arm/configs/h7202_defconfig deleted +0 -47
47 lines not on this page · raw message
arch/arm/mach-h720x/Kconfig deleted +0 -40
@@ -1,40 +0,0 @@ -if ARCH_H720X - -menu "h720x Implementations" - -config ARCH_H7201 - bool "gms30c7201" - depends on ARCH_H720X - select CPU_H7201 - select ZONE_DMA - help - Say Y here if you are using the Hynix GMS30C7201 Reference Board - -config ARCH_H7202 - bool "hms30c7202" - depends on ARCH_H720X - select CPU_H7202 - select ZONE_DMA - help - Say Y here if you are using the Hynix HMS30C7202 Reference Board - -endmenu - -config CPU_H7201 - bool - help - Select code specific to h7201 variants - -config CPU_H7202 - bool - help - Select code specific to h7202 variants -config H7202_SERIAL23 - depends on CPU_H7202 - bool "Use serial ports 2+3" - help - Say Y here if you wish to use serial ports 2+3. They share their - pins with the keyboard matrix controller, so you have to decide. - - -endif
arch/arm/mach-h720x/Makefile deleted +0 -16
@@ -1,16 +0,0 @@ -# -# Makefile for the linux kernel. -# - -# Common support -obj-y := common.o -obj-m := -obj-n := -obj- := - -# Specific board support - -obj-$(CONFIG_ARCH_H7201) += h7201-eval.o -obj-$(CONFIG_ARCH_H7202) += h7202-eval.o -obj-$(CONFIG_CPU_H7201) += cpu-h7201.o -obj-$(CONFIG_CPU_H7202) += cpu-h7202.o
arch/arm/mach-h720x/Makefile.boot deleted +0 -2
@@ -1,2 +0,0 @@ - zreladdr-$(CONFIG_ARCH_H720X) += 0x40008000 -
arch/arm/mach-h720x/common.c deleted +0 -268
268 lines not on this page · raw message
arch/arm/mach-h720x/common.h deleted +0 -30
@@ -1,30 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/common.h -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* Architecture specific stuff for Hynix GMS30C7201 development board -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -extern u32 h720x_gettimeoffset (void ); -extern void __init h720x_init_irq (void ); -extern void __init h720x_map_io (void ); -extern void h720x_restart (char ,const char *); - -#ifdef CONFIG_ARCH_H7202 -extern void h7202_timer_init (void ); -extern void __init init_hw_h7202 (void ); -extern void __init h7202_init_irq (void ); -extern void __init h7202_init_time (void ); -#endif - -#ifdef CONFIG_ARCH_H7201 -extern void h7201_timer_init (void ); -#endif
arch/arm/mach-h720x/cpu-h7201.c deleted +0 -57
57 lines not on this page · raw message
arch/arm/mach-h720x/cpu-h7202.c deleted +0 -225
225 lines not on this page · raw message
arch/arm/mach-h720x/h7201-eval.c deleted +0 -38
@@ -1,38 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/h7201-eval.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* Architecture specific stuff for Hynix GMS30C7201 development board -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/string.h> -#include <linux/device.h> - -#include <asm/setup.h> -#include <asm/types.h> -#include <asm/mach-types.h> -#include <asm/page.h> -#include <asm/mach/arch.h> -#include <mach/hardware.h> -#include "common.h" - -MACHINE_START (H7201 ,"Hynix GMS30C7201" ) -/* Maintainer: Robert Schwebel, Pengutronix */ - .atag_offset = 0x1000, - .map_io = h720x_map_io, - .init_irq = h720x_init_irq, - .init_time = h7201_timer_init, - .dma_zone_size = SZ_256M, - .restart = h720x_restart, -MACHINE_END
arch/arm/mach-h720x/h7202-eval.c deleted +0 -81
81 lines not on this page · raw message
arch/arm/mach-h720x/include/mach/boards.h deleted +0 -53
53 lines not on this page · raw message
arch/arm/mach-h720x/include/mach/debug-macro.S deleted +0 -40
@@ -1,40 +0,0 @@ -/* arch/arm/mach-h720x/include/mach/debug-macro.S - * - * Debugging macro include header - * - * Copyright (C) 1994-1999 Russell King - * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * -*/ - -#include <mach/hardware.h> - - .equ io_virt, IO_VIRT - .equ io_phys, IO_PHYS - - .macro addruart, rp, rv, tmp - mov \rp, #0x00020000 @ UART1 - add \rv, \rp, #io_virt @ virtual address - add \rp, \rp, #io_phys @ physical base address - .endm - - .macro senduart,rd,rx - str \rd, [\rx, #0x0] @ UARTDR - - .endm - - .macro waituart,rd,rx -1001: ldr \rd, [\rx, #0x18] @ UARTFLG - tst \rd, #1 << 5 @ UARTFLGUTXFF - 1 when full - bne 1001b - .endm - - .macro busyuart,rd,rx -1001: ldr \rd, [\rx, #0x18] @ UARTFLG - tst \rd, #1 << 3 @ UARTFLGUBUSY - 1 when busy - bne 1001b - .endm
arch/arm/mach-h720x/include/mach/entry-macro.S deleted +0 -57
57 lines not on this page · raw message
arch/arm/mach-h720x/include/mach/h7201-regs.h deleted +0 -67
67 lines not on this page · raw message
arch/arm/mach-h720x/include/mach/h7202-regs.h deleted +0 -155
155 lines not on this page · raw message
arch/arm/mach-h720x/include/mach/hardware.h deleted +0 -190
190 lines not on this page · raw message
arch/arm/mach-h720x/include/mach/irqs.h deleted +0 -116
116 lines not on this page · raw message
arch/arm/mach-h720x/include/mach/isa-dma.h deleted +0 -19
@@ -1,19 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/isa-dma.h -* -* Architecture DMA routes -* -* Copyright (C) 1997.1998 Russell King -*/ -#ifndef __ASM_ARCH_DMA_H -#define __ASM_ARCH_DMA_H - -#if defined (CONFIG_CPU_H7201 ) -#define MAX_DMA_CHANNELS 3 -#elif defined (CONFIG_CPU_H7202 ) -#define MAX_DMA_CHANNELS 4 -#else -#error processor definition missmatch -#endif - -#endif /* __ASM_ARCH_DMA_H */
arch/arm/mach-h720x/include/mach/timex.h deleted +0 -15
@@ -1,15 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/timex.h -* Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_TIMEX -#define __ASM_ARCH_TIMEX - -#define CLOCK_TICK_RATE 3686400 - -#endif
arch/arm/mach-h720x/include/mach/uncompress.h deleted +0 -36
@@ -1,36 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/uncompress.h -* -* Copyright (C) 2001-2002 Jungjun Kim -*/ - -#ifndef __ASM_ARCH_UNCOMPRESS_H -#define __ASM_ARCH_UNCOMPRESS_H - -#include <mach/hardware.h> - -#define LSR 0x14 -#define TEMPTY 0x40 - -static inline void putc (int c) -{ -volatile unsigned char *p = (volatile unsigned char *)(IO_PHYS +0x20000 ); - -/* wait until transmit buffer is empty */ -while ((p[LSR ] &TEMPTY ) ==0x0 ) -barrier (); - -/* write next character */ - *p = c; -} - -static inline void flush (void ) -{ -} - -/* -* nothing to do -*/ -#define arch_decomp_setup () - -#endif
Signature · 1 line
1.8.1.2
PATCH 5/6 ARM: kill Hynix h720x platform
Quoted 8 lines · Arnd Bergmann
The platform was merged about 10 years ago, and has seen few updates for most of the time since. The people that merged the code seem no longer interested in it either, so let's remove it now.
Signed-off-by Arnd Bergmann <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Robert Schwebel <[email protected]>Cc Sascha Hauer <[email protected]>
Quoted 1,796 lines
--- arch/arm/Kconfig | 10 - arch/arm/Makefile | 1 - arch/arm/configs/h7201_defconfig | 27 --- arch/arm/configs/h7202_defconfig | 47 ----- arch/arm/mach-h720x/Kconfig | 40 ---- arch/arm/mach-h720x/Makefile | 16 -- arch/arm/mach-h720x/Makefile.boot | 2 - arch/arm/mach-h720x/common.c | 268 ------------------------- arch/arm/mach-h720x/common.h | 30 --- arch/arm/mach-h720x/cpu-h7201.c | 57 ------ arch/arm/mach-h720x/cpu-h7202.c | 225 --------------------- arch/arm/mach-h720x/h7201-eval.c | 38 ---- arch/arm/mach-h720x/h7202-eval.c | 81 -------- arch/arm/mach-h720x/include/mach/boards.h | 53 ----- arch/arm/mach-h720x/include/mach/debug-macro.S | 40 ---- arch/arm/mach-h720x/include/mach/entry-macro.S | 57 ------ arch/arm/mach-h720x/include/mach/h7201-regs.h | 67 ------- arch/arm/mach-h720x/include/mach/h7202-regs.h | 155 -------------- arch/arm/mach-h720x/include/mach/hardware.h | 190 ------------------ arch/arm/mach-h720x/include/mach/irqs.h | 116 ----------- arch/arm/mach-h720x/include/mach/isa-dma.h | 19 -- arch/arm/mach-h720x/include/mach/timex.h | 15 -- arch/arm/mach-h720x/include/mach/uncompress.h | 36 ---- 23 files changed, 1590 deletions(-) delete mode 100644 arch/arm/configs/h7201_defconfig delete mode 100644 arch/arm/configs/h7202_defconfig delete mode 100644 arch/arm/mach-h720x/Kconfig delete mode 100644 arch/arm/mach-h720x/Makefile delete mode 100644 arch/arm/mach-h720x/Makefile.boot delete mode 100644 arch/arm/mach-h720x/common.c delete mode 100644 arch/arm/mach-h720x/common.h delete mode 100644 arch/arm/mach-h720x/cpu-h7201.c delete mode 100644 arch/arm/mach-h720x/cpu-h7202.c delete mode 100644 arch/arm/mach-h720x/h7201-eval.c delete mode 100644 arch/arm/mach-h720x/h7202-eval.c delete mode 100644 arch/arm/mach-h720x/include/mach/boards.h delete mode 100644 arch/arm/mach-h720x/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/h7201-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/h7202-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/hardware.h delete mode 100644 arch/arm/mach-h720x/include/mach/irqs.h delete mode 100644 arch/arm/mach-h720x/include/mach/isa-dma.h delete mode 100644 arch/arm/mach-h720x/include/mach/timex.h delete mode 100644 arch/arm/mach-h720x/include/mach/uncompress.harch/arm/Kconfig +0
-10@@ -485,14 +485,6 @@ config ARCH_NETX help This enables support for systems based on the Hilscher NetX Soc -config ARCH_H720X - bool "Hynix HMS720x-based" - select ARCH_USES_GETTIMEOFFSET - select CPU_ARM720T - select ISA_DMA_API - help - This enables support for systems based on the Hynix HMS720x - config ARCH_IOP13XX bool "IOP13xx-based" depends on MMU@@ -1041,8 +1033,6 @@ source "arch/arm/mach-ep93xx/Kconfig" source "arch/arm/mach-footbridge/Kconfig" -source "arch/arm/mach-h720x/Kconfig" - source "arch/arm/mach-highbank/Kconfig" source "arch/arm/mach-integrator/Kconfig"arch/arm/Makefile +0
-1@@ -145,7 +145,6 @@ machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_DOVE) += dove machine-$(CONFIG_ARCH_EBSA110) += ebsa110 machine-$(CONFIG_ARCH_EP93XX) += ep93xx -machine-$(CONFIG_ARCH_H720X) += h720x machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP13XX) += iop13xxarch/arm/configs/h7201_defconfig deleted +0
-27@@ -1,27 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_ARCH_H720X=y -CONFIG_ARCH_H7201=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=m -CONFIG_EXT2_FS=y -CONFIG_JFFS2_FS=y -CONFIG_DEBUG_USER=yarch/arm/configs/h7202_defconfig deleted +0
-47@@ -1,47 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MODULES=y -CONFIG_ARCH_H720X=y -CONFIG_ARCH_H7202=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,19200" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_H720X=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_USB_GADGET=m -CONFIG_USB_ZERO=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_EXT2_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=yarch/arm/mach-h720x/Kconfig deleted +0
-40@@ -1,40 +0,0 @@ -if ARCH_H720X - -menu "h720x Implementations" - -config ARCH_H7201 - bool "gms30c7201" - depends on ARCH_H720X - select CPU_H7201 - select ZONE_DMA - help - Say Y here if you are using the Hynix GMS30C7201 Reference Board - -config ARCH_H7202 - bool "hms30c7202" - depends on ARCH_H720X - select CPU_H7202 - select ZONE_DMA - help - Say Y here if you are using the Hynix HMS30C7202 Reference Board - -endmenu - -config CPU_H7201 - bool - help - Select code specific to h7201 variants - -config CPU_H7202 - bool - help - Select code specific to h7202 variants -config H7202_SERIAL23 - depends on CPU_H7202 - bool "Use serial ports 2+3" - help - Say Y here if you wish to use serial ports 2+3. They share their - pins with the keyboard matrix controller, so you have to decide. - - -endifarch/arm/mach-h720x/Makefile deleted +0
-16@@ -1,16 +0,0 @@ -# -# Makefile for the linux kernel. -# - -# Common support -obj-y := common.o -obj-m := -obj-n := -obj- := - -# Specific board support - -obj-$(CONFIG_ARCH_H7201) += h7201-eval.o -obj-$(CONFIG_ARCH_H7202) += h7202-eval.o -obj-$(CONFIG_CPU_H7201) += cpu-h7201.o -obj-$(CONFIG_CPU_H7202) += cpu-h7202.oarch/arm/mach-h720x/Makefile.boot deleted +0
-2@@ -1,2 +0,0 @@ - zreladdr-$(CONFIG_ARCH_H720X) += 0x40008000 -arch/arm/mach-h720x/common.c deleted +0
-268@@ -1,268 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/common.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* common stuff for Hynix h720x processors -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/sched.h> -#include <linux/mman.h> -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/io.h> - -#include <asm/page.h> -#include <asm/pgtable.h> -#include <asm/dma.h> -#include <mach/hardware.h> -#include <asm/irq.h> -#include <asm/system_misc.h> -#include <asm/mach/irq.h> -#include <asm/mach/map.h> -#include <mach/irqs.h> - -#include <asm/mach/dma.h> - -#if 0 -#define IRQDBG(args...) printk(args) -#else -#define IRQDBG(args...) do {} while(0) -#endif - -void __init arch_dma_init (dma_t *dma) -{ -} - -/* -* Return nsecs since last timer reload -* (timercount * (usecs perjiffie)) / (ticks per jiffie) -*/ -u32 h720x_gettimeoffset (void ) -{ -return ((CPU_REG (TIMER_VIRT ,TM0_COUNT ) * tick_usec) /LATCH ) *1000 ; -} - -/* -* mask Global irq's -*/ -static void mask_global_irq (struct irq_data *d) -{ -CPU_REG (IRQC_VIRT ,IRQC_IER ) &= ~(1 << d->irq); -} - -/* -* unmask Global irq's -*/ -static void unmask_global_irq (struct irq_data *d) -{ -CPU_REG (IRQC_VIRT ,IRQC_IER ) |= (1 << d->irq); -} - - -/* -* ack GPIO irq's -* Ack only for edge triggered int's valid -*/ -static void inline ack_gpio_irq (struct irq_data *d) -{ -u32 reg_base =GPIO_VIRT (IRQ_TO_REGNO (d->irq)); -u32 bit =IRQ_TO_BIT (d->irq); -if ( (CPU_REG (reg_base,GPIO_EDGE ) & bit)) -CPU_REG (reg_base,GPIO_CLR ) = bit; -} - -/* -* mask GPIO irq's -*/ -static void inline mask_gpio_irq (struct irq_data *d) -{ -u32 reg_base =GPIO_VIRT (IRQ_TO_REGNO (d->irq)); -u32 bit =IRQ_TO_BIT (d->irq); -CPU_REG (reg_base,GPIO_MASK ) &= ~bit; -} - -/* -* unmask GPIO irq's -*/ -static void inline unmask_gpio_irq (struct irq_data *d) -{ -u32 reg_base =GPIO_VIRT (IRQ_TO_REGNO (d->irq)); -u32 bit =IRQ_TO_BIT (d->irq); -CPU_REG (reg_base,GPIO_MASK ) |= bit; -} - -static void -h720x_gpio_handler (unsigned int mask,unsigned int irq, -struct irq_desc *desc) -{ -IRQDBG ("%s irq: %d\n" , __func__, irq); -while (mask) { -if (mask &1 ) { -IRQDBG ("handling irq %d\n" , irq); -generic_handle_irq (irq); - } - irq++; - mask >>=1 ; - } -} - -static void -h720x_gpioa_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (GPIO_A_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOA (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} - -static void -h720x_gpiob_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - mask =CPU_REG (GPIO_B_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOB (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} - -static void -h720x_gpioc_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (GPIO_C_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOC (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} - -static void -h720x_gpiod_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (GPIO_D_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOD (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} - -#ifdef CONFIG_CPU_H7202 -static void -h720x_gpioe_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (GPIO_E_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOE (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} -#endif - -static struct irq_chip h720x_global_chip = { - .irq_ack = mask_global_irq, - .irq_mask = mask_global_irq, - .irq_unmask = unmask_global_irq, -}; - -static struct irq_chip h720x_gpio_chip = { - .irq_ack = ack_gpio_irq, - .irq_mask = mask_gpio_irq, - .irq_unmask = unmask_gpio_irq, -}; - -/* -* Initialize IRQ's, mask all, enable multiplexed irq's -*/ -void __init h720x_init_irq (void ) -{ -int irq; - -/* Mask global irq's */ -CPU_REG (IRQC_VIRT ,IRQC_IER ) =0x0 ; - -/* Mask all multiplexed irq's */ -CPU_REG (GPIO_A_VIRT ,GPIO_MASK ) =0x0 ; -CPU_REG (GPIO_B_VIRT ,GPIO_MASK ) =0x0 ; -CPU_REG (GPIO_C_VIRT ,GPIO_MASK ) =0x0 ; -CPU_REG (GPIO_D_VIRT ,GPIO_MASK ) =0x0 ; - -/* Initialize global IRQ's, fast path */ -for (irq =0 ; irq <NR_GLBL_IRQS ; irq++) { -irq_set_chip_and_handler (irq, &h720x_global_chip, - handle_level_irq); -set_irq_flags (irq,IRQF_VALID |IRQF_PROBE ); - } - -/* Initialize multiplexed IRQ's, slow path */ -for (irq =IRQ_CHAINED_GPIOA (0 ) ; irq <=IRQ_CHAINED_GPIOD (31 ); irq++) { -irq_set_chip_and_handler (irq, &h720x_gpio_chip, - handle_edge_irq); -set_irq_flags (irq,IRQF_VALID ); - } -irq_set_chained_handler (IRQ_GPIOA , h720x_gpioa_demux_handler); -irq_set_chained_handler (IRQ_GPIOB , h720x_gpiob_demux_handler); -irq_set_chained_handler (IRQ_GPIOC , h720x_gpioc_demux_handler); -irq_set_chained_handler (IRQ_GPIOD , h720x_gpiod_demux_handler); - -#ifdef CONFIG_CPU_H7202 -for (irq =IRQ_CHAINED_GPIOE (0 ) ; irq <=IRQ_CHAINED_GPIOE (31 ); irq++) { -irq_set_chip_and_handler (irq, &h720x_gpio_chip, - handle_edge_irq); -set_irq_flags (irq,IRQF_VALID ); - } -irq_set_chained_handler (IRQ_GPIOE , h720x_gpioe_demux_handler); -#endif - -/* Enable multiplexed irq's */ -CPU_REG (IRQC_VIRT ,IRQC_IER ) =IRQ_ENA_MUX ; -} - -static struct map_desc h720x_io_desc[]__initdata = { - { - .virtual =IO_VIRT , - .pfn =__phys_to_pfn (IO_PHYS ), - .length =IO_SIZE , - .type =MT_DEVICE - }, -}; - -/* Initialize io tables */ -void __init h720x_map_io (void ) -{ -iotable_init (h720x_io_desc,ARRAY_SIZE (h720x_io_desc)); -} - -void h720x_restart (char mode,const char *cmd) -{ -CPU_REG (PMU_BASE ,PMU_STAT ) |=PMU_WARMRESET ; -} - -static void h720x__idle (void ) -{ -CPU_REG (PMU_BASE ,PMU_MODE ) =PMU_MODE_IDLE ; -nop (); -nop (); -CPU_REG (PMU_BASE ,PMU_MODE ) =PMU_MODE_RUN ; -nop (); -nop (); -} - -static int __init h720x_idle_init (void ) -{ - arm_pm_idle = h720x__idle; -return 0 ; -} - -arch_initcall (h720x_idle_init);arch/arm/mach-h720x/common.h deleted +0
-30@@ -1,30 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/common.h -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* Architecture specific stuff for Hynix GMS30C7201 development board -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -extern u32 h720x_gettimeoffset (void ); -extern void __init h720x_init_irq (void ); -extern void __init h720x_map_io (void ); -extern void h720x_restart (char ,const char *); - -#ifdef CONFIG_ARCH_H7202 -extern void h7202_timer_init (void ); -extern void __init init_hw_h7202 (void ); -extern void __init h7202_init_irq (void ); -extern void __init h7202_init_time (void ); -#endif - -#ifdef CONFIG_ARCH_H7201 -extern void h7201_timer_init (void ); -#endif arch/arm/mach-h720x/cpu-h7201.c deleted +0
-57@@ -1,57 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/cpu-h7201.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* processor specific stuff for the Hynix h7201 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/module.h> -#include <asm/types.h> -#include <mach/hardware.h> -#include <asm/irq.h> -#include <mach/irqs.h> -#include <asm/mach/irq.h> -#include <asm/mach/time.h> -#include "common.h" -/* -* Timer interrupt handler -*/ -static irqreturn_t -h7201_timer_interrupt (int irq,void *dev_id) -{ -CPU_REG (TIMER_VIRT ,TIMER_TOPSTAT ); -timer_tick (); - -return IRQ_HANDLED ; -} - -static struct irqaction h7201_timer_irq = { - .name ="h7201 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , - .handler = h7201_timer_interrupt, -}; - -/* -* Setup TIMER0 as system timer -*/ -void __init h7201_timer_init (void ) -{ - arch_gettimeoffset = h720x_gettimeoffset; - -CPU_REG (TIMER_VIRT ,TM0_PERIOD ) =LATCH ; -CPU_REG (TIMER_VIRT ,TM0_CTRL ) =TM_RESET ; -CPU_REG (TIMER_VIRT ,TM0_CTRL ) =TM_REPEAT |TM_START ; -CPU_REG (TIMER_VIRT ,TIMER_TOPCTRL ) =ENABLE_TM0_INTR |TIMER_ENABLE_BIT ; - -setup_irq (IRQ_TIMER0 , &h7201_timer_irq); -}arch/arm/mach-h720x/cpu-h7202.c deleted +0
-225@@ -1,225 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/cpu-h7202.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* processor specific stuff for the Hynix h7202 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/module.h> -#include <asm/types.h> -#include <mach/hardware.h> -#include <asm/irq.h> -#include <mach/irqs.h> -#include <asm/mach/irq.h> -#include <asm/mach/time.h> -#include <linux/device.h> -#include <linux/serial_8250.h> -#include "common.h" - -static struct resource h7202ps2_resources[] = { - [0 ] = { - .start =0x8002c000 , - .end =0x8002c040 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_PS2 , - .end =IRQ_PS2 , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device h7202ps2_device = { - .name ="h7202ps2" , - .id =-1 , - .num_resources =ARRAY_SIZE (h7202ps2_resources), - .resource = h7202ps2_resources, -}; - -static struct plat_serial8250_port serial_platform_data[] = { - { - .membase = (void *)SERIAL0_VIRT , - .mapbase =SERIAL0_BASE , - .irq =IRQ_UART0 , - .uartclk =2 *1843200 , - .regshift =2 , - .iotype =UPIO_MEM , - .flags =UPF_BOOT_AUTOCONF |UPF_SKIP_TEST , - }, - { - .membase = (void *)SERIAL1_VIRT , - .mapbase =SERIAL1_BASE , - .irq =IRQ_UART1 , - .uartclk =2 *1843200 , - .regshift =2 , - .iotype =UPIO_MEM , - .flags =UPF_BOOT_AUTOCONF |UPF_SKIP_TEST , - }, -#ifdef CONFIG_H7202_SERIAL23 - { - .membase = (void *)SERIAL2_VIRT , - .mapbase =SERIAL2_BASE , - .irq =IRQ_UART2 , - .uartclk =2 *1843200 , - .regshift =2 , - .iotype =UPIO_MEM , - .flags =UPF_BOOT_AUTOCONF |UPF_SKIP_TEST , - }, - { - .membase = (void *)SERIAL3_VIRT , - .mapbase =SERIAL3_BASE , - .irq =IRQ_UART3 , - .uartclk =2 *1843200 , - .regshift =2 , - .iotype =UPIO_MEM , - .flags =UPF_BOOT_AUTOCONF |UPF_SKIP_TEST , - }, -#endif - { }, -}; - -static struct platform_device serial_device = { - .name ="serial8250" , - .id =PLAT8250_DEV_PLATFORM , - .dev = { - .platform_data = serial_platform_data, - }, -}; - -static struct platform_device *devices[]__initdata = { - &h7202ps2_device, - &serial_device, -}; - -/* Although we have two interrupt lines for the timers, we only have one -* status register which clears all pending timer interrupts on reading. So -* we have to handle all timer interrupts in one place. -*/ -static void -h7202_timerx_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (TIMER_VIRT ,TIMER_TOPSTAT ); - -if ( mask &TSTAT_T0INT ) { -timer_tick (); -if ( mask ==TSTAT_T0INT ) -return ; - } - - mask >>=1 ; - irq =IRQ_TIMER1 ; -while (mask) { -if (mask &1 ) -generic_handle_irq (irq); - irq++; - mask >>=1 ; - } -} - -/* -* Timer interrupt handler -*/ -static irqreturn_t -h7202_timer_interrupt (int irq,void *dev_id) -{ -h7202_timerx_demux_handler (0 ,NULL ); -return IRQ_HANDLED ; -} - -/* -* mask multiplexed timer IRQs -*/ -static void inline __mask_timerx_irq (unsigned int irq) -{ -unsigned int bit; - bit =2 << ((irq ==IRQ_TIMER64B ) ?4 : (irq -IRQ_TIMER1 )); -CPU_REG (TIMER_VIRT ,TIMER_TOPCTRL ) &= ~bit; -} - -static void inline mask_timerx_irq (struct irq_data *d) -{ -__mask_timerx_irq (d->irq); -} - -/* -* unmask multiplexed timer IRQs -*/ -static void inline unmask_timerx_irq (struct irq_data *d) -{ -unsigned int bit; - bit =2 << ((d->irq ==IRQ_TIMER64B ) ?4 : (d->irq -IRQ_TIMER1 )); -CPU_REG (TIMER_VIRT ,TIMER_TOPCTRL ) |= bit; -} - -static struct irq_chip h7202_timerx_chip = { - .irq_ack = mask_timerx_irq, - .irq_mask = mask_timerx_irq, - .irq_unmask = unmask_timerx_irq, -}; - -static struct irqaction h7202_timer_irq = { - .name ="h7202 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , - .handler = h7202_timer_interrupt, -}; - -/* -* Setup TIMER0 as system timer -*/ -void __init h7202_timer_init (void ) -{ - arch_gettimeoffset = h720x_gettimeoffset; - -CPU_REG (TIMER_VIRT ,TM0_PERIOD ) =LATCH ; -CPU_REG (TIMER_VIRT ,TM0_CTRL ) =TM_RESET ; -CPU_REG (TIMER_VIRT ,TM0_CTRL ) =TM_REPEAT |TM_START ; -CPU_REG (TIMER_VIRT ,TIMER_TOPCTRL ) =ENABLE_TM0_INTR |TIMER_ENABLE_BIT ; - -setup_irq (IRQ_TIMER0 , &h7202_timer_irq); -} - -void __init h7202_init_irq (void ) -{ -int irq; - -CPU_REG (GPIO_E_VIRT ,GPIO_MASK ) =0x0 ; - -for (irq =IRQ_TIMER1 ; - irq <IRQ_CHAINED_TIMERX (NR_TIMERX_IRQS ); irq++) { -__mask_timerx_irq (irq); -irq_set_chip_and_handler (irq, &h7202_timerx_chip, - handle_edge_irq); -set_irq_flags (irq,IRQF_VALID ); - } -irq_set_chained_handler (IRQ_TIMERX , h7202_timerx_demux_handler); - -h720x_init_irq (); -} - -void __init init_hw_h7202 (void ) -{ -/* Enable clocks */ -CPU_REG (PMU_BASE ,PMU_PLL_CTRL ) |=PLL_2_EN |PLL_1_EN |PLL_3_MUTE ; - -CPU_REG (SERIAL0_VIRT ,SERIAL_ENABLE ) =SERIAL_ENABLE_EN ; -CPU_REG (SERIAL1_VIRT ,SERIAL_ENABLE ) =SERIAL_ENABLE_EN ; -#ifdef CONFIG_H7202_SERIAL23 -CPU_REG (SERIAL2_VIRT ,SERIAL_ENABLE ) =SERIAL_ENABLE_EN ; -CPU_REG (SERIAL3_VIRT ,SERIAL_ENABLE ) =SERIAL_ENABLE_EN ; -CPU_IO (GPIO_AMULSEL ) =AMULSEL_USIN2 |AMULSEL_USOUT2 | -AMULSEL_USIN3 |AMULSEL_USOUT3 ; -#endif - (void )platform_add_devices (devices,ARRAY_SIZE (devices)); -}arch/arm/mach-h720x/h7201-eval.c deleted +0
-38@@ -1,38 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/h7201-eval.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* Architecture specific stuff for Hynix GMS30C7201 development board -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/string.h> -#include <linux/device.h> - -#include <asm/setup.h> -#include <asm/types.h> -#include <asm/mach-types.h> -#include <asm/page.h> -#include <asm/mach/arch.h> -#include <mach/hardware.h> -#include "common.h" - -MACHINE_START (H7201 ,"Hynix GMS30C7201" ) -/* Maintainer: Robert Schwebel, Pengutronix */ - .atag_offset = 0x1000, - .map_io = h720x_map_io, - .init_irq = h720x_init_irq, - .init_time = h7201_timer_init, - .dma_zone_size = SZ_256M, - .restart = h720x_restart, -MACHINE_END arch/arm/mach-h720x/h7202-eval.c deleted +0
-81@@ -1,81 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/h7202-eval.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* Architecture specific stuff for Hynix HMS30C7202 development board -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/string.h> -#include <linux/platform_device.h> - -#include <asm/setup.h> -#include <asm/types.h> -#include <asm/mach-types.h> -#include <asm/page.h> -#include <asm/mach/arch.h> -#include <mach/irqs.h> -#include <mach/hardware.h> -#include "common.h" - -static struct resource cirrus_resources[] = { - [0 ] = { - .start =ETH0_PHYS +0x300 , - .end =ETH0_PHYS +0x300 +0x10 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_CHAINED_GPIOB (8 ), - .end =IRQ_CHAINED_GPIOB (8 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device cirrus_device = { - .name ="cirrus-cs89x0" , - .id =-1 , - .num_resources =ARRAY_SIZE (cirrus_resources), - .resource = cirrus_resources, -}; - -static struct platform_device *devices[]__initdata = { - &cirrus_device, -}; - -/* -* Hardware init. This is called early in initcalls -* Place pin inits here. So you avoid adding ugly -* #ifdef stuff to common drivers. -* Use this only, if your bootloader is not able -* to initialize the pins proper. -*/ -static void __init init_eval_h7202 (void ) -{ -init_hw_h7202 (); - (void )platform_add_devices (devices,ARRAY_SIZE (devices)); - -/* Enable interrupt on portb bit 8 (ethernet) */ -CPU_REG (GPIO_B_VIRT ,GPIO_POL ) &= ~(1 <<8 ); -CPU_REG (GPIO_B_VIRT ,GPIO_EN ) |= (1 <<8 ); -} - -MACHINE_START (H7202 ,"Hynix HMS30C7202" ) -/* Maintainer: Robert Schwebel, Pengutronix */ - .atag_offset = 0x100, - .map_io = h720x_map_io, - .init_irq = h7202_init_irq, - .init_time = h7202_timer_init, - .init_machine = init_eval_h7202, - .dma_zone_size = SZ_256M, - .restart = h720x_restart, -MACHINE_END arch/arm/mach-h720x/include/mach/boards.h deleted +0
-53@@ -1,53 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/boards.h -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* (C) 2003 Robert Schwebel <[email protected]> -* -* This file contains the board specific defines for various devices -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_HARDWARE_INCMACH_H -#error Do not include this file directly. Include asm/hardware.h instead ! -#endif - -/* Hynix H7202 developer board specific device defines */ -#ifdef CONFIG_ARCH_H7202 - -/* FLASH */ -#define H720X_FLASH_VIRT 0xd0000000 -#define H720X_FLASH_PHYS 0x00000000 -#define H720X_FLASH_SIZE 0x02000000 - -/* onboard LAN controller */ -# define ETH0_PHYS 0x08000000 - -/* Touch screen defines */ -/* GPIO Port */ -#define PEN_GPIO GPIO_B_VIRT -/* Bitmask for pen down interrupt */ -#define PEN_INT_BIT (1<<7) -/* Bitmask for pen up interrupt */ -#define PEN_ENA_BIT (1<<6) -/* pen up interrupt */ -#define IRQ_PEN IRQ_MUX_GPIOB(7) - -#endif - -/* Hynix H7201 developer board specific device defines */ -#if defined (CONFIG_ARCH_H7201 ) -/* ROM DISK SPACE */ -#define ROM_DISK_BASE 0xc1800000 -#define ROM_DISK_START 0x41800000 -#define ROM_DISK_SIZE 0x00700000 - -/* SRAM DISK SPACE */ -#define SRAM_DISK_BASE 0xf1000000 -#define SRAM_DISK_START 0x04000000 -#define SRAM_DISK_SIZE 0x00400000 -#endif -arch/arm/mach-h720x/include/mach/debug-macro.S deleted +0
-40@@ -1,40 +0,0 @@ -/* arch/arm/mach-h720x/include/mach/debug-macro.S - * - * Debugging macro include header - * - * Copyright (C) 1994-1999 Russell King - * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * -*/ - -#include <mach/hardware.h> - - .equ io_virt, IO_VIRT - .equ io_phys, IO_PHYS - - .macro addruart, rp, rv, tmp - mov \rp, #0x00020000 @ UART1 - add \rv, \rp, #io_virt @ virtual address - add \rp, \rp, #io_phys @ physical base address - .endm - - .macro senduart,rd,rx - str \rd, [\rx, #0x0] @ UARTDR - - .endm - - .macro waituart,rd,rx -1001: ldr \rd, [\rx, #0x18] @ UARTFLG - tst \rd, #1 << 5 @ UARTFLGUTXFF - 1 when full - bne 1001b - .endm - - .macro busyuart,rd,rx -1001: ldr \rd, [\rx, #0x18] @ UARTFLG - tst \rd, #1 << 3 @ UARTFLGUBUSY - 1 when busy - bne 1001b - .endmarch/arm/mach-h720x/include/mach/entry-macro.S deleted +0
-57@@ -1,57 +0,0 @@ -/* - * arch/arm/mach-h720x/include/mach/entry-macro.S - * - * Low-level IRQ helper macros for Hynix HMS720x based platforms - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - - .macro get_irqnr_preamble, base, tmp - .endm - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp -#if defined (CONFIG_CPU_H7201) || defined (CONFIG_CPU_H7202) - @ we could use the id register on H7202, but this is not - @ properly updated when we come back from asm_do_irq - @ without a previous return from interrupt - @ (see loops below in irq_svc, irq_usr) - @ We see unmasked pending ints only, as the masked pending ints - @ are not visible here - - mov \base, #0xf0000000 @ base register - orr \base, \base, #0x24000 @ irqbase - ldr \irqstat, [\base, #0x04] @ get interrupt status -#if defined (CONFIG_CPU_H7201) - ldr \tmp, =0x001fffff -#else - mvn \tmp, #0xc0000000 -#endif - and \irqstat, \irqstat, \tmp @ mask out unused ints - mov \irqnr, #0 - - mov \tmp, #0xff00 - orr \tmp, \tmp, #0xff - tst \irqstat, \tmp - addeq \irqnr, \irqnr, #16 - moveq \irqstat, \irqstat, lsr #16 - tst \irqstat, #255 - addeq \irqnr, \irqnr, #8 - moveq \irqstat, \irqstat, lsr #8 - tst \irqstat, #15 - addeq \irqnr, \irqnr, #4 - moveq \irqstat, \irqstat, lsr #4 - tst \irqstat, #3 - addeq \irqnr, \irqnr, #2 - moveq \irqstat, \irqstat, lsr #2 - tst \irqstat, #1 - addeq \irqnr, \irqnr, #1 - moveq \irqstat, \irqstat, lsr #1 - tst \irqstat, #1 @ bit 0 should be set - .endm - -#else -#error hynix processor selection missmatch -#endif -arch/arm/mach-h720x/include/mach/h7201-regs.h deleted +0
-67@@ -1,67 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/h7201-regs.h -* -* Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. -* (C) 2003 Thomas Gleixner <[email protected]> -* (C) 2003 Robert Schwebel <[email protected]> -* (C) 2004 Sascha Hauer <[email protected]> -* -* This file contains the hardware definitions of the h720x processors -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* Do not add implementations specific defines here. This files contains -* only defines of the onchip peripherals. Add those defines to boards.h, -* which is included by this file. -*/ - -#define SERIAL2_VIRT (IO_VIRT + 0x50100) -#define SERIAL3_VIRT (IO_VIRT + 0x50200) - -/* -* PCMCIA -*/ -#define PCMCIA0_ATT_BASE 0xe5000000 -#define PCMCIA0_ATT_SIZE 0x00200000 -#define PCMCIA0_ATT_START 0x20000000 -#define PCMCIA0_MEM_BASE 0xe5200000 -#define PCMCIA0_MEM_SIZE 0x00200000 -#define PCMCIA0_MEM_START 0x24000000 -#define PCMCIA0_IO_BASE 0xe5400000 -#define PCMCIA0_IO_SIZE 0x00200000 -#define PCMCIA0_IO_START 0x28000000 - -#define PCMCIA1_ATT_BASE 0xe5600000 -#define PCMCIA1_ATT_SIZE 0x00200000 -#define PCMCIA1_ATT_START 0x30000000 -#define PCMCIA1_MEM_BASE 0xe5800000 -#define PCMCIA1_MEM_SIZE 0x00200000 -#define PCMCIA1_MEM_START 0x34000000 -#define PCMCIA1_IO_BASE 0xe5a00000 -#define PCMCIA1_IO_SIZE 0x00200000 -#define PCMCIA1_IO_START 0x38000000 - -#define PRIME3C_BASE 0xf0050000 -#define PRIME3C_SIZE 0x00001000 -#define PRIME3C_START 0x10000000 - -/* VGA Controller */ -#define VGA_RAMBASE 0x50 -#define VGA_TIMING0 0x60 -#define VGA_TIMING1 0x64 -#define VGA_TIMING2 0x68 -#define VGA_TIMING3 0x6c - -#define LCD_CTRL_VGA_ENABLE 0x00000100 -#define LCD_CTRL_VGA_BPP_MASK 0x00000600 -#define LCD_CTRL_VGA_4BPP 0x00000000 -#define LCD_CTRL_VGA_8BPP 0x00000200 -#define LCD_CTRL_VGA_16BPP 0x00000300 -#define LCD_CTRL_SHARE_DMA 0x00000800 -#define LCD_CTRL_VDE 0x00100000 -#define LCD_CTRL_LPE 0x00400000/* LCD Power enable */ -#define LCD_CTRL_BLE 0x00800000/* LCD backlight enable */ - -#define VGA_PALETTE_BASE (IO_VIRT + 0x10800)arch/arm/mach-h720x/include/mach/h7202-regs.h deleted +0
-155@@ -1,155 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/h7202-regs.h -* -* Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. -* (C) 2003 Thomas Gleixner <[email protected]> -* (C) 2003 Robert Schwebel <[email protected]> -* (C) 2004 Sascha Hauer <[email protected]> -* -* This file contains the hardware definitions of the h720x processors -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* Do not add implementations specific defines here. This files contains -* only defines of the onchip peripherals. Add those defines to boards.h, -* which is included by this file. -*/ - -#define SERIAL2_OFS 0x2d000 -#define SERIAL2_BASE (IO_PHYS + SERIAL2_OFS) -#define SERIAL2_VIRT (IO_VIRT + SERIAL2_OFS) -#define SERIAL3_OFS 0x2e000 -#define SERIAL3_BASE (IO_PHYS + SERIAL3_OFS) -#define SERIAL3_VIRT (IO_VIRT + SERIAL3_OFS) - -/* Matrix Keyboard Controller */ -#define KBD_VIRT (IO_VIRT + 0x22000) -#define KBD_KBCR 0x00 -#define KBD_KBSC 0x04 -#define KBD_KBTR 0x08 -#define KBD_KBVR0 0x0C -#define KBD_KBVR1 0x10 -#define KBD_KBSR 0x18 - -#define KBD_KBCR_SCANENABLE (1 << 7) -#define KBD_KBCR_NPOWERDOWN (1 << 2) -#define KBD_KBCR_CLKSEL_MASK (3) -#define KBD_KBCR_CLKSEL_PCLK2 0x0 -#define KBD_KBCR_CLKSEL_PCLK128 0x1 -#define KBD_KBCR_CLKSEL_PCLK256 0x2 -#define KBD_KBCR_CLKSEL_PCLK512 0x3 - -#define KBD_KBSR_INTR (1 << 0) -#define KBD_KBSR_WAKEUP (1 << 1) - -/* USB device controller */ - -#define USBD_BASE (IO_VIRT + 0x12000) -#define USBD_LENGTH 0x3C - -#define USBD_GCTRL 0x00 -#define USBD_EPCTRL 0x04 -#define USBD_INTMASK 0x08 -#define USBD_INTSTAT 0x0C -#define USBD_PWR 0x10 -#define USBD_DMARXTX 0x14 -#define USBD_DEVID 0x18 -#define USBD_DEVCLASS 0x1C -#define USBD_INTCLASS 0x20 -#define USBD_SETUP0 0x24 -#define USBD_SETUP1 0x28 -#define USBD_ENDP0RD 0x2C -#define USBD_ENDP0WT 0x30 -#define USBD_ENDP1RD 0x34 -#define USBD_ENDP2WT 0x38 - -/* PS/2 port */ -#define PSDATA 0x00 -#define PSSTAT 0x04 -#define PSSTAT_TXEMPTY (1<<0) -#define PSSTAT_TXBUSY (1<<1) -#define PSSTAT_RXFULL (1<<2) -#define PSSTAT_RXBUSY (1<<3) -#define PSSTAT_CLKIN (1<<4) -#define PSSTAT_DATAIN (1<<5) -#define PSSTAT_PARITY (1<<6) - -#define PSCONF 0x08 -#define PSCONF_ENABLE (1<<0) -#define PSCONF_TXINTEN (1<<2) -#define PSCONF_RXINTEN (1<<3) -#define PSCONF_FORCECLKLOW (1<<4) -#define PSCONF_FORCEDATLOW (1<<5) -#define PSCONF_LCE (1<<6) - -#define PSINTR 0x0C -#define PSINTR_TXINT (1<<0) -#define PSINTR_RXINT (1<<1) -#define PSINTR_PAR (1<<2) -#define PSINTR_RXTO (1<<3) -#define PSINTR_TXTO (1<<4) - -#define PSTDLO 0x10/* clk low before start transmission */ -#define PSTPRI 0x14/* PRI clock */ -#define PSTXMT 0x18/* maximum transmission time */ -#define PSTREC 0x20/* maximum receive time */ -#define PSPWDN 0x3c - -/* ADC converter */ -#define ADC_BASE (IO_VIRT + 0x29000) -#define ADC_CR 0x00 -#define ADC_TSCTRL 0x04 -#define ADC_BT_CTRL 0x08 -#define ADC_MC_CTRL 0x0C -#define ADC_STATUS 0x10 - -/* ADC control register bits */ -#define ADC_CR_PW_CTRL 0x80 -#define ADC_CR_DIRECTC 0x04 -#define ADC_CR_CONTIME_NO 0x00 -#define ADC_CR_CONTIME_2 0x04 -#define ADC_CR_CONTIME_4 0x08 -#define ADC_CR_CONTIME_ADE 0x0c -#define ADC_CR_LONGCALTIME 0x01 - -/* ADC touch panel register bits */ -#define ADC_TSCTRL_ENABLE 0x80 -#define ADC_TSCTRL_INTR 0x40 -#define ADC_TSCTRL_SWBYPSS 0x20 -#define ADC_TSCTRL_SWINVT 0x10 -#define ADC_TSCTRL_S400 0x03 -#define ADC_TSCTRL_S200 0x02 -#define ADC_TSCTRL_S100 0x01 -#define ADC_TSCTRL_S50 0x00 - -/* ADC Interrupt Status Register bits */ -#define ADC_STATUS_TS_BIT 0x80 -#define ADC_STATUS_MBT_BIT 0x40 -#define ADC_STATUS_BBT_BIT 0x20 -#define ADC_STATUS_MIC_BIT 0x10 - -/* Touch data registers */ -#define ADC_TS_X0X1 0x30 -#define ADC_TS_X2X3 0x34 -#define ADC_TS_Y0Y1 0x38 -#define ADC_TS_Y2Y3 0x3c -#define ADC_TS_X4X5 0x40 -#define ADC_TS_X6X7 0x44 -#define ADC_TS_Y4Y5 0x48 -#define ADC_TS_Y6Y7 0x50 - -/* battery data */ -#define ADC_MB_DATA 0x54 -#define ADC_BB_DATA 0x58 - -/* Sound data register */ -#define ADC_SD_DAT0 0x60 -#define ADC_SD_DAT1 0x64 -#define ADC_SD_DAT2 0x68 -#define ADC_SD_DAT3 0x6c -#define ADC_SD_DAT4 0x70 -#define ADC_SD_DAT5 0x74 -#define ADC_SD_DAT6 0x78 -#define ADC_SD_DAT7 0x7carch/arm/mach-h720x/include/mach/hardware.h deleted +0
-190@@ -1,190 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/hardware.h -* -* Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. -* (C) 2003 Thomas Gleixner <[email protected]> -* (C) 2003 Robert Schwebel <[email protected]> -* -* This file contains the hardware definitions of the h720x processors -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* Do not add implementations specific defines here. This files contains -* only defines of the onchip peripherals. Add those defines to boards.h, -* which is included by this file. -*/ - -#ifndef __ASM_ARCH_HARDWARE_H -#define __ASM_ARCH_HARDWARE_H - -#define IOCLK (3686400L) - -/* Onchip peripherals */ - -#define IO_VIRT 0xf0000000/* IO peripherals */ -#define IO_PHYS 0x80000000 -#define IO_SIZE 0x00050000 - -#ifdef CONFIG_CPU_H7202 -#include "h7202-regs.h" -#elif definedCONFIG_CPU_H7201 -#include "h7201-regs.h" -#else -#error machine definition mismatch -#endif - -/* Macro to access the CPU IO */ -#define CPU_IO (x) (*(volatile u32*)(x)) - -/* Macro to access general purpose regs (base, offset) */ -#define CPU_REG (x,y) CPU_IO(x+y) - -/* Macro to access irq related regs */ -#define IRQ_REG (x) CPU_REG(IRQC_VIRT,x) - -/* CPU registers */ -/* general purpose I/O */ -#define GPIO_VIRT (x) (IO_VIRT + 0x23000 + ((x)<<5)) -#define GPIO_A_VIRT (GPIO_VIRT(0)) -#define GPIO_B_VIRT (GPIO_VIRT(1)) -#define GPIO_C_VIRT (GPIO_VIRT(2)) -#define GPIO_D_VIRT (GPIO_VIRT(3)) -#define GPIO_E_VIRT (GPIO_VIRT(4)) -#define GPIO_AMULSEL (GPIO_VIRT(0) + 0xA4) - -#define AMULSEL_USIN2 (1<<5) -#define AMULSEL_USOUT2 (1<<6) -#define AMULSEL_USIN3 (1<<13) -#define AMULSEL_USOUT3 (1<<14) -#define AMULSEL_IRDIN (1<<15) -#define AMULSEL_IRDOUT (1<<7) - -/* Register offsets general purpose I/O */ -#define GPIO_DATA 0x00 -#define GPIO_DIR 0x04 -#define GPIO_MASK 0x08 -#define GPIO_STAT 0x0C -#define GPIO_EDGE 0x10 -#define GPIO_CLR 0x14 -#define GPIO_POL 0x18 -#define GPIO_EN 0x1C - -/*interrupt controller */ -#define IRQC_VIRT (IO_VIRT + 0x24000) -/* register offset interrupt controller */ -#define IRQC_IER 0x00 -#define IRQC_ISR 0x04 - -/* timer unit */ -#define TIMER_VIRT (IO_VIRT + 0x25000) -/* Register offsets timer unit */ -#define TM0_PERIOD 0x00 -#define TM0_COUNT 0x08 -#define TM0_CTRL 0x10 -#define TM1_PERIOD 0x20 -#define TM1_COUNT 0x28 -#define TM1_CTRL 0x30 -#define TM2_PERIOD 0x40 -#define TM2_COUNT 0x48 -#define TM2_CTRL 0x50 -#define TIMER_TOPCTRL 0x60 -#define TIMER_TOPSTAT 0x64 -#define T64_COUNTL 0x80 -#define T64_COUNTH 0x84 -#define T64_CTRL 0x88 -#define T64_BASEL 0x94 -#define T64_BASEH 0x98 -/* Bitmaks timer unit TOPSTAT reg */ -#define TSTAT_T0INT 0x1 -#define TSTAT_T1INT 0x2 -#define TSTAT_T2INT 0x4 -#define TSTAT_T3INT 0x8 -/* Bit description of TMx_CTRL register */ -#define TM_START 0x1 -#define TM_REPEAT 0x2 -#define TM_RESET 0x4 -/* Bit description of TIMER_CTRL register */ -#define ENABLE_TM0_INTR 0x1 -#define ENABLE_TM1_INTR 0x2 -#define ENABLE_TM2_INTR 0x4 -#define TIMER_ENABLE_BIT 0x8 -#define ENABLE_TIMER64 0x10 -#define ENABLE_TIMER64_INT 0x20 - -/* PMU & PLL */ -#define PMU_BASE (IO_VIRT + 0x1000) -#define PMU_MODE 0x00 -#define PMU_STAT 0x20 -#define PMU_PLL_CTRL 0x28 - -/* PMU Mode bits */ -#define PMU_MODE_SLOW 0x00 -#define PMU_MODE_RUN 0x01 -#define PMU_MODE_IDLE 0x02 -#define PMU_MODE_SLEEP 0x03 -#define PMU_MODE_INIT 0x04 -#define PMU_MODE_DEEPSLEEP 0x07 -#define PMU_MODE_WAKEUP 0x08 - -/* PMU ... */ -#define PLL_2_EN 0x8000 -#define PLL_1_EN 0x4000 -#define PLL_3_MUTE 0x0080 - -/* Control bits for PMU/ PLL */ -#define PMU_WARMRESET 0x00010000 -#define PLL_CTRL_MASK23 0x000080ff - -/* LCD Controller */ -#define LCD_BASE (IO_VIRT + 0x10000) -#define LCD_CTRL 0x00 -#define LCD_STATUS 0x04 -#define LCD_STATUS_M 0x08 -#define LCD_INTERRUPT 0x0C -#define LCD_DBAR 0x10 -#define LCD_DCAR 0x14 -#define LCD_TIMING0 0x20 -#define LCD_TIMING1 0x24 -#define LCD_TIMING2 0x28 -#define LCD_TEST 0x40 - -/* LCD Control Bits */ -#define LCD_CTRL_LCD_ENABLE 0x00000001 -/* Bits per pixel */ -#define LCD_CTRL_LCD_BPP_MASK 0x00000006 -#define LCD_CTRL_LCD_4BPP 0x00000000 -#define LCD_CTRL_LCD_8BPP 0x00000002 -#define LCD_CTRL_LCD_16BPP 0x00000004 -#define LCD_CTRL_LCD_BW 0x00000008 -#define LCD_CTRL_LCD_TFT 0x00000010 -#define LCD_CTRL_BGR 0x00001000 -#define LCD_CTRL_LCD_VCOMP 0x00080000 -#define LCD_CTRL_LCD_MONO8 0x00200000 -#define LCD_CTRL_LCD_PWR 0x00400000 -#define LCD_CTRL_LCD_BLE 0x00800000 -#define LCD_CTRL_LDBUSEN 0x01000000 - -/* Palette */ -#define LCD_PALETTE_BASE (IO_VIRT + 0x10400) - -/* Serial ports */ -#define SERIAL0_OFS 0x20000 -#define SERIAL0_VIRT (IO_VIRT + SERIAL0_OFS) -#define SERIAL0_BASE (IO_PHYS + SERIAL0_OFS) - -#define SERIAL1_OFS 0x21000 -#define SERIAL1_VIRT (IO_VIRT + SERIAL1_OFS) -#define SERIAL1_BASE (IO_PHYS + SERIAL1_OFS) - -#define SERIAL_ENABLE 0x30 -#define SERIAL_ENABLE_EN (1<<0) - -/* General defines to pacify gcc */ - -#define __ASM_ARCH_HARDWARE_INCMACH_H -#include "boards.h" -#undef __ASM_ARCH_HARDWARE_INCMACH_H - -#endif /* __ASM_ARCH_HARDWARE_H */ arch/arm/mach-h720x/include/mach/irqs.h deleted +0
-116@@ -1,116 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/irqs.h -* -* Copyright (C) 2000 Jungjun Kim -* (C) 2003 Robert Schwebel <[email protected]> -* (C) 2003 Thomas Gleixner <[email protected]> -* -*/ - -#ifndef __ASM_ARCH_IRQS_H -#define __ASM_ARCH_IRQS_H - -#if defined (CONFIG_CPU_H7201 ) - -#define IRQ_PMU 0/* 0x000001 */ -#define IRQ_DMA 1/* 0x000002 */ -#define IRQ_LCD 2/* 0x000004 */ -#define IRQ_VGA 3/* 0x000008 */ -#define IRQ_PCMCIA1 4/* 0x000010 */ -#define IRQ_PCMCIA2 5/* 0x000020 */ -#define IRQ_AFE 6/* 0x000040 */ -#define IRQ_AIC 7/* 0x000080 */ -#define IRQ_KEYBOARD 8/* 0x000100 */ -#define IRQ_TIMER0 9/* 0x000200 */ -#define IRQ_RTC 10/* 0x000400 */ -#define IRQ_SOUND 11/* 0x000800 */ -#define IRQ_USB 12/* 0x001000 */ -#define IRQ_IrDA 13/* 0x002000 */ -#define IRQ_UART0 14/* 0x004000 */ -#define IRQ_UART1 15/* 0x008000 */ -#define IRQ_SPI 16/* 0x010000 */ -#define IRQ_GPIOA 17/* 0x020000 */ -#define IRQ_GPIOB 18/* 0x040000 */ -#define IRQ_GPIOC 19/* 0x080000 */ -#define IRQ_GPIOD 20/* 0x100000 */ -#define IRQ_CommRX 21/* 0x200000 */ -#define IRQ_CommTX 22/* 0x400000 */ -#define IRQ_Soft 23/* 0x800000 */ - -#define NR_GLBL_IRQS 24 - -#define IRQ_CHAINED_GPIOA (x) (NR_GLBL_IRQS + x) -#define IRQ_CHAINED_GPIOB (x) (IRQ_CHAINED_GPIOA(32) + x) -#define IRQ_CHAINED_GPIOC (x) (IRQ_CHAINED_GPIOB(32) + x) -#define IRQ_CHAINED_GPIOD (x) (IRQ_CHAINED_GPIOC(32) + x) -#define NR_IRQS IRQ_CHAINED_GPIOD(32) - -/* Enable mask for multiplexed interrupts */ -#define IRQ_ENA_MUX (1<<IRQ_GPIOA) | (1<<IRQ_GPIOB) \ - | (1<<IRQ_GPIOC) | (1<<IRQ_GPIOD) - - -#elif defined (CONFIG_CPU_H7202 ) - -#define IRQ_PMU 0/* 0x00000001 */ -#define IRQ_DMA 1/* 0x00000002 */ -#define IRQ_LCD 2/* 0x00000004 */ -#define IRQ_SOUND 3/* 0x00000008 */ -#define IRQ_I2S 4/* 0x00000010 */ -#define IRQ_USB 5/* 0x00000020 */ -#define IRQ_MMC 6/* 0x00000040 */ -#define IRQ_RTC 7/* 0x00000080 */ -#define IRQ_UART0 8/* 0x00000100 */ -#define IRQ_UART1 9/* 0x00000200 */ -#define IRQ_UART2 10/* 0x00000400 */ -#define IRQ_UART3 11/* 0x00000800 */ -#define IRQ_KBD 12/* 0x00001000 */ -#define IRQ_PS2 13/* 0x00002000 */ -#define IRQ_AIC 14/* 0x00004000 */ -#define IRQ_TIMER0 15/* 0x00008000 */ -#define IRQ_TIMERX 16/* 0x00010000 */ -#define IRQ_WDT 17/* 0x00020000 */ -#define IRQ_CAN0 18/* 0x00040000 */ -#define IRQ_CAN1 19/* 0x00080000 */ -#define IRQ_EXT0 20/* 0x00100000 */ -#define IRQ_EXT1 21/* 0x00200000 */ -#define IRQ_GPIOA 22/* 0x00400000 */ -#define IRQ_GPIOB 23/* 0x00800000 */ -#define IRQ_GPIOC 24/* 0x01000000 */ -#define IRQ_GPIOD 25/* 0x02000000 */ -#define IRQ_GPIOE 26/* 0x04000000 */ -#define IRQ_COMMRX 27/* 0x08000000 */ -#define IRQ_COMMTX 28/* 0x10000000 */ -#define IRQ_SMC 29/* 0x20000000 */ -#define IRQ_Soft 30/* 0x40000000 */ -#define IRQ_RESERVED1 31/* 0x80000000 */ -#define NR_GLBL_IRQS 32 - -#define NR_TIMERX_IRQS 3 - -#define IRQ_CHAINED_GPIOA (x) (NR_GLBL_IRQS + x) -#define IRQ_CHAINED_GPIOB (x) (IRQ_CHAINED_GPIOA(32) + x) -#define IRQ_CHAINED_GPIOC (x) (IRQ_CHAINED_GPIOB(32) + x) -#define IRQ_CHAINED_GPIOD (x) (IRQ_CHAINED_GPIOC(32) + x) -#define IRQ_CHAINED_GPIOE (x) (IRQ_CHAINED_GPIOD(32) + x) -#define IRQ_CHAINED_TIMERX (x) (IRQ_CHAINED_GPIOE(32) + x) -#define IRQ_TIMER1 (IRQ_CHAINED_TIMERX(0)) -#define IRQ_TIMER2 (IRQ_CHAINED_TIMERX(1)) -#define IRQ_TIMER64B (IRQ_CHAINED_TIMERX(2)) - -#define NR_IRQS (IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS)) - -/* Enable mask for multiplexed interrupts */ -#define IRQ_ENA_MUX (1<<IRQ_TIMERX) | (1<<IRQ_GPIOA) | (1<<IRQ_GPIOB) | \ - (1<<IRQ_GPIOC) | (1<<IRQ_GPIOD) | (1<<IRQ_GPIOE) | \ - (1<<IRQ_TIMERX) - -#else -#error cpu definition mismatch -#endif - -/* decode irq number to register number */ -#define IRQ_TO_REGNO (irq) ((irq - NR_GLBL_IRQS) >> 5) -#define IRQ_TO_BIT (irq) (1 << ((irq - NR_GLBL_IRQS) % 32)) - -#endif arch/arm/mach-h720x/include/mach/isa-dma.h deleted +0
-19@@ -1,19 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/isa-dma.h -* -* Architecture DMA routes -* -* Copyright (C) 1997.1998 Russell King -*/ -#ifndef __ASM_ARCH_DMA_H -#define __ASM_ARCH_DMA_H - -#if defined (CONFIG_CPU_H7201 ) -#define MAX_DMA_CHANNELS 3 -#elif defined (CONFIG_CPU_H7202 ) -#define MAX_DMA_CHANNELS 4 -#else -#error processor definition missmatch -#endif - -#endif /* __ASM_ARCH_DMA_H */ arch/arm/mach-h720x/include/mach/timex.h deleted +0
-15@@ -1,15 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/timex.h -* Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_TIMEX -#define __ASM_ARCH_TIMEX - -#define CLOCK_TICK_RATE 3686400 - -#endif arch/arm/mach-h720x/include/mach/uncompress.h deleted +0
-36@@ -1,36 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/uncompress.h -* -* Copyright (C) 2001-2002 Jungjun Kim -*/ - -#ifndef __ASM_ARCH_UNCOMPRESS_H -#define __ASM_ARCH_UNCOMPRESS_H - -#include <mach/hardware.h> - -#define LSR 0x14 -#define TEMPTY 0x40 - -static inline void putc (int c) -{ -volatile unsigned char *p = (volatile unsigned char *)(IO_PHYS +0x20000 ); - -/* wait until transmit buffer is empty */ -while ((p[LSR ] &TEMPTY ) ==0x0 ) -barrier (); - -/* write next character */ - *p = c; -} - -static inline void flush (void ) -{ -} - -/* -* nothing to do -*/ -#define arch_decomp_setup () - -#endif Signature · 1 line
1.8.1.2
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 5/6 ARM: kill Hynix h720x platform
In reply to Arnd BergmannQuoted 8 lines · Arnd Bergmann
The platform was merged about 10 years ago, and has seen few updates for most of the time since. The people that merged the code seem no longer interested in it either, so let's remove it now.
Signed-off-by Arnd Bergmann <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Robert Schwebel <[email protected]>Cc Sascha Hauer <[email protected]>
Sascha
Quoted 1,796 lines
--- arch/arm/Kconfig | 10 - arch/arm/Makefile | 1 - arch/arm/configs/h7201_defconfig | 27 --- arch/arm/configs/h7202_defconfig | 47 ----- arch/arm/mach-h720x/Kconfig | 40 ---- arch/arm/mach-h720x/Makefile | 16 -- arch/arm/mach-h720x/Makefile.boot | 2 - arch/arm/mach-h720x/common.c | 268 ------------------------- arch/arm/mach-h720x/common.h | 30 --- arch/arm/mach-h720x/cpu-h7201.c | 57 ------ arch/arm/mach-h720x/cpu-h7202.c | 225 --------------------- arch/arm/mach-h720x/h7201-eval.c | 38 ---- arch/arm/mach-h720x/h7202-eval.c | 81 -------- arch/arm/mach-h720x/include/mach/boards.h | 53 ----- arch/arm/mach-h720x/include/mach/debug-macro.S | 40 ---- arch/arm/mach-h720x/include/mach/entry-macro.S | 57 ------ arch/arm/mach-h720x/include/mach/h7201-regs.h | 67 ------- arch/arm/mach-h720x/include/mach/h7202-regs.h | 155 -------------- arch/arm/mach-h720x/include/mach/hardware.h | 190 ------------------ arch/arm/mach-h720x/include/mach/irqs.h | 116 ----------- arch/arm/mach-h720x/include/mach/isa-dma.h | 19 -- arch/arm/mach-h720x/include/mach/timex.h | 15 -- arch/arm/mach-h720x/include/mach/uncompress.h | 36 ---- 23 files changed, 1590 deletions(-) delete mode 100644 arch/arm/configs/h7201_defconfig delete mode 100644 arch/arm/configs/h7202_defconfig delete mode 100644 arch/arm/mach-h720x/Kconfig delete mode 100644 arch/arm/mach-h720x/Makefile delete mode 100644 arch/arm/mach-h720x/Makefile.boot delete mode 100644 arch/arm/mach-h720x/common.c delete mode 100644 arch/arm/mach-h720x/common.h delete mode 100644 arch/arm/mach-h720x/cpu-h7201.c delete mode 100644 arch/arm/mach-h720x/cpu-h7202.c delete mode 100644 arch/arm/mach-h720x/h7201-eval.c delete mode 100644 arch/arm/mach-h720x/h7202-eval.c delete mode 100644 arch/arm/mach-h720x/include/mach/boards.h delete mode 100644 arch/arm/mach-h720x/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/h7201-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/h7202-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/hardware.h delete mode 100644 arch/arm/mach-h720x/include/mach/irqs.h delete mode 100644 arch/arm/mach-h720x/include/mach/isa-dma.h delete mode 100644 arch/arm/mach-h720x/include/mach/timex.h delete mode 100644 arch/arm/mach-h720x/include/mach/uncompress.harch/arm/Kconfig +0
-10@@ -485,14 +485,6 @@ config ARCH_NETX help This enables support for systems based on the Hilscher NetX Soc -config ARCH_H720X - bool "Hynix HMS720x-based" - select ARCH_USES_GETTIMEOFFSET - select CPU_ARM720T - select ISA_DMA_API - help - This enables support for systems based on the Hynix HMS720x - config ARCH_IOP13XX bool "IOP13xx-based" depends on MMU@@ -1041,8 +1033,6 @@ source "arch/arm/mach-ep93xx/Kconfig" source "arch/arm/mach-footbridge/Kconfig" -source "arch/arm/mach-h720x/Kconfig" - source "arch/arm/mach-highbank/Kconfig" source "arch/arm/mach-integrator/Kconfig"arch/arm/Makefile +0
-1@@ -145,7 +145,6 @@ machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_DOVE) += dove machine-$(CONFIG_ARCH_EBSA110) += ebsa110 machine-$(CONFIG_ARCH_EP93XX) += ep93xx -machine-$(CONFIG_ARCH_H720X) += h720x machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP13XX) += iop13xxarch/arm/configs/h7201_defconfig deleted +0
-27@@ -1,27 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_ARCH_H720X=y -CONFIG_ARCH_H7201=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=m -CONFIG_EXT2_FS=y -CONFIG_JFFS2_FS=y -CONFIG_DEBUG_USER=yarch/arm/configs/h7202_defconfig deleted +0
-47@@ -1,47 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MODULES=y -CONFIG_ARCH_H720X=y -CONFIG_ARCH_H7202=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,19200" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_H720X=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_USB_GADGET=m -CONFIG_USB_ZERO=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_EXT2_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=yarch/arm/mach-h720x/Kconfig deleted +0
-40@@ -1,40 +0,0 @@ -if ARCH_H720X - -menu "h720x Implementations" - -config ARCH_H7201 - bool "gms30c7201" - depends on ARCH_H720X - select CPU_H7201 - select ZONE_DMA - help - Say Y here if you are using the Hynix GMS30C7201 Reference Board - -config ARCH_H7202 - bool "hms30c7202" - depends on ARCH_H720X - select CPU_H7202 - select ZONE_DMA - help - Say Y here if you are using the Hynix HMS30C7202 Reference Board - -endmenu - -config CPU_H7201 - bool - help - Select code specific to h7201 variants - -config CPU_H7202 - bool - help - Select code specific to h7202 variants -config H7202_SERIAL23 - depends on CPU_H7202 - bool "Use serial ports 2+3" - help - Say Y here if you wish to use serial ports 2+3. They share their - pins with the keyboard matrix controller, so you have to decide. - - -endifarch/arm/mach-h720x/Makefile deleted +0
-16@@ -1,16 +0,0 @@ -# -# Makefile for the linux kernel. -# - -# Common support -obj-y := common.o -obj-m := -obj-n := -obj- := - -# Specific board support - -obj-$(CONFIG_ARCH_H7201) += h7201-eval.o -obj-$(CONFIG_ARCH_H7202) += h7202-eval.o -obj-$(CONFIG_CPU_H7201) += cpu-h7201.o -obj-$(CONFIG_CPU_H7202) += cpu-h7202.oarch/arm/mach-h720x/Makefile.boot deleted +0
-2@@ -1,2 +0,0 @@ - zreladdr-$(CONFIG_ARCH_H720X) += 0x40008000 -arch/arm/mach-h720x/common.c deleted +0
-268@@ -1,268 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/common.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* common stuff for Hynix h720x processors -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/sched.h> -#include <linux/mman.h> -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/io.h> - -#include <asm/page.h> -#include <asm/pgtable.h> -#include <asm/dma.h> -#include <mach/hardware.h> -#include <asm/irq.h> -#include <asm/system_misc.h> -#include <asm/mach/irq.h> -#include <asm/mach/map.h> -#include <mach/irqs.h> - -#include <asm/mach/dma.h> - -#if 0 -#define IRQDBG(args...) printk(args) -#else -#define IRQDBG(args...) do {} while(0) -#endif - -void __init arch_dma_init (dma_t *dma) -{ -} - -/* -* Return nsecs since last timer reload -* (timercount * (usecs perjiffie)) / (ticks per jiffie) -*/ -u32 h720x_gettimeoffset (void ) -{ -return ((CPU_REG (TIMER_VIRT ,TM0_COUNT ) * tick_usec) /LATCH ) *1000 ; -} - -/* -* mask Global irq's -*/ -static void mask_global_irq (struct irq_data *d) -{ -CPU_REG (IRQC_VIRT ,IRQC_IER ) &= ~(1 << d->irq); -} - -/* -* unmask Global irq's -*/ -static void unmask_global_irq (struct irq_data *d) -{ -CPU_REG (IRQC_VIRT ,IRQC_IER ) |= (1 << d->irq); -} - - -/* -* ack GPIO irq's -* Ack only for edge triggered int's valid -*/ -static void inline ack_gpio_irq (struct irq_data *d) -{ -u32 reg_base =GPIO_VIRT (IRQ_TO_REGNO (d->irq)); -u32 bit =IRQ_TO_BIT (d->irq); -if ( (CPU_REG (reg_base,GPIO_EDGE ) & bit)) -CPU_REG (reg_base,GPIO_CLR ) = bit; -} - -/* -* mask GPIO irq's -*/ -static void inline mask_gpio_irq (struct irq_data *d) -{ -u32 reg_base =GPIO_VIRT (IRQ_TO_REGNO (d->irq)); -u32 bit =IRQ_TO_BIT (d->irq); -CPU_REG (reg_base,GPIO_MASK ) &= ~bit; -} - -/* -* unmask GPIO irq's -*/ -static void inline unmask_gpio_irq (struct irq_data *d) -{ -u32 reg_base =GPIO_VIRT (IRQ_TO_REGNO (d->irq)); -u32 bit =IRQ_TO_BIT (d->irq); -CPU_REG (reg_base,GPIO_MASK ) |= bit; -} - -static void -h720x_gpio_handler (unsigned int mask,unsigned int irq, -struct irq_desc *desc) -{ -IRQDBG ("%s irq: %d\n" , __func__, irq); -while (mask) { -if (mask &1 ) { -IRQDBG ("handling irq %d\n" , irq); -generic_handle_irq (irq); - } - irq++; - mask >>=1 ; - } -} - -static void -h720x_gpioa_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (GPIO_A_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOA (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} - -static void -h720x_gpiob_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - mask =CPU_REG (GPIO_B_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOB (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} - -static void -h720x_gpioc_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (GPIO_C_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOC (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} - -static void -h720x_gpiod_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (GPIO_D_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOD (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} - -#ifdef CONFIG_CPU_H7202 -static void -h720x_gpioe_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (GPIO_E_VIRT ,GPIO_STAT ); - irq =IRQ_CHAINED_GPIOE (0 ); -IRQDBG ("%s mask: 0x%08x irq: %d\n" , __func__, mask,irq); -h720x_gpio_handler (mask, irq, desc); -} -#endif - -static struct irq_chip h720x_global_chip = { - .irq_ack = mask_global_irq, - .irq_mask = mask_global_irq, - .irq_unmask = unmask_global_irq, -}; - -static struct irq_chip h720x_gpio_chip = { - .irq_ack = ack_gpio_irq, - .irq_mask = mask_gpio_irq, - .irq_unmask = unmask_gpio_irq, -}; - -/* -* Initialize IRQ's, mask all, enable multiplexed irq's -*/ -void __init h720x_init_irq (void ) -{ -int irq; - -/* Mask global irq's */ -CPU_REG (IRQC_VIRT ,IRQC_IER ) =0x0 ; - -/* Mask all multiplexed irq's */ -CPU_REG (GPIO_A_VIRT ,GPIO_MASK ) =0x0 ; -CPU_REG (GPIO_B_VIRT ,GPIO_MASK ) =0x0 ; -CPU_REG (GPIO_C_VIRT ,GPIO_MASK ) =0x0 ; -CPU_REG (GPIO_D_VIRT ,GPIO_MASK ) =0x0 ; - -/* Initialize global IRQ's, fast path */ -for (irq =0 ; irq <NR_GLBL_IRQS ; irq++) { -irq_set_chip_and_handler (irq, &h720x_global_chip, - handle_level_irq); -set_irq_flags (irq,IRQF_VALID |IRQF_PROBE ); - } - -/* Initialize multiplexed IRQ's, slow path */ -for (irq =IRQ_CHAINED_GPIOA (0 ) ; irq <=IRQ_CHAINED_GPIOD (31 ); irq++) { -irq_set_chip_and_handler (irq, &h720x_gpio_chip, - handle_edge_irq); -set_irq_flags (irq,IRQF_VALID ); - } -irq_set_chained_handler (IRQ_GPIOA , h720x_gpioa_demux_handler); -irq_set_chained_handler (IRQ_GPIOB , h720x_gpiob_demux_handler); -irq_set_chained_handler (IRQ_GPIOC , h720x_gpioc_demux_handler); -irq_set_chained_handler (IRQ_GPIOD , h720x_gpiod_demux_handler); - -#ifdef CONFIG_CPU_H7202 -for (irq =IRQ_CHAINED_GPIOE (0 ) ; irq <=IRQ_CHAINED_GPIOE (31 ); irq++) { -irq_set_chip_and_handler (irq, &h720x_gpio_chip, - handle_edge_irq); -set_irq_flags (irq,IRQF_VALID ); - } -irq_set_chained_handler (IRQ_GPIOE , h720x_gpioe_demux_handler); -#endif - -/* Enable multiplexed irq's */ -CPU_REG (IRQC_VIRT ,IRQC_IER ) =IRQ_ENA_MUX ; -} - -static struct map_desc h720x_io_desc[]__initdata = { - { - .virtual =IO_VIRT , - .pfn =__phys_to_pfn (IO_PHYS ), - .length =IO_SIZE , - .type =MT_DEVICE - }, -}; - -/* Initialize io tables */ -void __init h720x_map_io (void ) -{ -iotable_init (h720x_io_desc,ARRAY_SIZE (h720x_io_desc)); -} - -void h720x_restart (char mode,const char *cmd) -{ -CPU_REG (PMU_BASE ,PMU_STAT ) |=PMU_WARMRESET ; -} - -static void h720x__idle (void ) -{ -CPU_REG (PMU_BASE ,PMU_MODE ) =PMU_MODE_IDLE ; -nop (); -nop (); -CPU_REG (PMU_BASE ,PMU_MODE ) =PMU_MODE_RUN ; -nop (); -nop (); -} - -static int __init h720x_idle_init (void ) -{ - arm_pm_idle = h720x__idle; -return 0 ; -} - -arch_initcall (h720x_idle_init);arch/arm/mach-h720x/common.h deleted +0
-30@@ -1,30 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/common.h -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* Architecture specific stuff for Hynix GMS30C7201 development board -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -extern u32 h720x_gettimeoffset (void ); -extern void __init h720x_init_irq (void ); -extern void __init h720x_map_io (void ); -extern void h720x_restart (char ,const char *); - -#ifdef CONFIG_ARCH_H7202 -extern void h7202_timer_init (void ); -extern void __init init_hw_h7202 (void ); -extern void __init h7202_init_irq (void ); -extern void __init h7202_init_time (void ); -#endif - -#ifdef CONFIG_ARCH_H7201 -extern void h7201_timer_init (void ); -#endif arch/arm/mach-h720x/cpu-h7201.c deleted +0
-57@@ -1,57 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/cpu-h7201.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* processor specific stuff for the Hynix h7201 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/module.h> -#include <asm/types.h> -#include <mach/hardware.h> -#include <asm/irq.h> -#include <mach/irqs.h> -#include <asm/mach/irq.h> -#include <asm/mach/time.h> -#include "common.h" -/* -* Timer interrupt handler -*/ -static irqreturn_t -h7201_timer_interrupt (int irq,void *dev_id) -{ -CPU_REG (TIMER_VIRT ,TIMER_TOPSTAT ); -timer_tick (); - -return IRQ_HANDLED ; -} - -static struct irqaction h7201_timer_irq = { - .name ="h7201 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , - .handler = h7201_timer_interrupt, -}; - -/* -* Setup TIMER0 as system timer -*/ -void __init h7201_timer_init (void ) -{ - arch_gettimeoffset = h720x_gettimeoffset; - -CPU_REG (TIMER_VIRT ,TM0_PERIOD ) =LATCH ; -CPU_REG (TIMER_VIRT ,TM0_CTRL ) =TM_RESET ; -CPU_REG (TIMER_VIRT ,TM0_CTRL ) =TM_REPEAT |TM_START ; -CPU_REG (TIMER_VIRT ,TIMER_TOPCTRL ) =ENABLE_TM0_INTR |TIMER_ENABLE_BIT ; - -setup_irq (IRQ_TIMER0 , &h7201_timer_irq); -}arch/arm/mach-h720x/cpu-h7202.c deleted +0
-225@@ -1,225 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/cpu-h7202.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* processor specific stuff for the Hynix h7202 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/module.h> -#include <asm/types.h> -#include <mach/hardware.h> -#include <asm/irq.h> -#include <mach/irqs.h> -#include <asm/mach/irq.h> -#include <asm/mach/time.h> -#include <linux/device.h> -#include <linux/serial_8250.h> -#include "common.h" - -static struct resource h7202ps2_resources[] = { - [0 ] = { - .start =0x8002c000 , - .end =0x8002c040 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_PS2 , - .end =IRQ_PS2 , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device h7202ps2_device = { - .name ="h7202ps2" , - .id =-1 , - .num_resources =ARRAY_SIZE (h7202ps2_resources), - .resource = h7202ps2_resources, -}; - -static struct plat_serial8250_port serial_platform_data[] = { - { - .membase = (void *)SERIAL0_VIRT , - .mapbase =SERIAL0_BASE , - .irq =IRQ_UART0 , - .uartclk =2 *1843200 , - .regshift =2 , - .iotype =UPIO_MEM , - .flags =UPF_BOOT_AUTOCONF |UPF_SKIP_TEST , - }, - { - .membase = (void *)SERIAL1_VIRT , - .mapbase =SERIAL1_BASE , - .irq =IRQ_UART1 , - .uartclk =2 *1843200 , - .regshift =2 , - .iotype =UPIO_MEM , - .flags =UPF_BOOT_AUTOCONF |UPF_SKIP_TEST , - }, -#ifdef CONFIG_H7202_SERIAL23 - { - .membase = (void *)SERIAL2_VIRT , - .mapbase =SERIAL2_BASE , - .irq =IRQ_UART2 , - .uartclk =2 *1843200 , - .regshift =2 , - .iotype =UPIO_MEM , - .flags =UPF_BOOT_AUTOCONF |UPF_SKIP_TEST , - }, - { - .membase = (void *)SERIAL3_VIRT , - .mapbase =SERIAL3_BASE , - .irq =IRQ_UART3 , - .uartclk =2 *1843200 , - .regshift =2 , - .iotype =UPIO_MEM , - .flags =UPF_BOOT_AUTOCONF |UPF_SKIP_TEST , - }, -#endif - { }, -}; - -static struct platform_device serial_device = { - .name ="serial8250" , - .id =PLAT8250_DEV_PLATFORM , - .dev = { - .platform_data = serial_platform_data, - }, -}; - -static struct platform_device *devices[]__initdata = { - &h7202ps2_device, - &serial_device, -}; - -/* Although we have two interrupt lines for the timers, we only have one -* status register which clears all pending timer interrupts on reading. So -* we have to handle all timer interrupts in one place. -*/ -static void -h7202_timerx_demux_handler (unsigned int irq_unused,struct irq_desc *desc) -{ -unsigned int mask, irq; - - mask =CPU_REG (TIMER_VIRT ,TIMER_TOPSTAT ); - -if ( mask &TSTAT_T0INT ) { -timer_tick (); -if ( mask ==TSTAT_T0INT ) -return ; - } - - mask >>=1 ; - irq =IRQ_TIMER1 ; -while (mask) { -if (mask &1 ) -generic_handle_irq (irq); - irq++; - mask >>=1 ; - } -} - -/* -* Timer interrupt handler -*/ -static irqreturn_t -h7202_timer_interrupt (int irq,void *dev_id) -{ -h7202_timerx_demux_handler (0 ,NULL ); -return IRQ_HANDLED ; -} - -/* -* mask multiplexed timer IRQs -*/ -static void inline __mask_timerx_irq (unsigned int irq) -{ -unsigned int bit; - bit =2 << ((irq ==IRQ_TIMER64B ) ?4 : (irq -IRQ_TIMER1 )); -CPU_REG (TIMER_VIRT ,TIMER_TOPCTRL ) &= ~bit; -} - -static void inline mask_timerx_irq (struct irq_data *d) -{ -__mask_timerx_irq (d->irq); -} - -/* -* unmask multiplexed timer IRQs -*/ -static void inline unmask_timerx_irq (struct irq_data *d) -{ -unsigned int bit; - bit =2 << ((d->irq ==IRQ_TIMER64B ) ?4 : (d->irq -IRQ_TIMER1 )); -CPU_REG (TIMER_VIRT ,TIMER_TOPCTRL ) |= bit; -} - -static struct irq_chip h7202_timerx_chip = { - .irq_ack = mask_timerx_irq, - .irq_mask = mask_timerx_irq, - .irq_unmask = unmask_timerx_irq, -}; - -static struct irqaction h7202_timer_irq = { - .name ="h7202 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , - .handler = h7202_timer_interrupt, -}; - -/* -* Setup TIMER0 as system timer -*/ -void __init h7202_timer_init (void ) -{ - arch_gettimeoffset = h720x_gettimeoffset; - -CPU_REG (TIMER_VIRT ,TM0_PERIOD ) =LATCH ; -CPU_REG (TIMER_VIRT ,TM0_CTRL ) =TM_RESET ; -CPU_REG (TIMER_VIRT ,TM0_CTRL ) =TM_REPEAT |TM_START ; -CPU_REG (TIMER_VIRT ,TIMER_TOPCTRL ) =ENABLE_TM0_INTR |TIMER_ENABLE_BIT ; - -setup_irq (IRQ_TIMER0 , &h7202_timer_irq); -} - -void __init h7202_init_irq (void ) -{ -int irq; - -CPU_REG (GPIO_E_VIRT ,GPIO_MASK ) =0x0 ; - -for (irq =IRQ_TIMER1 ; - irq <IRQ_CHAINED_TIMERX (NR_TIMERX_IRQS ); irq++) { -__mask_timerx_irq (irq); -irq_set_chip_and_handler (irq, &h7202_timerx_chip, - handle_edge_irq); -set_irq_flags (irq,IRQF_VALID ); - } -irq_set_chained_handler (IRQ_TIMERX , h7202_timerx_demux_handler); - -h720x_init_irq (); -} - -void __init init_hw_h7202 (void ) -{ -/* Enable clocks */ -CPU_REG (PMU_BASE ,PMU_PLL_CTRL ) |=PLL_2_EN |PLL_1_EN |PLL_3_MUTE ; - -CPU_REG (SERIAL0_VIRT ,SERIAL_ENABLE ) =SERIAL_ENABLE_EN ; -CPU_REG (SERIAL1_VIRT ,SERIAL_ENABLE ) =SERIAL_ENABLE_EN ; -#ifdef CONFIG_H7202_SERIAL23 -CPU_REG (SERIAL2_VIRT ,SERIAL_ENABLE ) =SERIAL_ENABLE_EN ; -CPU_REG (SERIAL3_VIRT ,SERIAL_ENABLE ) =SERIAL_ENABLE_EN ; -CPU_IO (GPIO_AMULSEL ) =AMULSEL_USIN2 |AMULSEL_USOUT2 | -AMULSEL_USIN3 |AMULSEL_USOUT3 ; -#endif - (void )platform_add_devices (devices,ARRAY_SIZE (devices)); -}arch/arm/mach-h720x/h7201-eval.c deleted +0
-38@@ -1,38 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/h7201-eval.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* Architecture specific stuff for Hynix GMS30C7201 development board -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/string.h> -#include <linux/device.h> - -#include <asm/setup.h> -#include <asm/types.h> -#include <asm/mach-types.h> -#include <asm/page.h> -#include <asm/mach/arch.h> -#include <mach/hardware.h> -#include "common.h" - -MACHINE_START (H7201 ,"Hynix GMS30C7201" ) -/* Maintainer: Robert Schwebel, Pengutronix */ - .atag_offset = 0x1000, - .map_io = h720x_map_io, - .init_irq = h720x_init_irq, - .init_time = h7201_timer_init, - .dma_zone_size = SZ_256M, - .restart = h720x_restart, -MACHINE_END arch/arm/mach-h720x/h7202-eval.c deleted +0
-81@@ -1,81 +0,0 @@ -/* -* linux/arch/arm/mach-h720x/h7202-eval.c -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* 2003 Robert Schwebel <[email protected]> -* 2004 Sascha Hauer <[email protected]> -* -* Architecture specific stuff for Hynix HMS30C7202 development board -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -*/ - -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/string.h> -#include <linux/platform_device.h> - -#include <asm/setup.h> -#include <asm/types.h> -#include <asm/mach-types.h> -#include <asm/page.h> -#include <asm/mach/arch.h> -#include <mach/irqs.h> -#include <mach/hardware.h> -#include "common.h" - -static struct resource cirrus_resources[] = { - [0 ] = { - .start =ETH0_PHYS +0x300 , - .end =ETH0_PHYS +0x300 +0x10 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_CHAINED_GPIOB (8 ), - .end =IRQ_CHAINED_GPIOB (8 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device cirrus_device = { - .name ="cirrus-cs89x0" , - .id =-1 , - .num_resources =ARRAY_SIZE (cirrus_resources), - .resource = cirrus_resources, -}; - -static struct platform_device *devices[]__initdata = { - &cirrus_device, -}; - -/* -* Hardware init. This is called early in initcalls -* Place pin inits here. So you avoid adding ugly -* #ifdef stuff to common drivers. -* Use this only, if your bootloader is not able -* to initialize the pins proper. -*/ -static void __init init_eval_h7202 (void ) -{ -init_hw_h7202 (); - (void )platform_add_devices (devices,ARRAY_SIZE (devices)); - -/* Enable interrupt on portb bit 8 (ethernet) */ -CPU_REG (GPIO_B_VIRT ,GPIO_POL ) &= ~(1 <<8 ); -CPU_REG (GPIO_B_VIRT ,GPIO_EN ) |= (1 <<8 ); -} - -MACHINE_START (H7202 ,"Hynix HMS30C7202" ) -/* Maintainer: Robert Schwebel, Pengutronix */ - .atag_offset = 0x100, - .map_io = h720x_map_io, - .init_irq = h7202_init_irq, - .init_time = h7202_timer_init, - .init_machine = init_eval_h7202, - .dma_zone_size = SZ_256M, - .restart = h720x_restart, -MACHINE_END arch/arm/mach-h720x/include/mach/boards.h deleted +0
-53@@ -1,53 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/boards.h -* -* Copyright (C) 2003 Thomas Gleixner <[email protected]> -* (C) 2003 Robert Schwebel <[email protected]> -* -* This file contains the board specific defines for various devices -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_HARDWARE_INCMACH_H -#error Do not include this file directly. Include asm/hardware.h instead ! -#endif - -/* Hynix H7202 developer board specific device defines */ -#ifdef CONFIG_ARCH_H7202 - -/* FLASH */ -#define H720X_FLASH_VIRT 0xd0000000 -#define H720X_FLASH_PHYS 0x00000000 -#define H720X_FLASH_SIZE 0x02000000 - -/* onboard LAN controller */ -# define ETH0_PHYS 0x08000000 - -/* Touch screen defines */ -/* GPIO Port */ -#define PEN_GPIO GPIO_B_VIRT -/* Bitmask for pen down interrupt */ -#define PEN_INT_BIT (1<<7) -/* Bitmask for pen up interrupt */ -#define PEN_ENA_BIT (1<<6) -/* pen up interrupt */ -#define IRQ_PEN IRQ_MUX_GPIOB(7) - -#endif - -/* Hynix H7201 developer board specific device defines */ -#if defined (CONFIG_ARCH_H7201 ) -/* ROM DISK SPACE */ -#define ROM_DISK_BASE 0xc1800000 -#define ROM_DISK_START 0x41800000 -#define ROM_DISK_SIZE 0x00700000 - -/* SRAM DISK SPACE */ -#define SRAM_DISK_BASE 0xf1000000 -#define SRAM_DISK_START 0x04000000 -#define SRAM_DISK_SIZE 0x00400000 -#endif -arch/arm/mach-h720x/include/mach/debug-macro.S deleted +0
-40@@ -1,40 +0,0 @@ -/* arch/arm/mach-h720x/include/mach/debug-macro.S - * - * Debugging macro include header - * - * Copyright (C) 1994-1999 Russell King - * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * -*/ - -#include <mach/hardware.h> - - .equ io_virt, IO_VIRT - .equ io_phys, IO_PHYS - - .macro addruart, rp, rv, tmp - mov \rp, #0x00020000 @ UART1 - add \rv, \rp, #io_virt @ virtual address - add \rp, \rp, #io_phys @ physical base address - .endm - - .macro senduart,rd,rx - str \rd, [\rx, #0x0] @ UARTDR - - .endm - - .macro waituart,rd,rx -1001: ldr \rd, [\rx, #0x18] @ UARTFLG - tst \rd, #1 << 5 @ UARTFLGUTXFF - 1 when full - bne 1001b - .endm - - .macro busyuart,rd,rx -1001: ldr \rd, [\rx, #0x18] @ UARTFLG - tst \rd, #1 << 3 @ UARTFLGUBUSY - 1 when busy - bne 1001b - .endmarch/arm/mach-h720x/include/mach/entry-macro.S deleted +0
-57@@ -1,57 +0,0 @@ -/* - * arch/arm/mach-h720x/include/mach/entry-macro.S - * - * Low-level IRQ helper macros for Hynix HMS720x based platforms - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - - .macro get_irqnr_preamble, base, tmp - .endm - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp -#if defined (CONFIG_CPU_H7201) || defined (CONFIG_CPU_H7202) - @ we could use the id register on H7202, but this is not - @ properly updated when we come back from asm_do_irq - @ without a previous return from interrupt - @ (see loops below in irq_svc, irq_usr) - @ We see unmasked pending ints only, as the masked pending ints - @ are not visible here - - mov \base, #0xf0000000 @ base register - orr \base, \base, #0x24000 @ irqbase - ldr \irqstat, [\base, #0x04] @ get interrupt status -#if defined (CONFIG_CPU_H7201) - ldr \tmp, =0x001fffff -#else - mvn \tmp, #0xc0000000 -#endif - and \irqstat, \irqstat, \tmp @ mask out unused ints - mov \irqnr, #0 - - mov \tmp, #0xff00 - orr \tmp, \tmp, #0xff - tst \irqstat, \tmp - addeq \irqnr, \irqnr, #16 - moveq \irqstat, \irqstat, lsr #16 - tst \irqstat, #255 - addeq \irqnr, \irqnr, #8 - moveq \irqstat, \irqstat, lsr #8 - tst \irqstat, #15 - addeq \irqnr, \irqnr, #4 - moveq \irqstat, \irqstat, lsr #4 - tst \irqstat, #3 - addeq \irqnr, \irqnr, #2 - moveq \irqstat, \irqstat, lsr #2 - tst \irqstat, #1 - addeq \irqnr, \irqnr, #1 - moveq \irqstat, \irqstat, lsr #1 - tst \irqstat, #1 @ bit 0 should be set - .endm - -#else -#error hynix processor selection missmatch -#endif -arch/arm/mach-h720x/include/mach/h7201-regs.h deleted +0
-67@@ -1,67 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/h7201-regs.h -* -* Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. -* (C) 2003 Thomas Gleixner <[email protected]> -* (C) 2003 Robert Schwebel <[email protected]> -* (C) 2004 Sascha Hauer <[email protected]> -* -* This file contains the hardware definitions of the h720x processors -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* Do not add implementations specific defines here. This files contains -* only defines of the onchip peripherals. Add those defines to boards.h, -* which is included by this file. -*/ - -#define SERIAL2_VIRT (IO_VIRT + 0x50100) -#define SERIAL3_VIRT (IO_VIRT + 0x50200) - -/* -* PCMCIA -*/ -#define PCMCIA0_ATT_BASE 0xe5000000 -#define PCMCIA0_ATT_SIZE 0x00200000 -#define PCMCIA0_ATT_START 0x20000000 -#define PCMCIA0_MEM_BASE 0xe5200000 -#define PCMCIA0_MEM_SIZE 0x00200000 -#define PCMCIA0_MEM_START 0x24000000 -#define PCMCIA0_IO_BASE 0xe5400000 -#define PCMCIA0_IO_SIZE 0x00200000 -#define PCMCIA0_IO_START 0x28000000 - -#define PCMCIA1_ATT_BASE 0xe5600000 -#define PCMCIA1_ATT_SIZE 0x00200000 -#define PCMCIA1_ATT_START 0x30000000 -#define PCMCIA1_MEM_BASE 0xe5800000 -#define PCMCIA1_MEM_SIZE 0x00200000 -#define PCMCIA1_MEM_START 0x34000000 -#define PCMCIA1_IO_BASE 0xe5a00000 -#define PCMCIA1_IO_SIZE 0x00200000 -#define PCMCIA1_IO_START 0x38000000 - -#define PRIME3C_BASE 0xf0050000 -#define PRIME3C_SIZE 0x00001000 -#define PRIME3C_START 0x10000000 - -/* VGA Controller */ -#define VGA_RAMBASE 0x50 -#define VGA_TIMING0 0x60 -#define VGA_TIMING1 0x64 -#define VGA_TIMING2 0x68 -#define VGA_TIMING3 0x6c - -#define LCD_CTRL_VGA_ENABLE 0x00000100 -#define LCD_CTRL_VGA_BPP_MASK 0x00000600 -#define LCD_CTRL_VGA_4BPP 0x00000000 -#define LCD_CTRL_VGA_8BPP 0x00000200 -#define LCD_CTRL_VGA_16BPP 0x00000300 -#define LCD_CTRL_SHARE_DMA 0x00000800 -#define LCD_CTRL_VDE 0x00100000 -#define LCD_CTRL_LPE 0x00400000/* LCD Power enable */ -#define LCD_CTRL_BLE 0x00800000/* LCD backlight enable */ - -#define VGA_PALETTE_BASE (IO_VIRT + 0x10800)arch/arm/mach-h720x/include/mach/h7202-regs.h deleted +0
-155@@ -1,155 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/h7202-regs.h -* -* Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. -* (C) 2003 Thomas Gleixner <[email protected]> -* (C) 2003 Robert Schwebel <[email protected]> -* (C) 2004 Sascha Hauer <[email protected]> -* -* This file contains the hardware definitions of the h720x processors -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* Do not add implementations specific defines here. This files contains -* only defines of the onchip peripherals. Add those defines to boards.h, -* which is included by this file. -*/ - -#define SERIAL2_OFS 0x2d000 -#define SERIAL2_BASE (IO_PHYS + SERIAL2_OFS) -#define SERIAL2_VIRT (IO_VIRT + SERIAL2_OFS) -#define SERIAL3_OFS 0x2e000 -#define SERIAL3_BASE (IO_PHYS + SERIAL3_OFS) -#define SERIAL3_VIRT (IO_VIRT + SERIAL3_OFS) - -/* Matrix Keyboard Controller */ -#define KBD_VIRT (IO_VIRT + 0x22000) -#define KBD_KBCR 0x00 -#define KBD_KBSC 0x04 -#define KBD_KBTR 0x08 -#define KBD_KBVR0 0x0C -#define KBD_KBVR1 0x10 -#define KBD_KBSR 0x18 - -#define KBD_KBCR_SCANENABLE (1 << 7) -#define KBD_KBCR_NPOWERDOWN (1 << 2) -#define KBD_KBCR_CLKSEL_MASK (3) -#define KBD_KBCR_CLKSEL_PCLK2 0x0 -#define KBD_KBCR_CLKSEL_PCLK128 0x1 -#define KBD_KBCR_CLKSEL_PCLK256 0x2 -#define KBD_KBCR_CLKSEL_PCLK512 0x3 - -#define KBD_KBSR_INTR (1 << 0) -#define KBD_KBSR_WAKEUP (1 << 1) - -/* USB device controller */ - -#define USBD_BASE (IO_VIRT + 0x12000) -#define USBD_LENGTH 0x3C - -#define USBD_GCTRL 0x00 -#define USBD_EPCTRL 0x04 -#define USBD_INTMASK 0x08 -#define USBD_INTSTAT 0x0C -#define USBD_PWR 0x10 -#define USBD_DMARXTX 0x14 -#define USBD_DEVID 0x18 -#define USBD_DEVCLASS 0x1C -#define USBD_INTCLASS 0x20 -#define USBD_SETUP0 0x24 -#define USBD_SETUP1 0x28 -#define USBD_ENDP0RD 0x2C -#define USBD_ENDP0WT 0x30 -#define USBD_ENDP1RD 0x34 -#define USBD_ENDP2WT 0x38 - -/* PS/2 port */ -#define PSDATA 0x00 -#define PSSTAT 0x04 -#define PSSTAT_TXEMPTY (1<<0) -#define PSSTAT_TXBUSY (1<<1) -#define PSSTAT_RXFULL (1<<2) -#define PSSTAT_RXBUSY (1<<3) -#define PSSTAT_CLKIN (1<<4) -#define PSSTAT_DATAIN (1<<5) -#define PSSTAT_PARITY (1<<6) - -#define PSCONF 0x08 -#define PSCONF_ENABLE (1<<0) -#define PSCONF_TXINTEN (1<<2) -#define PSCONF_RXINTEN (1<<3) -#define PSCONF_FORCECLKLOW (1<<4) -#define PSCONF_FORCEDATLOW (1<<5) -#define PSCONF_LCE (1<<6) - -#define PSINTR 0x0C -#define PSINTR_TXINT (1<<0) -#define PSINTR_RXINT (1<<1) -#define PSINTR_PAR (1<<2) -#define PSINTR_RXTO (1<<3) -#define PSINTR_TXTO (1<<4) - -#define PSTDLO 0x10/* clk low before start transmission */ -#define PSTPRI 0x14/* PRI clock */ -#define PSTXMT 0x18/* maximum transmission time */ -#define PSTREC 0x20/* maximum receive time */ -#define PSPWDN 0x3c - -/* ADC converter */ -#define ADC_BASE (IO_VIRT + 0x29000) -#define ADC_CR 0x00 -#define ADC_TSCTRL 0x04 -#define ADC_BT_CTRL 0x08 -#define ADC_MC_CTRL 0x0C -#define ADC_STATUS 0x10 - -/* ADC control register bits */ -#define ADC_CR_PW_CTRL 0x80 -#define ADC_CR_DIRECTC 0x04 -#define ADC_CR_CONTIME_NO 0x00 -#define ADC_CR_CONTIME_2 0x04 -#define ADC_CR_CONTIME_4 0x08 -#define ADC_CR_CONTIME_ADE 0x0c -#define ADC_CR_LONGCALTIME 0x01 - -/* ADC touch panel register bits */ -#define ADC_TSCTRL_ENABLE 0x80 -#define ADC_TSCTRL_INTR 0x40 -#define ADC_TSCTRL_SWBYPSS 0x20 -#define ADC_TSCTRL_SWINVT 0x10 -#define ADC_TSCTRL_S400 0x03 -#define ADC_TSCTRL_S200 0x02 -#define ADC_TSCTRL_S100 0x01 -#define ADC_TSCTRL_S50 0x00 - -/* ADC Interrupt Status Register bits */ -#define ADC_STATUS_TS_BIT 0x80 -#define ADC_STATUS_MBT_BIT 0x40 -#define ADC_STATUS_BBT_BIT 0x20 -#define ADC_STATUS_MIC_BIT 0x10 - -/* Touch data registers */ -#define ADC_TS_X0X1 0x30 -#define ADC_TS_X2X3 0x34 -#define ADC_TS_Y0Y1 0x38 -#define ADC_TS_Y2Y3 0x3c -#define ADC_TS_X4X5 0x40 -#define ADC_TS_X6X7 0x44 -#define ADC_TS_Y4Y5 0x48 -#define ADC_TS_Y6Y7 0x50 - -/* battery data */ -#define ADC_MB_DATA 0x54 -#define ADC_BB_DATA 0x58 - -/* Sound data register */ -#define ADC_SD_DAT0 0x60 -#define ADC_SD_DAT1 0x64 -#define ADC_SD_DAT2 0x68 -#define ADC_SD_DAT3 0x6c -#define ADC_SD_DAT4 0x70 -#define ADC_SD_DAT5 0x74 -#define ADC_SD_DAT6 0x78 -#define ADC_SD_DAT7 0x7carch/arm/mach-h720x/include/mach/hardware.h deleted +0
-190@@ -1,190 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/hardware.h -* -* Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. -* (C) 2003 Thomas Gleixner <[email protected]> -* (C) 2003 Robert Schwebel <[email protected]> -* -* This file contains the hardware definitions of the h720x processors -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* Do not add implementations specific defines here. This files contains -* only defines of the onchip peripherals. Add those defines to boards.h, -* which is included by this file. -*/ - -#ifndef __ASM_ARCH_HARDWARE_H -#define __ASM_ARCH_HARDWARE_H - -#define IOCLK (3686400L) - -/* Onchip peripherals */ - -#define IO_VIRT 0xf0000000/* IO peripherals */ -#define IO_PHYS 0x80000000 -#define IO_SIZE 0x00050000 - -#ifdef CONFIG_CPU_H7202 -#include "h7202-regs.h" -#elif definedCONFIG_CPU_H7201 -#include "h7201-regs.h" -#else -#error machine definition mismatch -#endif - -/* Macro to access the CPU IO */ -#define CPU_IO (x) (*(volatile u32*)(x)) - -/* Macro to access general purpose regs (base, offset) */ -#define CPU_REG (x,y) CPU_IO(x+y) - -/* Macro to access irq related regs */ -#define IRQ_REG (x) CPU_REG(IRQC_VIRT,x) - -/* CPU registers */ -/* general purpose I/O */ -#define GPIO_VIRT (x) (IO_VIRT + 0x23000 + ((x)<<5)) -#define GPIO_A_VIRT (GPIO_VIRT(0)) -#define GPIO_B_VIRT (GPIO_VIRT(1)) -#define GPIO_C_VIRT (GPIO_VIRT(2)) -#define GPIO_D_VIRT (GPIO_VIRT(3)) -#define GPIO_E_VIRT (GPIO_VIRT(4)) -#define GPIO_AMULSEL (GPIO_VIRT(0) + 0xA4) - -#define AMULSEL_USIN2 (1<<5) -#define AMULSEL_USOUT2 (1<<6) -#define AMULSEL_USIN3 (1<<13) -#define AMULSEL_USOUT3 (1<<14) -#define AMULSEL_IRDIN (1<<15) -#define AMULSEL_IRDOUT (1<<7) - -/* Register offsets general purpose I/O */ -#define GPIO_DATA 0x00 -#define GPIO_DIR 0x04 -#define GPIO_MASK 0x08 -#define GPIO_STAT 0x0C -#define GPIO_EDGE 0x10 -#define GPIO_CLR 0x14 -#define GPIO_POL 0x18 -#define GPIO_EN 0x1C - -/*interrupt controller */ -#define IRQC_VIRT (IO_VIRT + 0x24000) -/* register offset interrupt controller */ -#define IRQC_IER 0x00 -#define IRQC_ISR 0x04 - -/* timer unit */ -#define TIMER_VIRT (IO_VIRT + 0x25000) -/* Register offsets timer unit */ -#define TM0_PERIOD 0x00 -#define TM0_COUNT 0x08 -#define TM0_CTRL 0x10 -#define TM1_PERIOD 0x20 -#define TM1_COUNT 0x28 -#define TM1_CTRL 0x30 -#define TM2_PERIOD 0x40 -#define TM2_COUNT 0x48 -#define TM2_CTRL 0x50 -#define TIMER_TOPCTRL 0x60 -#define TIMER_TOPSTAT 0x64 -#define T64_COUNTL 0x80 -#define T64_COUNTH 0x84 -#define T64_CTRL 0x88 -#define T64_BASEL 0x94 -#define T64_BASEH 0x98 -/* Bitmaks timer unit TOPSTAT reg */ -#define TSTAT_T0INT 0x1 -#define TSTAT_T1INT 0x2 -#define TSTAT_T2INT 0x4 -#define TSTAT_T3INT 0x8 -/* Bit description of TMx_CTRL register */ -#define TM_START 0x1 -#define TM_REPEAT 0x2 -#define TM_RESET 0x4 -/* Bit description of TIMER_CTRL register */ -#define ENABLE_TM0_INTR 0x1 -#define ENABLE_TM1_INTR 0x2 -#define ENABLE_TM2_INTR 0x4 -#define TIMER_ENABLE_BIT 0x8 -#define ENABLE_TIMER64 0x10 -#define ENABLE_TIMER64_INT 0x20 - -/* PMU & PLL */ -#define PMU_BASE (IO_VIRT + 0x1000) -#define PMU_MODE 0x00 -#define PMU_STAT 0x20 -#define PMU_PLL_CTRL 0x28 - -/* PMU Mode bits */ -#define PMU_MODE_SLOW 0x00 -#define PMU_MODE_RUN 0x01 -#define PMU_MODE_IDLE 0x02 -#define PMU_MODE_SLEEP 0x03 -#define PMU_MODE_INIT 0x04 -#define PMU_MODE_DEEPSLEEP 0x07 -#define PMU_MODE_WAKEUP 0x08 - -/* PMU ... */ -#define PLL_2_EN 0x8000 -#define PLL_1_EN 0x4000 -#define PLL_3_MUTE 0x0080 - -/* Control bits for PMU/ PLL */ -#define PMU_WARMRESET 0x00010000 -#define PLL_CTRL_MASK23 0x000080ff - -/* LCD Controller */ -#define LCD_BASE (IO_VIRT + 0x10000) -#define LCD_CTRL 0x00 -#define LCD_STATUS 0x04 -#define LCD_STATUS_M 0x08 -#define LCD_INTERRUPT 0x0C -#define LCD_DBAR 0x10 -#define LCD_DCAR 0x14 -#define LCD_TIMING0 0x20 -#define LCD_TIMING1 0x24 -#define LCD_TIMING2 0x28 -#define LCD_TEST 0x40 - -/* LCD Control Bits */ -#define LCD_CTRL_LCD_ENABLE 0x00000001 -/* Bits per pixel */ -#define LCD_CTRL_LCD_BPP_MASK 0x00000006 -#define LCD_CTRL_LCD_4BPP 0x00000000 -#define LCD_CTRL_LCD_8BPP 0x00000002 -#define LCD_CTRL_LCD_16BPP 0x00000004 -#define LCD_CTRL_LCD_BW 0x00000008 -#define LCD_CTRL_LCD_TFT 0x00000010 -#define LCD_CTRL_BGR 0x00001000 -#define LCD_CTRL_LCD_VCOMP 0x00080000 -#define LCD_CTRL_LCD_MONO8 0x00200000 -#define LCD_CTRL_LCD_PWR 0x00400000 -#define LCD_CTRL_LCD_BLE 0x00800000 -#define LCD_CTRL_LDBUSEN 0x01000000 - -/* Palette */ -#define LCD_PALETTE_BASE (IO_VIRT + 0x10400) - -/* Serial ports */ -#define SERIAL0_OFS 0x20000 -#define SERIAL0_VIRT (IO_VIRT + SERIAL0_OFS) -#define SERIAL0_BASE (IO_PHYS + SERIAL0_OFS) - -#define SERIAL1_OFS 0x21000 -#define SERIAL1_VIRT (IO_VIRT + SERIAL1_OFS) -#define SERIAL1_BASE (IO_PHYS + SERIAL1_OFS) - -#define SERIAL_ENABLE 0x30 -#define SERIAL_ENABLE_EN (1<<0) - -/* General defines to pacify gcc */ - -#define __ASM_ARCH_HARDWARE_INCMACH_H -#include "boards.h" -#undef __ASM_ARCH_HARDWARE_INCMACH_H - -#endif /* __ASM_ARCH_HARDWARE_H */ arch/arm/mach-h720x/include/mach/irqs.h deleted +0
-116@@ -1,116 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/irqs.h -* -* Copyright (C) 2000 Jungjun Kim -* (C) 2003 Robert Schwebel <[email protected]> -* (C) 2003 Thomas Gleixner <[email protected]> -* -*/ - -#ifndef __ASM_ARCH_IRQS_H -#define __ASM_ARCH_IRQS_H - -#if defined (CONFIG_CPU_H7201 ) - -#define IRQ_PMU 0/* 0x000001 */ -#define IRQ_DMA 1/* 0x000002 */ -#define IRQ_LCD 2/* 0x000004 */ -#define IRQ_VGA 3/* 0x000008 */ -#define IRQ_PCMCIA1 4/* 0x000010 */ -#define IRQ_PCMCIA2 5/* 0x000020 */ -#define IRQ_AFE 6/* 0x000040 */ -#define IRQ_AIC 7/* 0x000080 */ -#define IRQ_KEYBOARD 8/* 0x000100 */ -#define IRQ_TIMER0 9/* 0x000200 */ -#define IRQ_RTC 10/* 0x000400 */ -#define IRQ_SOUND 11/* 0x000800 */ -#define IRQ_USB 12/* 0x001000 */ -#define IRQ_IrDA 13/* 0x002000 */ -#define IRQ_UART0 14/* 0x004000 */ -#define IRQ_UART1 15/* 0x008000 */ -#define IRQ_SPI 16/* 0x010000 */ -#define IRQ_GPIOA 17/* 0x020000 */ -#define IRQ_GPIOB 18/* 0x040000 */ -#define IRQ_GPIOC 19/* 0x080000 */ -#define IRQ_GPIOD 20/* 0x100000 */ -#define IRQ_CommRX 21/* 0x200000 */ -#define IRQ_CommTX 22/* 0x400000 */ -#define IRQ_Soft 23/* 0x800000 */ - -#define NR_GLBL_IRQS 24 - -#define IRQ_CHAINED_GPIOA (x) (NR_GLBL_IRQS + x) -#define IRQ_CHAINED_GPIOB (x) (IRQ_CHAINED_GPIOA(32) + x) -#define IRQ_CHAINED_GPIOC (x) (IRQ_CHAINED_GPIOB(32) + x) -#define IRQ_CHAINED_GPIOD (x) (IRQ_CHAINED_GPIOC(32) + x) -#define NR_IRQS IRQ_CHAINED_GPIOD(32) - -/* Enable mask for multiplexed interrupts */ -#define IRQ_ENA_MUX (1<<IRQ_GPIOA) | (1<<IRQ_GPIOB) \ - | (1<<IRQ_GPIOC) | (1<<IRQ_GPIOD) - - -#elif defined (CONFIG_CPU_H7202 ) - -#define IRQ_PMU 0/* 0x00000001 */ -#define IRQ_DMA 1/* 0x00000002 */ -#define IRQ_LCD 2/* 0x00000004 */ -#define IRQ_SOUND 3/* 0x00000008 */ -#define IRQ_I2S 4/* 0x00000010 */ -#define IRQ_USB 5/* 0x00000020 */ -#define IRQ_MMC 6/* 0x00000040 */ -#define IRQ_RTC 7/* 0x00000080 */ -#define IRQ_UART0 8/* 0x00000100 */ -#define IRQ_UART1 9/* 0x00000200 */ -#define IRQ_UART2 10/* 0x00000400 */ -#define IRQ_UART3 11/* 0x00000800 */ -#define IRQ_KBD 12/* 0x00001000 */ -#define IRQ_PS2 13/* 0x00002000 */ -#define IRQ_AIC 14/* 0x00004000 */ -#define IRQ_TIMER0 15/* 0x00008000 */ -#define IRQ_TIMERX 16/* 0x00010000 */ -#define IRQ_WDT 17/* 0x00020000 */ -#define IRQ_CAN0 18/* 0x00040000 */ -#define IRQ_CAN1 19/* 0x00080000 */ -#define IRQ_EXT0 20/* 0x00100000 */ -#define IRQ_EXT1 21/* 0x00200000 */ -#define IRQ_GPIOA 22/* 0x00400000 */ -#define IRQ_GPIOB 23/* 0x00800000 */ -#define IRQ_GPIOC 24/* 0x01000000 */ -#define IRQ_GPIOD 25/* 0x02000000 */ -#define IRQ_GPIOE 26/* 0x04000000 */ -#define IRQ_COMMRX 27/* 0x08000000 */ -#define IRQ_COMMTX 28/* 0x10000000 */ -#define IRQ_SMC 29/* 0x20000000 */ -#define IRQ_Soft 30/* 0x40000000 */ -#define IRQ_RESERVED1 31/* 0x80000000 */ -#define NR_GLBL_IRQS 32 - -#define NR_TIMERX_IRQS 3 - -#define IRQ_CHAINED_GPIOA (x) (NR_GLBL_IRQS + x) -#define IRQ_CHAINED_GPIOB (x) (IRQ_CHAINED_GPIOA(32) + x) -#define IRQ_CHAINED_GPIOC (x) (IRQ_CHAINED_GPIOB(32) + x) -#define IRQ_CHAINED_GPIOD (x) (IRQ_CHAINED_GPIOC(32) + x) -#define IRQ_CHAINED_GPIOE (x) (IRQ_CHAINED_GPIOD(32) + x) -#define IRQ_CHAINED_TIMERX (x) (IRQ_CHAINED_GPIOE(32) + x) -#define IRQ_TIMER1 (IRQ_CHAINED_TIMERX(0)) -#define IRQ_TIMER2 (IRQ_CHAINED_TIMERX(1)) -#define IRQ_TIMER64B (IRQ_CHAINED_TIMERX(2)) - -#define NR_IRQS (IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS)) - -/* Enable mask for multiplexed interrupts */ -#define IRQ_ENA_MUX (1<<IRQ_TIMERX) | (1<<IRQ_GPIOA) | (1<<IRQ_GPIOB) | \ - (1<<IRQ_GPIOC) | (1<<IRQ_GPIOD) | (1<<IRQ_GPIOE) | \ - (1<<IRQ_TIMERX) - -#else -#error cpu definition mismatch -#endif - -/* decode irq number to register number */ -#define IRQ_TO_REGNO (irq) ((irq - NR_GLBL_IRQS) >> 5) -#define IRQ_TO_BIT (irq) (1 << ((irq - NR_GLBL_IRQS) % 32)) - -#endif arch/arm/mach-h720x/include/mach/isa-dma.h deleted +0
-19@@ -1,19 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/isa-dma.h -* -* Architecture DMA routes -* -* Copyright (C) 1997.1998 Russell King -*/ -#ifndef __ASM_ARCH_DMA_H -#define __ASM_ARCH_DMA_H - -#if defined (CONFIG_CPU_H7201 ) -#define MAX_DMA_CHANNELS 3 -#elif defined (CONFIG_CPU_H7202 ) -#define MAX_DMA_CHANNELS 4 -#else -#error processor definition missmatch -#endif - -#endif /* __ASM_ARCH_DMA_H */ arch/arm/mach-h720x/include/mach/timex.h deleted +0
-15@@ -1,15 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/timex.h -* Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_TIMEX -#define __ASM_ARCH_TIMEX - -#define CLOCK_TICK_RATE 3686400 - -#endif arch/arm/mach-h720x/include/mach/uncompress.h deleted +0
-36@@ -1,36 +0,0 @@ -/* -* arch/arm/mach-h720x/include/mach/uncompress.h -* -* Copyright (C) 2001-2002 Jungjun Kim -*/ - -#ifndef __ASM_ARCH_UNCOMPRESS_H -#define __ASM_ARCH_UNCOMPRESS_H - -#include <mach/hardware.h> - -#define LSR 0x14 -#define TEMPTY 0x40 - -static inline void putc (int c) -{ -volatile unsigned char *p = (volatile unsigned char *)(IO_PHYS +0x20000 ); - -/* wait until transmit buffer is empty */ -while ((p[LSR ] &TEMPTY ) ==0x0 ) -barrier (); - -/* write next character */ - *p = c; -} - -static inline void flush (void ) -{ -} - -/* -* nothing to do -*/ -#define arch_decomp_setup () - -#endif Signature · 1 line
1.8.1.2
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 5/6 ARM: kill Hynix h720x platform
In reply to Arnd BergmannDear Arnd Bergmann,
Quoted 8 lines · Arnd Bergmann
The platform was merged about 10 years ago, and has seen few updates for most of the time since. The people that merged the code seem no longer interested in it either, so let's remove it now.
Signed-off-by Arnd Bergmann <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Robert Schwebel <[email protected]>Cc Sascha Hauer <[email protected]>
If this gets removed, then presumably drivers/mtd/maps/h720x-flash.c should be removed as well.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 5/6 ARM: kill Hynix h720x platform
Quoted 5 lines · Thomas Petazzoni
Quoted 4 lines · Arnd Bergmann
The platform was merged about 10 years ago, and has seen few updates for most of the time since. The people that merged the code seem no longer interested in it either, so let's remove it now.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Arnd Bergmann <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Robert Schwebel <[email protected]>Cc Sascha Hauer <[email protected]>If this gets removed, then presumably
drivers/mtd/maps/h720x-flash.cshould be removed as well.
Correct, see patch 6.
Arnd
PATCH 6/6 mtd: remove h720x flash support
In reply to Arnd BergmannThe h720x platform support is going away in linux-3.10, so the MTD driver will also not be needed any more.
--- drivers/mtd/maps/Kconfig | 7 --- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/h720x-flash.c | 120 ----------------------------------------- 3 files changed, 128 deletions(-) delete mode 100644 drivers/mtd/maps/h720x-flash.c
drivers/mtd/maps/Kconfig +0 -7
@@ -372,13 +372,6 @@ config MTD_IMPA7 This enables access to the NOR Flash on the impA7 board of implementa GmbH. If you have such a board, say 'Y' here. -config MTD_H720X - tristate "Hynix evaluation board mappings" - depends on MTD_CFI && ( ARCH_H7201 || ARCH_H7202 ) - help - This enables access to the flash chips on the Hynix evaluation boards. - If you have such a board, say 'Y'. - # This needs CFI or JEDEC, depending on the cards found. config MTD_PCI tristate "PCI MTD driver"
drivers/mtd/maps/Makefile +0 -1
@@ -42,7 +42,6 @@ obj-$(CONFIG_MTD_IMPA7) += impa7.o obj-$(CONFIG_MTD_UCLINUX) += uclinux.o obj-$(CONFIG_MTD_NETtel) += nettel.o obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o -obj-$(CONFIG_MTD_H720X) += h720x-flash.o obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o obj-$(CONFIG_MTD_IXP2000) += ixp2000.o obj-$(CONFIG_MTD_DMV182) += dmv182.o
drivers/mtd/maps/h720x-flash.c deleted +0 -120
120 lines not on this page · raw message
Signature · 1 line
1.8.1.2
Artem Bityutskiy
AppliedPATCH 6/6 mtd: remove h720x flash support
Quoted 4 lines · Arnd Bergmann
The h720x platform support is going away in linux-3.10, so the MTD driver will also not be needed any more.
Signed-off-by Arnd Bergmann <[email protected]>
Pushed to l2-mtd.git, thanks!
Signature · 2 lines
Best Regards, Artem Bityutskiy