Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
163bc1e4
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,发现更多精彩内容 >>
提交
163bc1e4
编写于
8月 09, 2019
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge tag 'mmc-8-9' of
https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- mmc test fix - sdhci driver fix
上级
21bc1935
d569b4b0
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
23 addition
and
16 deletion
+23
-16
drivers/mmc/Kconfig
drivers/mmc/Kconfig
+1
-0
drivers/mmc/atmel_sdhci.c
drivers/mmc/atmel_sdhci.c
+2
-2
drivers/mmc/bcm2835_sdhci.c
drivers/mmc/bcm2835_sdhci.c
+3
-1
drivers/mmc/bcmstb_sdhci.c
drivers/mmc/bcmstb_sdhci.c
+2
-1
drivers/mmc/msm_sdhci.c
drivers/mmc/msm_sdhci.c
+2
-2
drivers/mmc/pci_mmc.c
drivers/mmc/pci_mmc.c
+2
-2
drivers/mmc/s5p_sdhci.c
drivers/mmc/s5p_sdhci.c
+2
-2
drivers/mmc/sdhci-cadence.c
drivers/mmc/sdhci-cadence.c
+2
-1
drivers/mmc/tangier_sdhci.c
drivers/mmc/tangier_sdhci.c
+2
-1
drivers/mmc/zynq_sdhci.c
drivers/mmc/zynq_sdhci.c
+4
-3
test/py/tests/test_mmc_wr.py
test/py/tests/test_mmc_wr.py
+1
-1
未找到文件。
drivers/mmc/Kconfig
浏览文件 @
163bc1e4
...
...
@@ -156,6 +156,7 @@ config MMC_HS400_SUPPORT
config SPL_MMC_HS400_SUPPORT
bool "enable HS400 support in SPL"
select SPL_MMC_HS200_SUPPORT
help
The HS400 mode is support by some eMMC. The bus frequency is up to
200MHz. This mode requires tuning the IO.
...
...
drivers/mmc/atmel_sdhci.c
浏览文件 @
163bc1e4
...
...
@@ -88,13 +88,13 @@ static int atmel_sdhci_probe(struct udevice *dev)
return
-
EINVAL
;
host
->
max_clk
=
max_clk
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
0
,
ATMEL_SDHC_MIN_FREQ
);
if
(
ret
)
return
ret
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
host
->
mmc
->
priv
=
host
;
upriv
->
mmc
=
host
->
mmc
;
...
...
drivers/mmc/bcm2835_sdhci.c
浏览文件 @
163bc1e4
...
...
@@ -214,6 +214,9 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
host
->
voltages
=
MMC_VDD_32_33
|
MMC_VDD_33_34
|
MMC_VDD_165_195
;
host
->
ops
=
&
bcm2835_ops
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
emmc_freq
,
MIN_FREQ
);
if
(
ret
)
{
debug
(
"%s: Failed to setup SDHCI (err=%d)
\n
"
,
__func__
,
ret
);
...
...
@@ -221,7 +224,6 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
}
upriv
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
priv
=
host
;
return
sdhci_probe
(
dev
);
...
...
drivers/mmc/bcmstb_sdhci.c
浏览文件 @
163bc1e4
...
...
@@ -73,6 +73,8 @@ static int sdhci_bcmstb_probe(struct udevice *dev)
if
(
ret
)
return
ret
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
BCMSTB_SDHCI_MAXIMUM_CLOCK_FREQUENCY
,
BCMSTB_SDHCI_MINIMUM_CLOCK_FREQUENCY
);
...
...
@@ -80,7 +82,6 @@ static int sdhci_bcmstb_probe(struct udevice *dev)
return
ret
;
upriv
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
priv
=
host
;
return
sdhci_probe
(
dev
);
...
...
drivers/mmc/msm_sdhci.c
浏览文件 @
163bc1e4
...
...
@@ -141,12 +141,12 @@ static int msm_sdc_probe(struct udevice *dev)
writel
(
caps
,
host
->
ioaddr
+
SDHCI_VENDOR_SPEC_CAPABILITIES0
);
}
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
0
,
0
);
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
0
,
0
);
if
(
ret
)
return
ret
;
host
->
mmc
->
priv
=
&
prv
->
host
;
host
->
mmc
->
dev
=
dev
;
upriv
->
mmc
=
host
->
mmc
;
return
sdhci_probe
(
dev
);
...
...
drivers/mmc/pci_mmc.c
浏览文件 @
163bc1e4
...
...
@@ -33,12 +33,12 @@ static int pci_mmc_probe(struct udevice *dev)
host
->
ioaddr
=
(
void
*
)
dm_pci_map_bar
(
dev
,
PCI_BASE_ADDRESS_0
,
PCI_REGION_MEM
);
host
->
name
=
dev
->
name
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
0
,
0
);
if
(
ret
)
return
ret
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
priv
=
&
priv
->
host
;
host
->
mmc
->
dev
=
dev
;
upriv
->
mmc
=
host
->
mmc
;
return
sdhci_probe
(
dev
);
...
...
drivers/mmc/s5p_sdhci.c
浏览文件 @
163bc1e4
...
...
@@ -204,13 +204,13 @@ static int s5p_sdhci_probe(struct udevice *dev)
if
(
ret
)
return
ret
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
0
,
400000
);
if
(
ret
)
return
ret
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
priv
=
host
;
host
->
mmc
->
dev
=
dev
;
upriv
->
mmc
=
host
->
mmc
;
return
sdhci_probe
(
dev
);
...
...
drivers/mmc/sdhci-cadence.c
浏览文件 @
163bc1e4
...
...
@@ -269,12 +269,13 @@ static int sdhci_cdns_probe(struct udevice *dev)
if
(
ret
)
return
ret
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
0
,
0
);
if
(
ret
)
return
ret
;
upriv
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
priv
=
host
;
return
sdhci_probe
(
dev
);
...
...
drivers/mmc/tangier_sdhci.c
浏览文件 @
163bc1e4
...
...
@@ -51,13 +51,14 @@ static int sdhci_tangier_probe(struct udevice *dev)
/* MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195 */
host
->
voltages
=
MMC_VDD_165_195
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
SDHCI_TANGIER_FMAX
,
SDHCI_TANGIER_FMIN
);
if
(
ret
)
return
ret
;
upriv
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
priv
=
host
;
return
sdhci_probe
(
dev
);
...
...
drivers/mmc/zynq_sdhci.c
浏览文件 @
163bc1e4
...
...
@@ -242,13 +242,14 @@ static int arasan_sdhci_probe(struct udevice *dev)
host
->
max_clk
=
clock
;
host
->
mmc
=
&
plat
->
mmc
;
host
->
mmc
->
dev
=
dev
;
host
->
mmc
->
priv
=
host
;
ret
=
sdhci_setup_cfg
(
&
plat
->
cfg
,
host
,
plat
->
f_max
,
CONFIG_ZYNQ_SDHCI_MIN_FREQ
);
host
->
mmc
=
&
plat
->
mmc
;
if
(
ret
)
return
ret
;
host
->
mmc
->
priv
=
host
;
host
->
mmc
->
dev
=
dev
;
upriv
->
mmc
=
host
->
mmc
;
return
sdhci_probe
(
dev
);
...
...
test/py/tests/test_mmc_wr.py
浏览文件 @
163bc1e4
...
...
@@ -35,7 +35,7 @@ env__mmc_wr_configs = (
"""
@
pytest
.
mark
.
buildconfigspec
(
'cmd_mmc'
,
'cmd_
memory
'
)
@
pytest
.
mark
.
buildconfigspec
(
'cmd_mmc'
,
'cmd_
random
'
)
def
test_mmc_wr
(
u_boot_console
,
env__mmc_wr_config
):
"""Test the "mmc write" command.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录