Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-boundary-uboot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jack Humbert
reform-boundary-uboot
Commits
a54c879a
Commit
a54c879a
authored
9 years ago
by
Masahiro Yamada
Browse files
Options
Downloads
Patches
Plain Diff
ARM: uniphier: use pr_err() where possible
Signed-off-by:
Masahiro Yamada
<
yamada.masahiro@socionext.com
>
parent
59fe23c2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
+1
-1
1 addition, 1 deletion
arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
arch/arm/mach-uniphier/dram/umc-proxstream2.c
+4
-4
4 additions, 4 deletions
arch/arm/mach-uniphier/dram/umc-proxstream2.c
with
5 additions
and
5 deletions
arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
+
1
−
1
View file @
a54c879a
...
...
@@ -82,7 +82,7 @@ static int umc_dramcont_init(void __iomem *dramcont, void __iomem *ca_base,
dram_size
=
DRAM_SZ_512M
;
break
;
default:
pr
intf
(
"unsupported DRAM size
\n
"
);
pr
_err
(
"unsupported DRAM size
\n
"
);
return
-
EINVAL
;
}
...
...
This diff is collapsed.
Click to expand it.
arch/arm/mach-uniphier/dram/umc-proxstream2.c
+
4
−
4
View file @
a54c879a
...
...
@@ -344,7 +344,7 @@ static int __ddrphy_training(void __iomem *phy_base,
do
{
if
(
--
timeout
<
0
)
{
pr
intf
(
"%s: error: timeout during DDR training
\n
"
,
pr
_err
(
"%s: error: timeout during DDR training
\n
"
,
__func__
);
return
-
ETIMEDOUT
;
}
...
...
@@ -354,7 +354,7 @@ static int __ddrphy_training(void __iomem *phy_base,
for
(
s
=
seq
;
s
->
description
;
s
++
)
{
if
(
pgsr0
&
s
->
err_flag
)
{
pr
intf
(
"%s: error: %s failed
\n
"
,
__func__
,
pr
_err
(
"%s: error: %s failed
\n
"
,
__func__
,
s
->
description
);
return
-
EIO
;
}
...
...
@@ -597,7 +597,7 @@ int proxstream2_umc_init(const struct uniphier_board_data *bd)
freq
=
FREQ_2133M
;
break
;
default:
pr
intf
(
"unsupported DRAM frequency %d MHz
\n
"
,
bd
->
dram_freq
);
pr
_err
(
"unsupported DRAM frequency %d MHz
\n
"
,
bd
->
dram_freq
);
return
-
EINVAL
;
}
...
...
@@ -606,7 +606,7 @@ int proxstream2_umc_init(const struct uniphier_board_data *bd)
bd
->
dram_ch
[
ch
].
size
/
SZ_256M
,
bd
->
dram_ch
[
ch
].
width
);
if
(
ret
)
{
pr
intf
(
"failed to initialize UMC ch%d
\n
"
,
ch
);
pr
_err
(
"failed to initialize UMC ch%d
\n
"
,
ch
);
return
ret
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment