Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
3853c650
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,发现更多精彩内容 >>
提交
3853c650
编写于
4月 23, 2018
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-uniphier
上级
ff719a73
3ce5b1a8
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
55 addition
and
41 deletion
+55
-41
arch/arm/dts/uniphier-v7-u-boot.dtsi
arch/arm/dts/uniphier-v7-u-boot.dtsi
+0
-16
drivers/clk/uniphier/Kconfig
drivers/clk/uniphier/Kconfig
+0
-1
drivers/mmc/renesas-sdhi.c
drivers/mmc/renesas-sdhi.c
+23
-0
drivers/mmc/tmio-common.c
drivers/mmc/tmio-common.c
+0
-22
drivers/mmc/uniphier-sd.c
drivers/mmc/uniphier-sd.c
+29
-0
include/configs/uniphier.h
include/configs/uniphier.h
+3
-2
未找到文件。
arch/arm/dts/uniphier-v7-u-boot.dtsi
浏览文件 @
3853c650
...
...
@@ -14,22 +14,6 @@
u-boot,dm-pre-reloc;
};
mioctrl@59810000 {
u-boot,dm-pre-reloc;
clock {
u-boot,dm-pre-reloc;
};
};
sdctrl@59810000 {
u-boot,dm-pre-reloc;
clock {
u-boot,dm-pre-reloc;
};
};
soc-glue@5f800000 {
u-boot,dm-pre-reloc;
...
...
drivers/clk/uniphier/Kconfig
浏览文件 @
3853c650
...
...
@@ -2,7 +2,6 @@ config CLK_UNIPHIER
def_bool y
depends on ARCH_UNIPHIER
select CLK
select SPL_CLK if SPL
help
Support for clock controllers on UniPhier SoCs.
Say Y if you want to control clocks provided by System Control
...
...
drivers/mmc/renesas-sdhi.c
浏览文件 @
3853c650
...
...
@@ -330,8 +330,10 @@ static const struct udevice_id renesas_sdhi_match[] = {
static
int
renesas_sdhi_probe
(
struct
udevice
*
dev
)
{
struct
tmio_sd_priv
*
priv
=
dev_get_priv
(
dev
);
u32
quirks
=
dev_get_driver_data
(
dev
);
struct
fdt_resource
reg_res
;
struct
clk
clk
;
DECLARE_GLOBAL_DATA_PTR
;
int
ret
;
...
...
@@ -348,6 +350,27 @@ static int renesas_sdhi_probe(struct udevice *dev)
quirks
|=
TMIO_SD_CAP_16BIT
;
}
ret
=
clk_get_by_index
(
dev
,
0
,
&
clk
);
if
(
ret
<
0
)
{
dev_err
(
dev
,
"failed to get host clock
\n
"
);
return
ret
;
}
/* set to max rate */
priv
->
mclk
=
clk_set_rate
(
&
clk
,
ULONG_MAX
);
if
(
IS_ERR_VALUE
(
priv
->
mclk
))
{
dev_err
(
dev
,
"failed to set rate for host clock
\n
"
);
clk_free
(
&
clk
);
return
priv
->
mclk
;
}
ret
=
clk_enable
(
&
clk
);
clk_free
(
&
clk
);
if
(
ret
)
{
dev_err
(
dev
,
"failed to enable host clock
\n
"
);
return
ret
;
}
ret
=
tmio_sd_probe
(
dev
,
quirks
);
#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)
if
(
!
ret
)
...
...
drivers/mmc/tmio-common.c
浏览文件 @
3853c650
...
...
@@ -713,7 +713,6 @@ int tmio_sd_probe(struct udevice *dev, u32 quirks)
struct
tmio_sd_priv
*
priv
=
dev_get_priv
(
dev
);
struct
mmc_uclass_priv
*
upriv
=
dev_get_uclass_priv
(
dev
);
fdt_addr_t
base
;
struct
clk
clk
;
int
ret
;
base
=
devfdt_get_addr
(
dev
);
...
...
@@ -728,27 +727,6 @@ int tmio_sd_probe(struct udevice *dev, u32 quirks)
device_get_supply_regulator
(
dev
,
"vqmmc-supply"
,
&
priv
->
vqmmc_dev
);
#endif
ret
=
clk_get_by_index
(
dev
,
0
,
&
clk
);
if
(
ret
<
0
)
{
dev_err
(
dev
,
"failed to get host clock
\n
"
);
return
ret
;
}
/* set to max rate */
priv
->
mclk
=
clk_set_rate
(
&
clk
,
ULONG_MAX
);
if
(
IS_ERR_VALUE
(
priv
->
mclk
))
{
dev_err
(
dev
,
"failed to set rate for host clock
\n
"
);
clk_free
(
&
clk
);
return
priv
->
mclk
;
}
ret
=
clk_enable
(
&
clk
);
clk_free
(
&
clk
);
if
(
ret
)
{
dev_err
(
dev
,
"failed to enable host clock
\n
"
);
return
ret
;
}
ret
=
mmc_of_parse
(
dev
,
&
plat
->
cfg
);
if
(
ret
<
0
)
{
dev_err
(
dev
,
"failed to parse host caps
\n
"
);
...
...
drivers/mmc/uniphier-sd.c
浏览文件 @
3853c650
...
...
@@ -32,6 +32,35 @@ static const struct udevice_id uniphier_sd_match[] = {
static
int
uniphier_sd_probe
(
struct
udevice
*
dev
)
{
struct
tmio_sd_priv
*
priv
=
dev_get_priv
(
dev
);
#ifndef CONFIG_SPL_BUILD
struct
clk
clk
;
int
ret
;
ret
=
clk_get_by_index
(
dev
,
0
,
&
clk
);
if
(
ret
<
0
)
{
dev_err
(
dev
,
"failed to get host clock
\n
"
);
return
ret
;
}
/* set to max rate */
priv
->
mclk
=
clk_set_rate
(
&
clk
,
ULONG_MAX
);
if
(
IS_ERR_VALUE
(
priv
->
mclk
))
{
dev_err
(
dev
,
"failed to set rate for host clock
\n
"
);
clk_free
(
&
clk
);
return
priv
->
mclk
;
}
ret
=
clk_enable
(
&
clk
);
clk_free
(
&
clk
);
if
(
ret
)
{
dev_err
(
dev
,
"failed to enable host clock
\n
"
);
return
ret
;
}
#else
priv
->
mclk
=
100000000
;
#endif
return
tmio_sd_probe
(
dev
,
0
);
}
...
...
include/configs/uniphier.h
浏览文件 @
3853c650
...
...
@@ -33,7 +33,7 @@
#define CONFIG_SYS_MAX_FLASH_SECT 256
#define CONFIG_SYS_MONITOR_BASE 0
#define CONFIG_SYS_MONITOR_LEN 0x000
80000
/* 512
KB */
#define CONFIG_SYS_MONITOR_LEN 0x000
90000
/* 576
KB */
#define CONFIG_SYS_FLASH_BASE 0
/*
...
...
@@ -186,6 +186,7 @@
"setexpr tmp_addr $nor_base + 0x70000 && " \
"tftpboot $tmp_addr $third_image\0" \
"emmcupdate=mmcsetn &&" \
"mmc dev $mmc_first_dev &&" \
"mmc partconf $mmc_first_dev 0 1 1 &&" \
"tftpboot $second_image && " \
"mmc write $loadaddr 0 100 && " \
...
...
@@ -219,7 +220,7 @@
#define CONFIG_SPL_TEXT_BASE 0x00100000
#endif
#define CONFIG_SPL_STACK (0x00
1
00000)
#define CONFIG_SPL_STACK (0x00
2
00000)
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录