Skip to content

Commit a681849

Browse files
committed
[BSP/FIXUP] remove old reset drivers for RK3500
Signed-off-by: GuEe-GUI <[email protected]>
1 parent 698f90b commit a681849

File tree

10 files changed

+29
-558
lines changed

10 files changed

+29
-558
lines changed

bsp/rockchip/rk3500/driver/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ menu "RT-Thread rockchip RK3500 drivers"
22

33
source "$BSP_DIR/driver/clk/Kconfig"
44
source "$BSP_DIR/driver/uart8250/Kconfig"
5-
source "$BSP_DIR/driver/reset/Kconfig"
65
source "$BSP_DIR/driver/hwtimer/Kconfig"
76
endmenu

bsp/rockchip/rk3500/driver/clk/clk-rk3568.c

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,6 @@
2121
#define CPLL_HZ (1000 * MHZ)
2222
#define PPLL_HZ (100 * MHZ)
2323

24-
#define rt_abs(x) \
25-
({ \
26-
long ret; \
27-
if (sizeof(x) == sizeof(long)) \
28-
{ \
29-
long __x = (x); \
30-
ret = (__x < 0) ? -__x : __x; \
31-
} \
32-
else \
33-
{ \
34-
int __x = (x); \
35-
ret = (__x < 0) ? -__x : __x; \
36-
} \
37-
ret; \
38-
})
39-
4024
struct rk_pll
4125
{
4226
rt_uint32_t con0;
@@ -120,6 +104,13 @@ enum rk_clk_type
120104
rk_clk_type_pmuclk,
121105
};
122106

107+
struct rt_reset_controller_clk_node
108+
{
109+
struct rt_clk_node parent;
110+
111+
struct rt_reset_controller rstcer;
112+
};
113+
123114
struct rk_clk
124115
{
125116
struct rt_reset_controller_clk_node parent;

bsp/rockchip/rk3500/driver/clk/clk-rk3568.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <rthw.h>
1515
#include <rtthread.h>
1616
#include <rtdevice.h>
17-
#include "reset/reset.h"
1817
#include <stdlib.h>
1918
#include "../rockchip.h"
2019

bsp/rockchip/rk3500/driver/clk/clk-rk3588.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ struct rk3588_clk_platform_data
8989
rt_uint32_t id;
9090
void *base;
9191
};
92+
struct rt_reset_controller_clk_node
93+
{
94+
struct rt_clk_node parent;
95+
96+
struct rt_reset_controller rstcer;
97+
};
9298
struct rk3588_clk
9399
{
94100
struct rt_reset_controller_clk_node parent;

bsp/rockchip/rk3500/driver/clk/clk-rk3588.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <rthw.h>
1515
#include <rtthread.h>
1616
#include <rtdevice.h>
17-
#include "reset/reset.h"
1817
#include <stdlib.h>
1918
#include "../rockchip.h"
2019

bsp/rockchip/rk3500/driver/reset/Kconfig

Lines changed: 0 additions & 5 deletions
This file was deleted.

bsp/rockchip/rk3500/driver/reset/SConscript

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)