diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-25 13:52:56 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-25 13:52:56 +0000 |
| commit | 65d76f368295973a35d195c9b13053502a67b6bc (patch) | |
| tree | fa7d9204b2da01a9c53633dda789380cfcad38c6 /arch/mips/include/asm | |
| parent | dba0a918722ee0f0ba3442575e4448c3ab622be4 (diff) | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
| download | kernel_samsung_smdk4412-65d76f368295973a35d195c9b13053502a67b6bc.zip kernel_samsung_smdk4412-65d76f368295973a35d195c9b13053502a67b6bc.tar.gz kernel_samsung_smdk4412-65d76f368295973a35d195c9b13053502a67b6bc.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/mips/include/asm')
| -rw-r--r-- | arch/mips/include/asm/mach-rc32434/gpio.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-rc32434/rb.h | 14 | ||||
| -rw-r--r-- | arch/mips/include/asm/time.h | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/arch/mips/include/asm/mach-rc32434/gpio.h b/arch/mips/include/asm/mach-rc32434/gpio.h index c8e554e..b5cf645 100644 --- a/arch/mips/include/asm/mach-rc32434/gpio.h +++ b/arch/mips/include/asm/mach-rc32434/gpio.h @@ -84,5 +84,7 @@ extern void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned extern unsigned get_434_reg(unsigned reg_offs); extern void set_latch_u5(unsigned char or_mask, unsigned char nand_mask); extern unsigned char get_latch_u5(void); +extern void rb532_gpio_set_ilevel(int bit, unsigned gpio); +extern void rb532_gpio_set_istat(int bit, unsigned gpio); #endif /* _RC32434_GPIO_H_ */ diff --git a/arch/mips/include/asm/mach-rc32434/rb.h b/arch/mips/include/asm/mach-rc32434/rb.h index 79e8ef6..f25a849 100644 --- a/arch/mips/include/asm/mach-rc32434/rb.h +++ b/arch/mips/include/asm/mach-rc32434/rb.h @@ -40,12 +40,14 @@ #define BTCS 0x010040 #define BTCOMPARE 0x010044 #define GPIOBASE 0x050000 -#define GPIOCFG 0x050004 -#define GPIOD 0x050008 -#define GPIOILEVEL 0x05000C -#define GPIOISTAT 0x050010 -#define GPIONMIEN 0x050014 -#define IMASK6 0x038038 +/* Offsets relative to GPIOBASE */ +#define GPIOFUNC 0x00 +#define GPIOCFG 0x04 +#define GPIOD 0x08 +#define GPIOILEVEL 0x0C +#define GPIOISTAT 0x10 +#define GPIONMIEN 0x14 +#define IMASK6 0x38 #define LO_WPX (1 << 0) #define LO_ALE (1 << 1) #define LO_CLE (1 << 2) diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index d3bd5c5..9601ea9 100644 --- a/arch/mips/include/asm/time.h +++ b/arch/mips/include/asm/time.h @@ -63,7 +63,7 @@ static inline int mips_clockevent_init(void) /* * Initialize the count register as a clocksource */ -#ifdef CONFIG_CEVT_R4K +#ifdef CONFIG_CSRC_R4K extern int init_mips_clocksource(void); #else static inline int init_mips_clocksource(void) |