diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:16:21 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:16:21 -0600 |
| commit | 911d99076781dc399979d775ec5259ade82f686e (patch) | |
| tree | d611a23fce29f94a2bc2e4b09f1aa768bea7b879 /include | |
| parent | 14d33e7fa86a09138b745030097a48c396cf4e57 (diff) | |
Patch to add basic MX-platform support to arch/arm of the linux 2.6.22
kernel.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-arch_arm.patch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/mach/keypad.h | 28 | ||||
| -rw-r--r-- | include/asm-arm/pgtable.h | 11 |
2 files changed, 39 insertions, 0 deletions
diff --git a/include/asm-arm/mach/keypad.h b/include/asm-arm/mach/keypad.h new file mode 100644 index 000000000000..cfee65ab044a --- /dev/null +++ b/include/asm-arm/mach/keypad.h @@ -0,0 +1,28 @@ +/* + * include/asm-arm/mach/keypad.h + * + * Generic Keypad struct + * + * Author: Armin Kuster <Akuster@mvista.com> + * + * 2005 (c) MontaVista Software, Inc. 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. + */ + +#ifndef __ASM_MACH_KEYPAD_H_ +#define __ASM_MACH_KEYPAD_H_ + +#include <linux/input.h> + +struct keypad_data { + u16 rowmax; + u16 colmax; + u32 irq; + u16 delay; + u16 learning; + u16 *matrix; +}; + +#endif /* __ARM_MACH_KEYPAD_H_ */ diff --git a/include/asm-arm/pgtable.h b/include/asm-arm/pgtable.h index 21dec9f258d8..e3af9215f959 100644 --- a/include/asm-arm/pgtable.h +++ b/include/asm-arm/pgtable.h @@ -171,6 +171,8 @@ extern void __pgd_error(const char *file, int line, unsigned long val); #define L_PTE_EXEC (1 << 6) #define L_PTE_DIRTY (1 << 7) #define L_PTE_SHARED (1 << 10) /* shared(v6), coherent(xsc3) */ +#define L_PTE_EXTENDED (1 << 9) /* CB bits mapped to extended memory type */ + #ifndef __ASSEMBLY__ @@ -291,6 +293,15 @@ PTE_BIT_FUNC(mkyoung, |= L_PTE_YOUNG); */ #define pgprot_noncached(prot) __pgprot(pgprot_val(prot) & ~(L_PTE_CACHEABLE | L_PTE_BUFFERABLE)) #define pgprot_writecombine(prot) __pgprot(pgprot_val(prot) & ~L_PTE_CACHEABLE) +#define pgprot_writethru(prot) __pgprot(pgprot_val(prot) & ~L_PTE_BUFFERABLE) + +/* Extended config for non-shared device attributes */ +#define pgprot_nonshareddev(prot) __pgprot(pgprot_val(prot) | L_PTE_EXTENDED) +/* Extended configurations for inner writeback cacheable */ +#define pgprot_writealloc(prot) __pgprot(pgprot_val(prot) | L_PTE_EXTENDED & ~L_PTE_CACHEABLE) +#define pgprot_outer_wrthru(prot) __pgprot(pgprot_val(prot) | L_PTE_EXTENDED & ~L_PTE_BUFFERABLE) +#define pgprot_outer_noncached(prot) __pgprot(pgprot_val(prot) | L_PTE_EXTENDED & ~(L_PTE_CACHEABLE | L_PTE_BUFFERABLE)) + #define pmd_none(pmd) (!pmd_val(pmd)) #define pmd_present(pmd) (pmd_val(pmd)) |