Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DM/BSP/FIXUP] Fixup rk3500 and DM build #9774

Merged
merged 9 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bsp/rockchip/rk3500/driver/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ menu "RT-Thread rockchip RK3500 drivers"

source "$BSP_DIR/driver/clk/Kconfig"
source "$BSP_DIR/driver/uart8250/Kconfig"
source "$BSP_DIR/driver/reset/Kconfig"
source "$BSP_DIR/driver/hwtimer/Kconfig"
endmenu
23 changes: 7 additions & 16 deletions bsp/rockchip/rk3500/driver/clk/clk-rk3568.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,6 @@
#define CPLL_HZ (1000 * MHZ)
#define PPLL_HZ (100 * MHZ)

#define rt_abs(x) \
({ \
long ret; \
if (sizeof(x) == sizeof(long)) \
{ \
long __x = (x); \
ret = (__x < 0) ? -__x : __x; \
} \
else \
{ \
int __x = (x); \
ret = (__x < 0) ? -__x : __x; \
} \
ret; \
})

struct rk_pll
{
rt_uint32_t con0;
Expand Down Expand Up @@ -120,6 +104,13 @@ enum rk_clk_type
rk_clk_type_pmuclk,
};

struct rt_reset_controller_clk_node
{
struct rt_clk_node parent;

struct rt_reset_controller rstcer;
};

struct rk_clk
{
struct rt_reset_controller_clk_node parent;
Expand Down
1 change: 0 additions & 1 deletion bsp/rockchip/rk3500/driver/clk/clk-rk3568.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <rthw.h>
#include <rtthread.h>
#include <rtdevice.h>
#include "reset/reset.h"
#include <stdlib.h>
#include "../rockchip.h"

Expand Down
6 changes: 6 additions & 0 deletions bsp/rockchip/rk3500/driver/clk/clk-rk3588.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ struct rk3588_clk_platform_data
rt_uint32_t id;
void *base;
};
struct rt_reset_controller_clk_node
{
struct rt_clk_node parent;

struct rt_reset_controller rstcer;
};
struct rk3588_clk
{
struct rt_reset_controller_clk_node parent;
Expand Down
1 change: 0 additions & 1 deletion bsp/rockchip/rk3500/driver/clk/clk-rk3588.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <rthw.h>
#include <rtthread.h>
#include <rtdevice.h>
#include "reset/reset.h"
#include <stdlib.h>
#include "../rockchip.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,4 @@ static int rk_timer_drv_register(void)

return 0;
}
INIT_DRIVER_EARLY_EXPORT(rk_timer_drv_register);
INIT_PLATFORM_EXPORT(rk_timer_drv_register);
5 changes: 0 additions & 5 deletions bsp/rockchip/rk3500/driver/reset/Kconfig

This file was deleted.

13 changes: 0 additions & 13 deletions bsp/rockchip/rk3500/driver/reset/SConscript

This file was deleted.

Loading
Loading