leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2007-03-24 17:01:45 -07:00
parent 0fa7d868ca 53698d2537
commit 317ec6cd00
7 changed files with 68 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/asm-arm/arch-ns9xxx/clock.h
View File

@@ -11,6 +11,7 @@
#ifndef __ASM_ARCH_CLOCK_H
#define __ASM_ARCH_CLOCK_H
static inline u32 ns9xxx_systemclock(void) __attribute__((const));
static inline u32 ns9xxx_systemclock(void)
{
/*
@@ -19,17 +20,20 @@ static inline u32 ns9xxx_systemclock(void)
return 353894400;
}
static inline const u32 ns9xxx_cpuclock(void)
static inline u32 ns9xxx_cpuclock(void) __attribute__((const));
static inline u32 ns9xxx_cpuclock(void)
{
return ns9xxx_systemclock() / 2;
}
static inline const u32 ns9xxx_ahbclock(void)
static inline u32 ns9xxx_ahbclock(void) __attribute__((const));
static inline u32 ns9xxx_ahbclock(void)
{
return ns9xxx_systemclock() / 4;
}
static inline const u32 ns9xxx_bbusclock(void)
static inline u32 ns9xxx_bbusclock(void) __attribute__((const));
static inline u32 ns9xxx_bbusclock(void)
{
return ns9xxx_systemclock() / 8;
}

2
include/asm-arm/arch-pxa/pxa-regs.h
View File

@@ -1476,7 +1476,7 @@
#define GPIO112_MMCCMD_MD (112 | GPIO_ALT_FN_1_OUT)
#define GPIO113_I2S_SYSCLK_MD (113 | GPIO_ALT_FN_1_OUT)
#define GPIO113_AC97_RESET_N_MD (113 | GPIO_ALT_FN_2_OUT)
#define GPIO117_I2CSCL_MD (117 | GPIO_ALT_FN_1_OUT)
#define GPIO117_I2CSCL_MD (117 | GPIO_ALT_FN_1_IN)
#define GPIO118_I2CSDA_MD (118 | GPIO_ALT_FN_1_IN)
/*