Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
6e5fb4ee
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,发现更多精彩内容 >>
提交
6e5fb4ee
编写于
4月 24, 2010
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.denx.de/u-boot-mmc
上级
a77034a8
77c1458d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
87 addition
and
2 deletion
+87
-2
drivers/mmc/fsl_esdhc.c
drivers/mmc/fsl_esdhc.c
+85
-2
include/fsl_esdhc.h
include/fsl_esdhc.h
+2
-0
未找到文件。
drivers/mmc/fsl_esdhc.c
浏览文件 @
6e5fb4ee
...
...
@@ -72,8 +72,10 @@ uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data)
uint
xfertyp
=
0
;
if
(
data
)
{
xfertyp
|=
XFERTYP_DPSEL
|
XFERTYP_DMAEN
;
xfertyp
|=
XFERTYP_DPSEL
;
#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
xfertyp
|=
XFERTYP_DMAEN
;
#endif
if
(
data
->
blocks
>
1
)
{
xfertyp
|=
XFERTYP_MSBSEL
;
xfertyp
|=
XFERTYP_BCEN
;
...
...
@@ -97,6 +99,71 @@ uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data)
return
XFERTYP_CMD
(
cmd
->
cmdidx
)
|
xfertyp
;
}
#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO
/*
* PIO Read/Write Mode reduce the performace as DMA is not used in this mode.
*/
static
int
esdhc_pio_read_write
(
struct
mmc
*
mmc
,
struct
mmc_data
*
data
)
{
struct
fsl_esdhc
*
regs
=
mmc
->
priv
;
uint
blocks
;
char
*
buffer
;
uint
databuf
;
uint
size
;
uint
irqstat
;
uint
timeout
;
if
(
data
->
flags
&
MMC_DATA_READ
)
{
blocks
=
data
->
blocks
;
buffer
=
data
->
dest
;
while
(
blocks
)
{
timeout
=
PIO_TIMEOUT
;
size
=
data
->
blocksize
;
irqstat
=
esdhc_read32
(
&
regs
->
irqstat
);
while
(
!
(
esdhc_read32
(
&
regs
->
prsstat
)
&
PRSSTAT_BREN
)
&&
--
timeout
);
if
(
timeout
<=
0
)
{
printf
(
"
\n
Data Read Failed in PIO Mode."
);
return
timeout
;
}
while
(
size
&&
(
!
(
irqstat
&
IRQSTAT_TC
)))
{
udelay
(
100
);
/* Wait before last byte transfer complete */
irqstat
=
esdhc_read32
(
&
regs
->
irqstat
);
databuf
=
in_le32
(
&
regs
->
datport
);
*
((
uint
*
)
buffer
)
=
databuf
;
buffer
+=
4
;
size
-=
4
;
}
blocks
--
;
}
}
else
{
blocks
=
data
->
blocks
;
buffer
=
data
->
src
;
while
(
blocks
)
{
timeout
=
PIO_TIMEOUT
;
size
=
data
->
blocksize
;
irqstat
=
esdhc_read32
(
&
regs
->
irqstat
);
while
(
!
(
esdhc_read32
(
&
regs
->
prsstat
)
&
PRSSTAT_BWEN
)
&&
--
timeout
);
if
(
timeout
<=
0
)
{
printf
(
"
\n
Data Write Failed in PIO Mode."
);
return
timeout
;
}
while
(
size
&&
(
!
(
irqstat
&
IRQSTAT_TC
)))
{
udelay
(
100
);
/* Wait before last byte transfer complete */
databuf
=
*
((
uint
*
)
buffer
);
buffer
+=
4
;
size
-=
4
;
irqstat
=
esdhc_read32
(
&
regs
->
irqstat
);
out_le32
(
&
regs
->
datport
,
databuf
);
}
blocks
--
;
}
}
}
#endif
static
int
esdhc_setup_data
(
struct
mmc
*
mmc
,
struct
mmc_data
*
data
)
{
uint
wml_value
;
...
...
@@ -104,6 +171,17 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
struct
fsl_esdhc_cfg
*
cfg
=
(
struct
fsl_esdhc_cfg
*
)
mmc
->
priv
;
struct
fsl_esdhc
*
regs
=
(
struct
fsl_esdhc
*
)
cfg
->
esdhc_base
;
#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO
if
(
!
(
data
->
flags
&
MMC_DATA_READ
))
{
if
((
esdhc_read32
(
&
regs
->
prsstat
)
&
PRSSTAT_WPSPL
)
==
0
)
{
printf
(
"
\n
The SD card is locked. "
"Can not write to a locked card.
\n\n
"
);
return
TIMEOUT
;
}
esdhc_write32
(
&
regs
->
dsaddr
,
(
u32
)
data
->
src
);
}
else
esdhc_write32
(
&
regs
->
dsaddr
,
(
u32
)
data
->
dest
);
#else
wml_value
=
data
->
blocksize
/
4
;
if
(
data
->
flags
&
MMC_DATA_READ
)
{
...
...
@@ -124,6 +202,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
wml_value
<<
16
);
esdhc_write32
(
&
regs
->
dsaddr
,
(
u32
)
data
->
src
);
}
#endif
esdhc_write32
(
&
regs
->
blkattr
,
data
->
blocks
<<
16
|
data
->
blocksize
);
...
...
@@ -220,6 +299,9 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
/* Wait until all of the blocks are transferred */
if
(
data
)
{
#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO
esdhc_pio_read_write
(
mmc
,
data
);
#else
do
{
irqstat
=
esdhc_read32
(
&
regs
->
irqstat
);
...
...
@@ -230,6 +312,7 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
return
TIMEOUT
;
}
while
(
!
(
irqstat
&
IRQSTAT_TC
)
&&
(
esdhc_read32
(
&
regs
->
prsstat
)
&
PRSSTAT_DLA
));
#endif
}
esdhc_write32
(
&
regs
->
irqstat
,
-
1
);
...
...
include/fsl_esdhc.h
浏览文件 @
6e5fb4ee
...
...
@@ -90,6 +90,7 @@
#define PRSSTAT_CDPL (0x00040000)
#define PRSSTAT_CINS (0x00010000)
#define PRSSTAT_BREN (0x00000800)
#define PRSSTAT_BWEN (0x00000400)
#define PRSSTAT_DLA (0x00000004)
#define PRSSTAT_CICHB (0x00000002)
#define PRSSTAT_CIDHB (0x00000001)
...
...
@@ -121,6 +122,7 @@
#define XFERTYP_DMAEN 0x00000001
#define CINS_TIMEOUT 1000
#define PIO_TIMEOUT 100000
#define DSADDR 0x2e004
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录