Skip to content

Commit 256da7e

Browse files
GuEe-GUIRbb666
authored andcommitted
[bsp][rockchip] fixup the drivers' configure
Signed-off-by: GuEe-GUI <2991707448@qq.com>
1 parent 0b31794 commit 256da7e

File tree

4 files changed

+52
-12
lines changed

4 files changed

+52
-12
lines changed

bsp/rockchip/dm/clk/clk-rk-gate.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
}
2929

3030
#define GATE_NO_SET_RATE(_id, cname, pname, f, o, b, gf) \
31-
(void *)&(struct rockchip_clk_cell) \
32-
{ \
33-
.cell.name = cname, \
34-
.cell.ops = &rockchip_gate_clk_ops, \
35-
.cell.parent_name = pname, \
36-
.cell.parents_nr = 1, \
37-
.cell.flags = f | RT_CLK_F_SET_RATE_PARENT, \
38-
.id = _id, \
39-
.gate_offset = o, \
40-
.gate_shift = b, \
41-
.gate_flags = gf, \
31+
(void *)&(struct rockchip_clk_cell) \
32+
{ \
33+
.cell.name = cname, \
34+
.cell.ops = &rockchip_gate_clk_ops, \
35+
.cell.parent_name = pname, \
36+
.cell.parents_nr = 1, \
37+
.cell.flags = (f) & ~RT_CLK_F_SET_RATE_PARENT, \
38+
.id = _id, \
39+
.gate_offset = o, \
40+
.gate_shift = b, \
41+
.gate_flags = gf, \
4242
}
4343

4444
extern const struct rt_clk_ops rockchip_gate_clk_ops;

bsp/rockchip/dm/regulator/regulator-rk8xx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,6 +1115,7 @@ static rt_err_t append_rk8xx_regulator(struct rk8xx *rk8xx, struct rt_ofw_node *
11151115
rgp = &rk8xx_reg->parent;
11161116
rgp->ops = rk8xx_reg->desc->ops;
11171117
rgp->param = &rk8xx_reg->param;
1118+
rgp->supply_name = rgp->param->name;
11181119
rgp->dev = &rk8xx_reg->device;
11191120

11201121
rgp->dev->ofw_node = np;

bsp/rockchip/rk3500/.config

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,31 @@ CONFIG_DFS_USING_POSIX=y
252252
CONFIG_DFS_USING_WORKDIR=y
253253
CONFIG_DFS_FD_MAX=512
254254
CONFIG_RT_USING_DFS_V2=y
255-
# CONFIG_RT_USING_DFS_ELMFAT is not set
255+
CONFIG_RT_USING_DFS_ELMFAT=y
256+
257+
#
258+
# elm-chan's FatFs, Generic FAT Filesystem Module
259+
#
260+
CONFIG_RT_DFS_ELM_CODE_PAGE=437
261+
CONFIG_RT_DFS_ELM_WORD_ACCESS=y
262+
# CONFIG_RT_DFS_ELM_USE_LFN_0 is not set
263+
# CONFIG_RT_DFS_ELM_USE_LFN_1 is not set
264+
# CONFIG_RT_DFS_ELM_USE_LFN_2 is not set
265+
CONFIG_RT_DFS_ELM_USE_LFN_3=y
266+
CONFIG_RT_DFS_ELM_USE_LFN=3
267+
CONFIG_RT_DFS_ELM_LFN_UNICODE_0=y
268+
# CONFIG_RT_DFS_ELM_LFN_UNICODE_1 is not set
269+
# CONFIG_RT_DFS_ELM_LFN_UNICODE_2 is not set
270+
# CONFIG_RT_DFS_ELM_LFN_UNICODE_3 is not set
271+
CONFIG_RT_DFS_ELM_LFN_UNICODE=0
272+
CONFIG_RT_DFS_ELM_MAX_LFN=255
273+
CONFIG_RT_DFS_ELM_DRIVES=4
274+
CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512
275+
# CONFIG_RT_DFS_ELM_USE_ERASE is not set
276+
# CONFIG_RT_DFS_ELM_REENTRANT is not set
277+
CONFIG_RT_DFS_ELM_USE_EXFAT=y
278+
# end of elm-chan's FatFs, Generic FAT Filesystem Module
279+
256280
CONFIG_RT_USING_DFS_DEVFS=y
257281
# CONFIG_RT_USING_DFS_ROMFS is not set
258282
CONFIG_RT_USING_DFS_PTYFS=y

bsp/rockchip/rk3500/rtconfig.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,21 @@
170170
#define DFS_USING_WORKDIR
171171
#define DFS_FD_MAX 512
172172
#define RT_USING_DFS_V2
173+
#define RT_USING_DFS_ELMFAT
174+
175+
/* elm-chan's FatFs, Generic FAT Filesystem Module */
176+
177+
#define RT_DFS_ELM_CODE_PAGE 437
178+
#define RT_DFS_ELM_WORD_ACCESS
179+
#define RT_DFS_ELM_USE_LFN_3
180+
#define RT_DFS_ELM_USE_LFN 3
181+
#define RT_DFS_ELM_LFN_UNICODE_0
182+
#define RT_DFS_ELM_LFN_UNICODE 0
183+
#define RT_DFS_ELM_MAX_LFN 255
184+
#define RT_DFS_ELM_DRIVES 4
185+
#define RT_DFS_ELM_MAX_SECTOR_SIZE 512
186+
#define RT_DFS_ELM_USE_EXFAT
187+
/* end of elm-chan's FatFs, Generic FAT Filesystem Module */
173188
#define RT_USING_DFS_DEVFS
174189
#define RT_USING_DFS_PTYFS
175190
#define RT_USING_DFS_PROCFS

0 commit comments

Comments
 (0)