aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-24 20:01:45 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-24 20:01:45 -0400
commit317ec6cd00f25d05d153a780bc178c5335f320ee (patch)
treeebeab6da87789807d1852edd7228a73cafe4e493 /include
parent0fa7d868ca456ddf4f41b700fd9dee186f8f4e12 (diff)
parent53698d2537bc8c2b8fedc788b8b927da9a004f9b (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4278/1: configure pxa27x I2C SCL as "input" [ARM] 4272/1: Missing symbol h1940_pm_return fix [ARM] 4235/1: ns9xxx: declare the clock functions as "const" [ARM] 4271/1: iop32x: fix ep80219 detection (support iq80219 platforms) [ARM] 4270/2: mach-s3c2443/irq.c off by one error in dma irqs
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-ns9xxx/clock.h10
-rw-r--r--include/asm-arm/arch-pxa/pxa-regs.h2
2 files changed, 8 insertions, 4 deletions
diff --git a/include/asm-arm/arch-ns9xxx/clock.h b/include/asm-arm/arch-ns9xxx/clock.h
index 4371a485db47..a7c5ab3d9011 100644
--- a/include/asm-arm/arch-ns9xxx/clock.h
+++ b/include/asm-arm/arch-ns9xxx/clock.h
@@ -11,6 +11,7 @@
11#ifndef __ASM_ARCH_CLOCK_H 11#ifndef __ASM_ARCH_CLOCK_H
12#define __ASM_ARCH_CLOCK_H 12#define __ASM_ARCH_CLOCK_H
13 13
14static inline u32 ns9xxx_systemclock(void) __attribute__((const));
14static inline u32 ns9xxx_systemclock(void) 15static inline u32 ns9xxx_systemclock(void)
15{ 16{
16 /* 17 /*
@@ -19,17 +20,20 @@ static inline u32 ns9xxx_systemclock(void)
19 return 353894400; 20 return 353894400;
20} 21}
21 22
22static inline const u32 ns9xxx_cpuclock(void) 23static inline u32 ns9xxx_cpuclock(void) __attribute__((const));
24static inline u32 ns9xxx_cpuclock(void)
23{ 25{
24 return ns9xxx_systemclock() / 2; 26 return ns9xxx_systemclock() / 2;
25} 27}
26 28
27static inline const u32 ns9xxx_ahbclock(void) 29static inline u32 ns9xxx_ahbclock(void) __attribute__((const));
30static inline u32 ns9xxx_ahbclock(void)
28{ 31{
29 return ns9xxx_systemclock() / 4; 32 return ns9xxx_systemclock() / 4;
30} 33}
31 34
32static inline const u32 ns9xxx_bbusclock(void) 35static inline u32 ns9xxx_bbusclock(void) __attribute__((const));
36static inline u32 ns9xxx_bbusclock(void)
33{ 37{
34 return ns9xxx_systemclock() / 8; 38 return ns9xxx_systemclock() / 8;
35} 39}
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index aec835b6f057..139c9d954818 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -1476,7 +1476,7 @@
1476#define GPIO112_MMCCMD_MD (112 | GPIO_ALT_FN_1_OUT) 1476#define GPIO112_MMCCMD_MD (112 | GPIO_ALT_FN_1_OUT)
1477#define GPIO113_I2S_SYSCLK_MD (113 | GPIO_ALT_FN_1_OUT) 1477#define GPIO113_I2S_SYSCLK_MD (113 | GPIO_ALT_FN_1_OUT)
1478#define GPIO113_AC97_RESET_N_MD (113 | GPIO_ALT_FN_2_OUT) 1478#define GPIO113_AC97_RESET_N_MD (113 | GPIO_ALT_FN_2_OUT)
1479#define GPIO117_I2CSCL_MD (117 | GPIO_ALT_FN_1_OUT) 1479#define GPIO117_I2CSCL_MD (117 | GPIO_ALT_FN_1_IN)
1480#define GPIO118_I2CSDA_MD (118 | GPIO_ALT_FN_1_IN) 1480#define GPIO118_I2CSDA_MD (118 | GPIO_ALT_FN_1_IN)
1481 1481
1482/* 1482/*