Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
d283a570
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,发现更多精彩内容 >>
提交
d283a570
编写于
3月 18, 2015
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.denx.de/u-boot-mmc
上级
052a681b
3a48944b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
7 deletion
+7
-7
drivers/mmc/mv_sdhci.c
drivers/mmc/mv_sdhci.c
+2
-2
drivers/mmc/s5p_sdhci.c
drivers/mmc/s5p_sdhci.c
+1
-1
drivers/mmc/sdhci.c
drivers/mmc/sdhci.c
+4
-4
未找到文件。
drivers/mmc/mv_sdhci.c
浏览文件 @
d283a570
...
...
@@ -12,7 +12,7 @@ static struct sdhci_ops mv_ops;
static
inline
void
mv_sdhci_writeb
(
struct
sdhci_host
*
host
,
u8
val
,
int
reg
)
{
struct
mmc
*
mmc
=
host
->
mmc
;
u32
ata
=
(
u
32
)
host
->
ioaddr
+
SD_CE_ATA_2
;
u32
ata
=
(
u
nsigned
long
)
host
->
ioaddr
+
SD_CE_ATA_2
;
if
(
!
IS_SD
(
mmc
)
&&
reg
==
SDHCI_HOST_CONTROL
)
{
if
(
mmc
->
bus_width
==
8
)
...
...
@@ -30,7 +30,7 @@ static inline void mv_sdhci_writeb(struct sdhci_host *host, u8 val, int reg)
#endif
/* CONFIG_MMC_SDHCI_IO_ACCESSORS */
static
char
*
MVSDH_NAME
=
"mv_sdh"
;
int
mv_sdh_init
(
u
32
regbase
,
u32
max_clk
,
u32
min_clk
,
u32
quirks
)
int
mv_sdh_init
(
u
nsigned
long
regbase
,
u32
max_clk
,
u32
min_clk
,
u32
quirks
)
{
struct
sdhci_host
*
host
=
NULL
;
host
=
(
struct
sdhci_host
*
)
malloc
(
sizeof
(
struct
sdhci_host
));
...
...
drivers/mmc/s5p_sdhci.c
浏览文件 @
d283a570
...
...
@@ -30,7 +30,7 @@ static void s5p_sdhci_set_control_reg(struct sdhci_host *host)
sdhci_writel
(
host
,
SDHCI_CTRL4_DRIVE_MASK
(
0x3
),
SDHCI_CONTROL4
);
val
=
sdhci_readl
(
host
,
SDHCI_CONTROL2
);
val
&=
SDHCI_CTRL2_SELBASECLK_
SHIFT
;
val
&=
SDHCI_CTRL2_SELBASECLK_
MASK
(
3
)
;
val
|=
SDHCI_CTRL2_ENSTAASYNCCLR
|
SDHCI_CTRL2_ENCMDCNFMSK
|
...
...
drivers/mmc/sdhci.c
浏览文件 @
d283a570
...
...
@@ -194,13 +194,13 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
#ifdef CONFIG_MMC_SDMA
if
(
data
->
flags
==
MMC_DATA_READ
)
start_addr
=
(
unsigned
int
)
data
->
dest
;
start_addr
=
(
unsigned
long
)
data
->
dest
;
else
start_addr
=
(
unsigned
int
)
data
->
src
;
start_addr
=
(
unsigned
long
)
data
->
src
;
if
((
host
->
quirks
&
SDHCI_QUIRK_32BIT_DMA_ADDR
)
&&
(
start_addr
&
0x7
)
!=
0x0
)
{
is_aligned
=
0
;
start_addr
=
(
unsigned
int
)
aligned_buffer
;
start_addr
=
(
unsigned
long
)
aligned_buffer
;
if
(
data
->
flags
!=
MMC_DATA_READ
)
memcpy
(
aligned_buffer
,
data
->
src
,
trans_bytes
);
}
...
...
@@ -412,7 +412,7 @@ static int sdhci_init(struct mmc *mmc)
if
(
host
->
quirks
&
SDHCI_QUIRK_NO_CD
)
{
unsigned
int
status
;
sdhci_write
l
(
host
,
SDHCI_CTRL_CD_TEST_INS
|
SDHCI_CTRL_CD_TEST
,
sdhci_write
b
(
host
,
SDHCI_CTRL_CD_TEST_INS
|
SDHCI_CTRL_CD_TEST
,
SDHCI_HOST_CONTROL
);
status
=
sdhci_readl
(
host
,
SDHCI_PRESENT_STATE
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录