Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
3af48da7
Unverified
Commit
3af48da7
authored
6 years ago
by
Antonio Niño Díaz
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1698 from hzhuang1/rm_emmc_delay
Rm emmc delay
parents
051cf889
b79de2dc
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/mmc/mmc.c
+7
-0
drivers/mmc/mmc.c
plat/hisilicon/hikey/hikey_bl2_setup.c
+0
-1
plat/hisilicon/hikey/hikey_bl2_setup.c
with
7 additions
and
1 deletion
+7
-1
drivers/mmc/mmc.c
View file @
3af48da7
...
@@ -246,6 +246,13 @@ static int mmc_fill_device_info(void)
...
@@ -246,6 +246,13 @@ static int mmc_fill_device_info(void)
return
ret
;
return
ret
;
}
}
do
{
ret
=
mmc_device_state
();
if
(
ret
<
0
)
{
return
ret
;
}
}
while
(
ret
!=
MMC_STATE_TRAN
);
nb_blocks
=
(
mmc_ext_csd
[
CMD_EXTCSD_SEC_CNT
]
<<
0
)
|
nb_blocks
=
(
mmc_ext_csd
[
CMD_EXTCSD_SEC_CNT
]
<<
0
)
|
(
mmc_ext_csd
[
CMD_EXTCSD_SEC_CNT
+
1
]
<<
8
)
|
(
mmc_ext_csd
[
CMD_EXTCSD_SEC_CNT
+
1
]
<<
8
)
|
(
mmc_ext_csd
[
CMD_EXTCSD_SEC_CNT
+
2
]
<<
16
)
|
(
mmc_ext_csd
[
CMD_EXTCSD_SEC_CNT
+
2
]
<<
16
)
|
...
...
This diff is collapsed.
Click to expand it.
plat/hisilicon/hikey/hikey_bl2_setup.c
View file @
3af48da7
...
@@ -336,7 +336,6 @@ void bl2_platform_setup(void)
...
@@ -336,7 +336,6 @@ void bl2_platform_setup(void)
params
.
flags
=
MMC_FLAG_CMD23
;
params
.
flags
=
MMC_FLAG_CMD23
;
info
.
mmc_dev_type
=
MMC_IS_EMMC
;
info
.
mmc_dev_type
=
MMC_IS_EMMC
;
dw_mmc_init
(
&
params
,
&
info
);
dw_mmc_init
(
&
params
,
&
info
);
mdelay
(
20
);
hikey_io_setup
();
hikey_io_setup
();
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help