Re: [PATCH v2 06/20] rockchip: pine64: rockpro64: migrate to rockchip_early_misc_init_r
On Fri, 9 Feb 2024 at 09:50, Quentin Schulz wrote: > > From: Quentin Schulz > > Only setup_iodomain() differs from the original misc_init_r from > Rockchip mach code, so let's use rockchip_early_misc_init_r instead of > reimplementing the whole misc_init_r from Rockchip. Reviewed-by: Peter Robinson > Cc: Quentin Schulz > Reviewed-by: Kever Yang > Signed-off-by: Quentin Schulz > --- > board/pine64/rockpro64_rk3399/rockpro64-rk3399.c | 20 ++-- > 1 file changed, 2 insertions(+), 18 deletions(-) > > diff --git a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c > b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c > index d79084614f1..d0a694ead1d 100644 > --- a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c > +++ b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c > @@ -11,7 +11,6 @@ > #include > #include > #include > -#include > > #define GRF_IO_VSEL_BT565_SHIFT 0 > #define PMUGRF_CON0_VSEL_SHIFT 8 > @@ -31,26 +30,11 @@ static void setup_iodomain(void) > rk_setreg(>soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT); > } > > -int misc_init_r(void) > +int rockchip_early_misc_init_r(void) > { > - const u32 cpuid_offset = 0x7; > - const u32 cpuid_length = 0x10; > - u8 cpuid[cpuid_length]; > - int ret; > - > setup_iodomain(); > > - ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid); > - if (ret) > - return ret; > - > - ret = rockchip_cpuid_set(cpuid, cpuid_length); > - if (ret) > - return ret; > - > - ret = rockchip_setup_macaddr(); > - > - return ret; > + return 0; > } > > #endif > > -- > 2.43.0 >
Re: [PATCH v2 06/20] rockchip: pine64: rockpro64: migrate to rockchip_early_misc_init_r
On 2024-02-09 10:50, Quentin Schulz wrote: From: Quentin Schulz Only setup_iodomain() differs from the original misc_init_r from Rockchip mach code, so let's use rockchip_early_misc_init_r instead of reimplementing the whole misc_init_r from Rockchip. Cc: Quentin Schulz Reviewed-by: Kever Yang Signed-off-by: Quentin Schulz Looking good to me. Reviewed-by: Dragan Simic --- board/pine64/rockpro64_rk3399/rockpro64-rk3399.c | 20 ++-- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c index d79084614f1..d0a694ead1d 100644 --- a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c +++ b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c @@ -11,7 +11,6 @@ #include #include #include -#include #define GRF_IO_VSEL_BT565_SHIFT 0 #define PMUGRF_CON0_VSEL_SHIFT 8 @@ -31,26 +30,11 @@ static void setup_iodomain(void) rk_setreg(>soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT); } -int misc_init_r(void) +int rockchip_early_misc_init_r(void) { - const u32 cpuid_offset = 0x7; - const u32 cpuid_length = 0x10; - u8 cpuid[cpuid_length]; - int ret; - setup_iodomain(); - ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid); - if (ret) - return ret; - - ret = rockchip_cpuid_set(cpuid, cpuid_length); - if (ret) - return ret; - - ret = rockchip_setup_macaddr(); - - return ret; + return 0; } #endif
[PATCH v2 06/20] rockchip: pine64: rockpro64: migrate to rockchip_early_misc_init_r
From: Quentin Schulz Only setup_iodomain() differs from the original misc_init_r from Rockchip mach code, so let's use rockchip_early_misc_init_r instead of reimplementing the whole misc_init_r from Rockchip. Cc: Quentin Schulz Reviewed-by: Kever Yang Signed-off-by: Quentin Schulz --- board/pine64/rockpro64_rk3399/rockpro64-rk3399.c | 20 ++-- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c index d79084614f1..d0a694ead1d 100644 --- a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c +++ b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c @@ -11,7 +11,6 @@ #include #include #include -#include #define GRF_IO_VSEL_BT565_SHIFT 0 #define PMUGRF_CON0_VSEL_SHIFT 8 @@ -31,26 +30,11 @@ static void setup_iodomain(void) rk_setreg(>soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT); } -int misc_init_r(void) +int rockchip_early_misc_init_r(void) { - const u32 cpuid_offset = 0x7; - const u32 cpuid_length = 0x10; - u8 cpuid[cpuid_length]; - int ret; - setup_iodomain(); - ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid); - if (ret) - return ret; - - ret = rockchip_cpuid_set(cpuid, cpuid_length); - if (ret) - return ret; - - ret = rockchip_setup_macaddr(); - - return ret; + return 0; } #endif -- 2.43.0