diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-sa1100/SA-1100.h | 6 | ||||
| -rw-r--r-- | include/asm-arm/arch-sa1100/assabet.h | 4 | ||||
| -rw-r--r-- | include/asm-arm/arch-sa1100/ide.h | 6 | ||||
| -rw-r--r-- | include/asm-arm/arch-sa1100/lart.h | 10 | ||||
| -rw-r--r-- | include/asm-arm/arch-sa1100/simpad.h | 8 | ||||
| -rw-r--r-- | include/asm-arm/keyboard.h | 6 | ||||
| -rw-r--r-- | include/asm-arm/proc-armv/cache.h | 5 |
7 files changed, 27 insertions, 18 deletions
diff --git a/include/asm-arm/arch-sa1100/SA-1100.h b/include/asm-arm/arch-sa1100/SA-1100.h index e8c88721949f..12856adff527 100644 --- a/include/asm-arm/arch-sa1100/SA-1100.h +++ b/include/asm-arm/arch-sa1100/SA-1100.h @@ -2761,10 +2761,10 @@ typedef PCMCIAPrtType PCMCIAType [PCMCIASp/PCMCIAPrtSp] ; #define LCCR1_DisWdth(Pixel) /* Display Width [16..1024 pix.] */ \ (((Pixel) - 16)/16 << FShft (LCCR1_PPL)) #define LCCR1_HSW Fld (6, 10) /* Horizontal Synchronization */ - /* pulse Width - 1 [Tpix] (L_LCLK) */ + /* pulse Width - 1 [Tpix] (L_LCLK) */ #define LCCR1_HorSnchWdth(Tpix) /* Horizontal Synchronization */ \ - /* pulse Width [1..64 Tpix] */ \ - (((Tpix) - 1) << FShft (LCCR1_HSW)) + /* pulse Width [1..64 Tpix] */ \ + (((Tpix) - 1) << FShft (LCCR1_HSW)) #define LCCR1_ELW Fld (8, 16) /* End-of-Line pixel clock Wait */ /* count - 1 [Tpix] */ #define LCCR1_EndLnDel(Tpix) /* End-of-Line Delay */ \ diff --git a/include/asm-arm/arch-sa1100/assabet.h b/include/asm-arm/arch-sa1100/assabet.h index 084dfe4afc1a..2992dad54f63 100644 --- a/include/asm-arm/arch-sa1100/assabet.h +++ b/include/asm-arm/arch-sa1100/assabet.h @@ -124,8 +124,8 @@ extern unsigned long BCR_value; #define NEPONSET_USAR_IRQ MISC_IRQ1 #define NEPONSET_CPLD_BASE (0x10000000) -#define Nep_p2v( x ) ((x) - NEPONSET_CPLD_BASE + 0xf0000000) -#define Nep_v2p( x ) ((x) - 0xf0000000 + NEPONSET_CPLD_BASE) +#define Nep_p2v( x ) ((x) - NEPONSET_CPLD_BASE + 0xf3000000) +#define Nep_v2p( x ) ((x) - 0xf3000000 + NEPONSET_CPLD_BASE) #define _IRR 0x10000024 /* Interrupt Reason Register */ #define _AUD_CTL 0x100000c0 /* Audio controls (RW) */ diff --git a/include/asm-arm/arch-sa1100/ide.h b/include/asm-arm/arch-sa1100/ide.h index b893e0dfdf65..99d3d4bf7576 100644 --- a/include/asm-arm/arch-sa1100/ide.h +++ b/include/asm-arm/arch-sa1100/ide.h @@ -112,15 +112,15 @@ ide_init_default_hwifs(void) hw_regs_t hw; /* Enable GPIO as interrupt line */ - GPDR &= ~GPIO_GPIO1; - set_GPIO_IRQ_edge(GPIO_GPIO1, GPIO_RISING_EDGE); + GPDR &= ~LART_GPIO_IDE; + set_GPIO_IRQ_edge(LART_GPIO_IDE, GPIO_RISING_EDGE); /* set PCMCIA interface timing */ MECR = 0x00060006; /* init the interface */ ide_init_hwif_ports(&hw, PCMCIA_IO_0_BASE + 0x0000, PCMCIA_IO_0_BASE + 0x1000, NULL); - hw.irq = IRQ_GPIO1; + hw.irq = LART_IRQ_IDE; ide_register_hw(&hw, NULL); #endif } diff --git a/include/asm-arm/arch-sa1100/lart.h b/include/asm-arm/arch-sa1100/lart.h index 342391618ec6..8a5482d908db 100644 --- a/include/asm-arm/arch-sa1100/lart.h +++ b/include/asm-arm/arch-sa1100/lart.h @@ -1,7 +1,13 @@ #ifndef _INCLUDE_LART_H #define _INCLUDE_LART_H -#define GPIO_UCB1200_IRQ GPIO_GPIO (18) -#define IRQ_GPIO_UCB1200_IRQ IRQ_GPIO18 +#define LART_GPIO_ETH0 GPIO_GPIO0 +#define LART_IRQ_ETH0 IRQ_GPIO0 + +#define LART_GPIO_IDE GPIO_GPIO1 +#define LART_IRQ_IDE IRQ_GPIO1 + +#define LART_GPIO_UCB1200 GPIO_GPIO18 +#define LART_IRQ_UCB1200 IRQ_GPIO18 #endif diff --git a/include/asm-arm/arch-sa1100/simpad.h b/include/asm-arm/arch-sa1100/simpad.h index 472cb9f3546f..43f73587708c 100644 --- a/include/asm-arm/arch-sa1100/simpad.h +++ b/include/asm-arm/arch-sa1100/simpad.h @@ -51,12 +51,12 @@ #define SA1100_UART1_EXT \ (struct huw_irq_desc){GPIO_UART1_CTS, IRQ_UART1_CTS, \ - GPIO_UART1_DCD, IRQ_UART1_DCD, \ - GPIO_UART1_DSR, IRQ_UART1_DSR} + GPIO_UART1_DCD, IRQ_UART1_DCD, \ + GPIO_UART1_DSR, IRQ_UART1_DSR} #define SA1100_UART3_EXT \ (struct huw_irq_desc){GPIO_UART3_CTS, IRQ_UART3_CTS, \ - GPIO_UART3_DCD, IRQ_UART3_DCD, \ - GPIO_UART3_DSR, IRQ_UART3_DSR} + GPIO_UART3_DCD, IRQ_UART3_DCD, \ + GPIO_UART3_DSR, IRQ_UART3_DSR} /*--- PCMCIA ---*/ diff --git a/include/asm-arm/keyboard.h b/include/asm-arm/keyboard.h index 7d256af70dc9..c907c748c93d 100644 --- a/include/asm-arm/keyboard.h +++ b/include/asm-arm/keyboard.h @@ -23,6 +23,12 @@ #include <asm/arch/keyboard.h> +#ifndef kbd_rate +struct kbd_repeat; + +extern int kbd_rate(struct kbd_repeat *rate) __attribute__((weak)); +#endif + #endif /* __KERNEL__ */ #endif /* __ASM_ARM_KEYBOARD_H */ diff --git a/include/asm-arm/proc-armv/cache.h b/include/asm-arm/proc-armv/cache.h index 777a14d2dc49..a924c9bc42ca 100644 --- a/include/asm-arm/proc-armv/cache.h +++ b/include/asm-arm/proc-armv/cache.h @@ -231,7 +231,4 @@ static inline void flush_dcache_page(struct page *page) * cache entries for the kernels virtual memory range are written * back to the page. */ -extern void check_pgcache_dirty(struct page *page); - -#define update_mmu_cache(vma,address,pte) check_pgcache_dirty(pte_page(pte)) - +extern void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, pte_t pte); |