Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
52d90145
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
52d90145
编写于
7月 21, 2010
作者:
R
Russell King
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix' of
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
上级
f4b23cc2
59376cc3
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
12 addition
and
16 deletion
+12
-16
arch/arm/mach-pxa/colibri-pxa300.c
arch/arm/mach-pxa/colibri-pxa300.c
+2
-1
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/corgi.c
+1
-1
arch/arm/mach-pxa/cpufreq-pxa2xx.c
arch/arm/mach-pxa/cpufreq-pxa2xx.c
+2
-6
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa27x.c
+3
-3
drivers/pcmcia/pxa2xx_base.c
drivers/pcmcia/pxa2xx_base.c
+2
-3
drivers/usb/gadget/pxa27x_udc.c
drivers/usb/gadget/pxa27x_udc.c
+1
-1
drivers/usb/host/ohci-pxa27x.c
drivers/usb/host/ohci-pxa27x.c
+1
-1
未找到文件。
arch/arm/mach-pxa/colibri-pxa300.c
浏览文件 @
52d90145
...
...
@@ -26,6 +26,7 @@
#include <mach/colibri.h>
#include <mach/ohci.h>
#include <mach/pxafb.h>
#include <mach/audio.h>
#include "generic.h"
#include "devices.h"
...
...
@@ -145,7 +146,7 @@ static void __init colibri_pxa300_init_lcd(void)
static
inline
void
colibri_pxa300_init_lcd
(
void
)
{}
#endif
/* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULE */
#if defined(
SND_AC97_CODEC) || defined(
SND_AC97_CODEC_MODULE)
#if defined(
CONFIG_SND_AC97_CODEC) || defined(CONFIG_
SND_AC97_CODEC_MODULE)
static
mfp_cfg_t
colibri_pxa310_ac97_pin_config
[]
__initdata
=
{
GPIO24_AC97_SYSCLK
,
GPIO23_AC97_nACRESET
,
...
...
arch/arm/mach-pxa/corgi.c
浏览文件 @
52d90145
...
...
@@ -446,7 +446,7 @@ static struct platform_device corgiled_device = {
static
struct
pxamci_platform_data
corgi_mci_platform_data
=
{
.
detect_delay_ms
=
250
,
.
ocr_mask
=
MMC_VDD_32_33
|
MMC_VDD_33_34
,
.
gpio_card_detect
=
-
1
,
.
gpio_card_detect
=
CORGI_GPIO_nSD_DETECT
,
.
gpio_card_ro
=
CORGI_GPIO_nSD_WP
,
.
gpio_power
=
CORGI_GPIO_SD_PWR
,
};
...
...
arch/arm/mach-pxa/cpufreq-pxa2xx.c
浏览文件 @
52d90145
...
...
@@ -256,13 +256,9 @@ static void init_sdram_rows(void)
static
u32
mdrefr_dri
(
unsigned
int
freq
)
{
u32
dri
=
0
;
u32
interval
=
freq
*
SDRAM_TREF
/
sdram_rows
;
if
(
cpu_is_pxa25x
())
dri
=
((
freq
*
SDRAM_TREF
)
/
(
sdram_rows
*
32
));
if
(
cpu_is_pxa27x
())
dri
=
((
freq
*
SDRAM_TREF
)
/
(
sdram_rows
-
31
))
/
32
;
return
dri
;
return
(
interval
-
(
cpu_is_pxa27x
()
?
31
:
0
))
/
32
;
}
/* find a valid frequency point */
...
...
arch/arm/mach-pxa/pxa27x.c
浏览文件 @
52d90145
...
...
@@ -41,10 +41,10 @@ void pxa27x_clear_otgph(void)
EXPORT_SYMBOL
(
pxa27x_clear_otgph
);
static
unsigned
long
ac97_reset_config
[]
=
{
GPIO95_AC97_nRESET
,
GPIO95_GPIO
,
GPIO113_AC97_nRESET
,
GPIO113_GPIO
,
GPIO113_AC97_nRESET
,
GPIO95_GPIO
,
GPIO95_AC97_nRESET
,
};
void
pxa27x_assert_ac97reset
(
int
reset_gpio
,
int
on
)
...
...
drivers/pcmcia/pxa2xx_base.c
浏览文件 @
52d90145
...
...
@@ -178,7 +178,6 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
unsigned
long
val
,
struct
cpufreq_freqs
*
freqs
)
{
#warning "it's not clear if this is right since the core CPU (N) clock has no effect on the memory (L) clock"
switch
(
val
)
{
case
CPUFREQ_PRECHANGE
:
if
(
freqs
->
new
>
freqs
->
old
)
{
...
...
@@ -186,7 +185,7 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
"pre-updating
\n
"
,
freqs
->
new
/
1000
,
(
freqs
->
new
/
100
)
%
10
,
freqs
->
old
/
1000
,
(
freqs
->
old
/
100
)
%
10
);
pxa2xx_pcmcia_set_
mcxx
(
skt
,
freqs
->
new
);
pxa2xx_pcmcia_set_
timing
(
skt
);
}
break
;
...
...
@@ -196,7 +195,7 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
"post-updating
\n
"
,
freqs
->
new
/
1000
,
(
freqs
->
new
/
100
)
%
10
,
freqs
->
old
/
1000
,
(
freqs
->
old
/
100
)
%
10
);
pxa2xx_pcmcia_set_
mcxx
(
skt
,
freqs
->
new
);
pxa2xx_pcmcia_set_
timing
(
skt
);
}
break
;
}
...
...
drivers/usb/gadget/pxa27x_udc.c
浏览文件 @
52d90145
...
...
@@ -2561,7 +2561,7 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
udc_disable
(
udc
);
}
#ifdef CONFIG_
CPU_
PXA27x
#ifdef CONFIG_PXA27x
extern
void
pxa27x_clear_otgph
(
void
);
#else
#define pxa27x_clear_otgph() do {} while (0)
...
...
drivers/usb/host/ohci-pxa27x.c
浏览文件 @
52d90145
...
...
@@ -203,7 +203,7 @@ static inline void pxa27x_reset_hc(struct pxa27x_ohci *ohci)
__raw_writel
(
uhchr
&
~
UHCHR_FHR
,
ohci
->
mmio_base
+
UHCHR
);
}
#ifdef CONFIG_
CPU_
PXA27x
#ifdef CONFIG_PXA27x
extern
void
pxa27x_clear_otgph
(
void
);
#else
#define pxa27x_clear_otgph() do {} while (0)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录