Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
8b4a610a
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8b4a610a
编写于
5月 01, 2018
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-mmc
上级
08ae21af
4bf225aa
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
19 addition
and
5 deletion
+19
-5
board/samsung/common/exynos5-dt.c
board/samsung/common/exynos5-dt.c
+4
-0
drivers/mmc/mmc.c
drivers/mmc/mmc.c
+1
-1
drivers/mmc/sdhci.c
drivers/mmc/sdhci.c
+7
-1
drivers/mmc/zynq_sdhci.c
drivers/mmc/zynq_sdhci.c
+1
-1
drivers/power/mfd/fg_max77693.c
drivers/power/mfd/fg_max77693.c
+0
-2
include/sdhci.h
include/sdhci.h
+6
-0
未找到文件。
board/samsung/common/exynos5-dt.c
浏览文件 @
8b4a610a
...
...
@@ -93,6 +93,9 @@ int exynos_power_init(void)
struct
udevice
*
dev
;
int
ret
;
#ifdef CONFIG_PMIC_S2MPS11
ret
=
pmic_get
(
"s2mps11_pmic"
,
&
dev
);
#else
ret
=
pmic_get
(
"max77686"
,
&
dev
);
if
(
!
ret
)
{
/* TODO(sjg@chromium.org): Move into the clock/pmic API */
...
...
@@ -112,6 +115,7 @@ int exynos_power_init(void)
s5m8767_enable_32khz_cp
(
dev
);
#endif
}
#endif
/* CONFIG_PMIC_S2MPS11 */
if
(
ret
==
-
ENODEV
)
return
0
;
...
...
drivers/mmc/mmc.c
浏览文件 @
8b4a610a
...
...
@@ -1689,7 +1689,7 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
#if CONFIG_IS_ENABLED(MMC_WRITE)
err
=
sd_read_ssr
(
mmc
);
if
(
!
err
)
if
(
err
)
pr_warn
(
"unable to read ssr
\n
"
);
#endif
if
(
!
err
)
...
...
drivers/mmc/sdhci.c
浏览文件 @
8b4a610a
...
...
@@ -462,7 +462,8 @@ static int sdhci_set_ios(struct mmc *mmc)
else
ctrl
&=
~
SDHCI_CTRL_HISPD
;
if
(
host
->
quirks
&
SDHCI_QUIRK_NO_HISPD_BIT
)
if
((
host
->
quirks
&
SDHCI_QUIRK_NO_HISPD_BIT
)
||
(
host
->
quirks
&
SDHCI_QUIRK_BROKEN_HISPD_MODE
))
ctrl
&=
~
SDHCI_CTRL_HISPD
;
sdhci_writeb
(
host
,
ctrl
,
SDHCI_HOST_CONTROL
);
...
...
@@ -602,6 +603,11 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
cfg
->
host_caps
&=
~
MMC_MODE_8BIT
;
}
if
(
host
->
quirks
&
SDHCI_QUIRK_BROKEN_HISPD_MODE
)
{
cfg
->
host_caps
&=
~
MMC_MODE_HS
;
cfg
->
host_caps
&=
~
MMC_MODE_HS_52MHz
;
}
if
(
host
->
host_caps
)
cfg
->
host_caps
|=
host
->
host_caps
;
...
...
drivers/mmc/zynq_sdhci.c
浏览文件 @
8b4a610a
...
...
@@ -54,7 +54,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
SDHCI_QUIRK_BROKEN_R1B
;
#ifdef CONFIG_ZYNQ_HISPD_BROKEN
host
->
quirks
|=
SDHCI_QUIRK_
NO_HISPD_BIT
;
host
->
quirks
|=
SDHCI_QUIRK_
BROKEN_HISPD_MODE
;
#endif
host
->
max_clk
=
clock
;
...
...
drivers/power/mfd/fg_max77693.c
浏览文件 @
8b4a610a
...
...
@@ -60,8 +60,6 @@ static int power_update_battery(struct pmic *p, struct pmic *bat)
return
ret
;
max77693_get_vcell
(
&
pb
->
bat
->
voltage_uV
);
if
(
ret
)
return
ret
;
return
0
;
}
...
...
include/sdhci.h
浏览文件 @
8b4a610a
...
...
@@ -213,6 +213,12 @@
#define SDHCI_QUIRK_BROKEN_R1B (1 << 2)
#define SDHCI_QUIRK_NO_HISPD_BIT (1 << 3)
#define SDHCI_QUIRK_BROKEN_VOLTAGE (1 << 4)
/*
* SDHCI_QUIRK_BROKEN_HISPD_MODE
* the hardware cannot operate correctly in high-speed mode,
* this quirk forces the sdhci host-controller to non high-speed mode
*/
#define SDHCI_QUIRK_BROKEN_HISPD_MODE BIT(5)
#define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6)
#define SDHCI_QUIRK_USE_WIDE8 (1 << 8)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录