Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
aab3a70e
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,发现更多精彩内容 >>
提交
aab3a70e
编写于
10月 08, 2011
作者:
A
Arnd Bergmann
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'omap/fixes-for-3.1' into fixes
上级
98e87d57
b8e111a7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
12 deletion
+6
-12
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-2430sdp.c
+2
-1
arch/arm/mach-omap2/hsmmc.c
arch/arm/mach-omap2/hsmmc.c
+4
-8
arch/arm/mach-omap2/usb-musb.c
arch/arm/mach-omap2/usb-musb.c
+0
-3
未找到文件。
arch/arm/mach-omap2/board-2430sdp.c
浏览文件 @
aab3a70e
...
...
@@ -193,7 +193,8 @@ static int __init omap2430_i2c_init(void)
{
omap_register_i2c_bus
(
1
,
100
,
sdp2430_i2c1_boardinfo
,
ARRAY_SIZE
(
sdp2430_i2c1_boardinfo
));
omap2_pmic_init
(
"twl4030"
,
&
sdp2430_twldata
);
omap_pmic_init
(
2
,
100
,
"twl4030"
,
INT_24XX_SYS_NIRQ
,
&
sdp2430_twldata
);
return
0
;
}
...
...
arch/arm/mach-omap2/hsmmc.c
浏览文件 @
aab3a70e
...
...
@@ -137,8 +137,7 @@ static void omap4_hsmmc1_before_set_reg(struct device *dev, int slot,
*/
reg
=
omap4_ctrl_pad_readl
(
control_pbias_offset
);
reg
&=
~
(
OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK
|
OMAP4_MMC1_PWRDNZ_MASK
|
OMAP4_USBC1_ICUSB_PWRDNZ_MASK
);
OMAP4_MMC1_PWRDNZ_MASK
);
omap4_ctrl_pad_writel
(
reg
,
control_pbias_offset
);
}
...
...
@@ -156,8 +155,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
else
reg
|=
OMAP4_MMC1_PBIASLITE_VMODE_MASK
;
reg
|=
(
OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK
|
OMAP4_MMC1_PWRDNZ_MASK
|
OMAP4_USBC1_ICUSB_PWRDNZ_MASK
);
OMAP4_MMC1_PWRDNZ_MASK
);
omap4_ctrl_pad_writel
(
reg
,
control_pbias_offset
);
timeout
=
jiffies
+
msecs_to_jiffies
(
5
);
...
...
@@ -171,16 +169,14 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
if
(
reg
&
OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK
)
{
pr_err
(
"Pbias Voltage is not same as LDO
\n
"
);
/* Caution : On VMODE_ERROR Power Down MMC IO */
reg
&=
~
(
OMAP4_MMC1_PWRDNZ_MASK
|
OMAP4_USBC1_ICUSB_PWRDNZ_MASK
);
reg
&=
~
(
OMAP4_MMC1_PWRDNZ_MASK
);
omap4_ctrl_pad_writel
(
reg
,
control_pbias_offset
);
}
}
else
{
reg
=
omap4_ctrl_pad_readl
(
control_pbias_offset
);
reg
|=
(
OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK
|
OMAP4_MMC1_PWRDNZ_MASK
|
OMAP4_MMC1_PBIASLITE_VMODE_MASK
|
OMAP4_USBC1_ICUSB_PWRDNZ_MASK
);
OMAP4_MMC1_PBIASLITE_VMODE_MASK
);
omap4_ctrl_pad_writel
(
reg
,
control_pbias_offset
);
}
}
...
...
arch/arm/mach-omap2/usb-musb.c
浏览文件 @
aab3a70e
...
...
@@ -137,9 +137,6 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
musb_plat
.
mode
=
board_data
->
mode
;
musb_plat
.
extvbus
=
board_data
->
extvbus
;
if
(
cpu_is_omap44xx
())
omap4430_phy_init
(
dev
);
if
(
cpu_is_omap3517
()
||
cpu_is_omap3505
())
{
oh_name
=
"am35x_otg_hs"
;
name
=
"musb-am35x"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录