Enable display cpuinfo to get the reset cause
Subsystems (3)
v2 cover Enable display cpuinfo to get the reset cause
All the Rockchip SoC support reset cauee like POR_RST, GLB_RST, TSADC_RST, WD_RST by reading the clock reset unit register.
V2: with the feedback from Jonas Karlman and Quentin Schulz
drop the inply for CONFIG_DISPLAY_CPUINFO as it defaault enabled. re-organized the code.
As pointed only as of now RK3328, RK3399 supports this feature for POR and RST.
On RK3568 and RK3588 SoC it only return POR, for all the case of reboot and poweroff. I have tried to debug this issue, found Clock Reset Unit will bind to rockchip_sysreset to determine the reset cause. if there is ant input on this please share.
I have update two new patches from u-boot-radxa, but with no success.
[0] https://elixir.bootlin.com/u-boot/v2024.07-rc3/source/drivers/clk/rockchip/clk_rk3568.c#L2945
# dm tree # RK3568 clk 5 [ + ] rockchip_rk3588_cru |-- clock-controller@fd7c0000 sysreset 0 [ ] rockchip_sysreset | |-- sysreset reset 0 [ + ] rockchip_reset | `-- reset
[1] https://elixir.bootlin.com/u-boot/v2024.07-rc3/source/drivers/clk/rockchip/clk_rk3588.c#L2006
# dm tree # RK3588 clk 5 [ + ] rockchip_rk3588_cru |-- clock-controller@fd7c0000 sysreset 0 [ ] rockchip_sysreset | |-- sysreset reset 0 [ ] rockchip_reset | `-- reset
Tested on Rock64, Rock-3a, Rock-5b boards.
I have update few Rockchip SoC to verify this feature, Only Build to since I dont have the hardware.
Thanks
-Anand
Anand Moon (21):
rockchip: RK3328: Read the reset cause from clock reset unit for
RK3328 SoC
rockchip: RK3328: Enable display cpuinfo support on all boards
rockchip: RK3399: Read the reset cause from clock reset unit for
RK3399 SoC
rockchip: RK3399: Enable display cpuinfo support on all boards
arm: rockchip: Enable display cpuinfo to be build with SPL_BUILD
rockchip: RK3568: Read the reset cause from clock reset unit for
RK356x SoC
rockchip: RK3568: Enable display cpuinfo support on all boards
rockchip: RK3588: Read the reset cause from clock reset unit for
RK3588 SoC
rockchip: RK3588: Enable display cpuinfo support on all boards
rockchip: PX30: Read the reset cause from clock reset unit for PX30
SoC
rockchip: PX30: Enable display cpuinfo support on all boards
rockchip: RK3288: Read the reset cause from clock reset unit for
RK3288 SoC
rockchip: RK3288: Enable display cpuinfo support on all boards
rockchip: RK3308: Read the reset cause from clock reset unit for
RK3308 SoC
rockchip: RK3308: Enable display cpuinfo support on all boards
rockchip: RK3368: Read the reset cause from clock reset unit for
RK3368 SoC
rockchip: RK3368: Enable display cpuinfo support on all boards
rockchip: RV1108: Read the reset cause from clock reset unit for
RV1108 SoC
rockchip: RV1108: Enable display cpuinfo support on all boards
rockchip: RV1126: Read the reset cause from clock reset unit for
RV1126 SoCrockchip: RV1126: Enable display cpuinfo support on all boards
Andy Yan (1):
sysreset: rockchip: use dev_read_addr_ptr get cru base
Kever Yang (1):
sysreset: rockchip: use fst reset for ARM64 SOC
arch/arm/include/asm/arch-rockchip/cru.h | 14 +++++++++++++ arch/arm/mach-rockchip/Makefile | 3 --- arch/arm/mach-rockchip/cpu-info.c | 20 +++++++++++++++++++ configs/anbernic-rgxx3-rk3566_defconfig | 1 - configs/bpi-r2-pro-rk3568_defconfig | 1 - configs/chromebit_mickey_defconfig | 1 - configs/chromebook_bob_defconfig | 1 - configs/chromebook_jerry_defconfig | 1 - configs/chromebook_kevin_defconfig | 1 - configs/chromebook_minnie_defconfig | 1 - configs/chromebook_speedy_defconfig | 1 - configs/coolpi-4b-rk3588s_defconfig | 1 - configs/coolpi-cm5-evb-rk3588_defconfig | 1 - configs/elgin-rv1108_defconfig | 1 - configs/evb-px30_defconfig | 1 - configs/evb-px5_defconfig | 1 - configs/evb-rk3308_defconfig | 1 - configs/evb-rk3328_defconfig | 1 - configs/evb-rk3568_defconfig | 1 - configs/evb-rk3588_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/firefly-px30_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/generic-rk3568_defconfig | 1 - configs/generic-rk3588_defconfig | 1 - configs/jaguar-rk3588_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/lubancat-2-rk3568_defconfig | 1 - configs/nanopc-t6-rk3588_defconfig | 1 - configs/nanopi-r2c-plus-rk3328_defconfig | 1 - configs/nanopi-r2c-rk3328_defconfig | 1 - configs/nanopi-r2s-rk3328_defconfig | 1 - configs/nanopi-r5c-rk3568_defconfig | 1 - configs/nanopi-r5s-rk3568_defconfig | 1 - configs/neu2-io-rv1126_defconfig | 1 - configs/neu6a-io-rk3588_defconfig | 1 - configs/neu6b-io-rk3588_defconfig | 1 - configs/odroid-m1-rk3568_defconfig | 1 - configs/orangepi-5-plus-rk3588_defconfig | 1 - configs/orangepi-5-rk3588s_defconfig | 1 - configs/orangepi-r1-plus-lts-rk3328_defconfig | 1 - configs/orangepi-r1-plus-rk3328_defconfig | 1 - configs/pinetab2-rk3566_defconfig | 1 - configs/px30-core-ctouch2-of10-px30_defconfig | 1 - configs/px30-core-ctouch2-px30_defconfig | 1 - configs/px30-core-edimm2.2-px30_defconfig | 1 - configs/quartz64-a-rk3566_defconfig | 1 - configs/quartz64-b-rk3566_defconfig | 1 - configs/quartzpro64-rk3588_defconfig | 1 - configs/radxa-cm3-io-rk3566_defconfig | 1 - configs/radxa-e25-rk3568_defconfig | 1 - configs/ringneck-px30_defconfig | 1 - configs/roc-cc-rk3308_defconfig | 1 - configs/roc-cc-rk3328_defconfig | 1 - configs/rock-3a-rk3568_defconfig | 1 - configs/rock-pi-e-rk3328_defconfig | 1 - configs/rock-pi-s-rk3308_defconfig | 1 - configs/rock5a-rk3588s_defconfig | 1 - configs/rock5b-rk3588_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - configs/sheep-rk3368_defconfig | 1 - configs/sonoff-ihost-rv1126_defconfig | 1 - configs/soquartz-blade-rk3566_defconfig | 1 - configs/soquartz-cm4-rk3566_defconfig | 1 - configs/soquartz-model-a-rk3566_defconfig | 1 - configs/toybrick-rk3588_defconfig | 1 - configs/turing-rk1-rk3588_defconfig | 1 - drivers/sysreset/sysreset_rockchip.c | 9 +++++++-- 68 files changed, 41 insertions(+), 69 deletions(-)
Signature · 1 line
2.44.0
RFC PATCH v2 1/23 rockchip: RK3328: Read the reset cause from clock reset unit for RK3328 SoC
From: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3328 SoC.
--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)
arch/arm/include/asm/arch-rockchip/cru.h +2 -0
@@ -13,6 +13,8 @@#if defined(CONFIG_ROCKCHIP_RK3288 )# include <asm/arch-rockchip/cru_rk3288.h> +#elif defined(CONFIG_ROCKCHIP_RK3328 ) +#include <asm/arch-rockchip/cru_rk3328.h> #elif defined(CONFIG_ROCKCHIP_RK3399 )# include <asm/arch-rockchip/cru_rk3399.h> #elif defined(CONFIG_ROCKCHIP_RK3568 )
arch/arm/mach-rockchip/cpu-info.c +3 -1
@@ -14,7 +14,9 @@char *get_reset_cause (void ) { -struct rockchip_cru *cru =rockchip_get_cru (); +#if IS_ENABLED (CONFIG_ROCKCHIP_RK3328 ) +struct rk3328_cru *cru =rockchip_get_cru (); +#endif char *cause =NULL ;if (IS_ERR (cru))
Signature · 1 line
2.44.0
Re: [PATCH RFC v2 01/23] rockchip: RK3328: Read the reset cause from clock reset unit for RK3328 SoC
Hello Anand,
Quoted 18 lines · Anand Moon
From: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3328 SoC.
Cc Jagan Teki <[email protected]>Signed-off-by Anand Moon <[email protected]>Signed-off-by Anand Moon <[email protected]>--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)arch/arm/include/asm/arch-rockchip/cru.h +0
-0
arch/arm/include/asm/arch-rockchip/cru.h line 17
Quoted 5 lines
arch/arm/include/asm/arch-rockchip/cru.h +2
-0@@ -13,6 +13,8 @@#if defined(CONFIG_ROCKCHIP_RK3288 )# include <asm/arch-rockchip/cru_rk3288.h> +#elif defined(CONFIG_ROCKCHIP_RK3328 ) +#include <asm/arch-rockchip/cru_rk3328.h>
A single space character should be added between "#" and "include", for consistency.
Quoted 19 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#elif defined(CONFIG_ROCKCHIP_RK3399 )# include <asm/arch-rockchip/cru_rk3399.h> #elif defined(CONFIG_ROCKCHIP_RK3568 )arch/arm/mach-rockchip/cpu-info.c +3
-1@@ -14,7 +14,9 @@char *get_reset_cause (void ) { -struct rockchip_cru *cru =rockchip_get_cru (); +#if IS_ENABLED (CONFIG_ROCKCHIP_RK3328 ) +struct rk3328_cru *cru =rockchip_get_cru (); +#endif char *cause =NULL ;if (IS_ERR (cru))
Re: [PATCH RFC v2 01/23] rockchip: RK3328: Read the reset cause from clock reset unit for RK3328 SoC
In reply to Anand MoonHi Anand,
Quoted 7 lines · Anand Moon
From: Anand Moon<[email protected]>
Read the reset cause from clock reset unit for RK3328 SoC.
Cc Jagan Teki<[email protected]>Signed-off-by Anand Moon<[email protected]>Signed-off-by Anand Moon<[email protected]>
I thing one signature is enough for you, right?
Quoted 23 lines
--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)arch/arm/include/asm/arch-rockchip/cru.h +2
-0@@ -13,6 +13,8 @@#if defined(CONFIG_ROCKCHIP_RK3288 )# include <asm/arch-rockchip/cru_rk3288.h> +#elif defined(CONFIG_ROCKCHIP_RK3328 ) +#include <asm/arch-rockchip/cru_rk3328.h> #elif defined(CONFIG_ROCKCHIP_RK3399 )# include <asm/arch-rockchip/cru_rk3399.h> #elif defined(CONFIG_ROCKCHIP_RK3568 )arch/arm/mach-rockchip/cpu-info.c +0
-0
arch/arm/mach-rockchip/cpu-info.c line 19
Quoted 7 lines
arch/arm/mach-rockchip/cpu-info.c +3
-1@@ -14,7 +14,9 @@char *get_reset_cause (void ) { -struct rockchip_cru *cru =rockchip_get_cru (); +#if IS_ENABLED (CONFIG_ROCKCHIP_RK3328 ) +struct rk3328_cru *cru =rockchip_get_cru (); +#endif
I think we can use "rockchip_cru" for all the SoC with below define in cru_rk3568.h?
#define rockchip_cru rk3328_cru
Thanks,
- Kever
Quoted 3 lines
arch/arm/mach-rockchip/cpu-info.c +0
-0char *cause =NULL ;if (IS_ERR (cru))
Re: [PATCH RFC v2 01/23] rockchip: RK3328: Read the reset cause from clock reset unit for RK3328 SoC
Hi Kever,
Quoted 7 lines · Kever Yang
Hi Anand,
On 2024/5/31 22:18, Anand Moon wrote:
From: Anand Moon <[email protected]>
Quoted 7 lines
Read the reset cause from clock reset unit for RK3328 SoC.
Cc Jagan Teki <[email protected]>Signed-off-by Anand Moon <[email protected]>Signed-off-by Anand Moon <[email protected]>I thing one signature is enough for you, right?
Ok, earlier the emails were bouncing back
Quoted 34 lines
--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)arch/arm/include/asm/arch-rockchip/cru.h +2
-0@@ -13,6 +13,8 @@#if defined(CONFIG_ROCKCHIP_RK3288 )# include <asm/arch-rockchip/cru_rk3288.h> +#elif defined(CONFIG_ROCKCHIP_RK3328 ) +#include <asm/arch-rockchip/cru_rk3328.h> #elif defined(CONFIG_ROCKCHIP_RK3399 )# include <asm/arch-rockchip/cru_rk3399.h> #elif defined(CONFIG_ROCKCHIP_RK3568 )arch/arm/mach-rockchip/cpu-info.c +3
-1@@ -14,7 +14,9 @@char *get_reset_cause (void ) { -struct rockchip_cru *cru =rockchip_get_cru (); +#if IS_ENABLED (CONFIG_ROCKCHIP_RK3328 ) +struct rk3328_cru *cru =rockchip_get_cru (); +#endif I think we can use "
rockchip_cru" for all the SoC with below define incru_rk3568.h?
Quoted 2 lines
#define
rockchip_crurk3328_cru
Ok, I will follow this in the next version.
Quoted 3 lines
Thanks,
- Kever
Thanks
-Anand
RFC PATCH v2 2/23 rockchip: RK3328: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all RK3328 boards, Its used to determine the reset cause of the board.
--- configs/evb-rk3328_defconfig | 1 - configs/nanopi-r2c-plus-rk3328_defconfig | 1 - configs/nanopi-r2c-rk3328_defconfig | 1 - configs/nanopi-r2s-rk3328_defconfig | 1 - configs/orangepi-r1-plus-lts-rk3328_defconfig | 1 - configs/orangepi-r1-plus-rk3328_defconfig | 1 - configs/roc-cc-rk3328_defconfig | 1 - configs/rock-pi-e-rk3328_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - 9 files changed, 9 deletions(-)
configs/evb-rk3328_defconfig +0 -1
@@ -19,7 +19,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-evb.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/nanopi-r2c-plus-rk3328_defconfig +0 -1
@@ -20,7 +20,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2c-plus.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/nanopi-r2c-rk3328_defconfig +0 -1
@@ -20,7 +20,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2c.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/nanopi-r2s-rk3328_defconfig +0 -1
@@ -20,7 +20,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2s.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/orangepi-r1-plus-lts-rk3328_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus-lts.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/orangepi-r1-plus-rk3328_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/roc-cc-rk3328_defconfig +0 -1
@@ -19,7 +19,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-roc-cc.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/rock-pi-e-rk3328_defconfig +0 -1
@@ -19,7 +19,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-rock-pi-e.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/rock64-rk3328_defconfig +0 -1
@@ -22,7 +22,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-rock64.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
Signature · 1 line
2.44.0
RFC PATCH v2 3/23 rockchip: RK3399: Read the reset cause from clock reset unit for RK3399 SoC
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3399 SoC.
--- arch/arm/mach-rockchip/cpu-info.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-rockchip/cpu-info.c +2 -0
@@ -16,6 +16,8 @@ char *get_reset_cause(void) {#if IS_ENABLED (CONFIG_ROCKCHIP_RK3328 )struct rk3328_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3399 ) +struct rockchip_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Signature · 1 line
2.44.0
RFC PATCH v2 4/23 rockchip: RK3399: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all RK3399 boards. Its used to determine the reset cause of the board.
--- configs/chromebook_bob_defconfig | 1 - configs/chromebook_kevin_defconfig | 1 - 2 files changed, 2 deletions(-)
configs/chromebook_bob_defconfig +0 -1
@@ -30,7 +30,6 @@ CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y # CONFIG_SPL_FIT_SIGNATURE is not set CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BLOBLIST=y
configs/chromebook_kevin_defconfig +0 -1
@@ -31,7 +31,6 @@ CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y # CONFIG_SPL_FIT_SIGNATURE is not set CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-kevin.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BLOBLIST=y
Signature · 1 line
2.44.0
RFC PATCH v2 5/23 arm: rockchip: Enable display cpuinfo to be build with SPL_BUILD
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Changes help enable CONFIG_DISPLAY_CPUINFO to build with SPL_BUILD for SoC RK356x and RK3588.
--- arch/arm/mach-rockchip/Makefile | 3 --- 1 file changed, 3 deletions(-)
arch/arm/mach-rockchip/Makefile +0 -3
@@ -23,9 +23,6 @@ ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),) # meaning "turn it off". obj-y += boot_mode.o obj-$(CONFIG_ROCKCHIP_COMMON_BOARD) += board.o -endif - -ifeq ($(CONFIG_TPL_BUILD),) obj-$(CONFIG_DISPLAY_CPUINFO) += cpu-info.o endif
Signature · 1 line
2.44.0
RFC PATCH v2 6/23 rockchip: RK3568: Read the reset cause from clock reset unit for RK356x SoC
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK356x SoC.
--- arch/arm/mach-rockchip/cpu-info.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-rockchip/cpu-info.c +2 -0
@@ -18,6 +18,8 @@ char *get_reset_cause(void)struct rk3328_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3399 )struct rockchip_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3568 ) +struct rk3568_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Signature · 1 line
2.44.0
RFC PATCH v2 7/23 rockchip: RK3568: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all RK3568 boards. Its used to determine the reset cause of the board.
--- configs/anbernic-rgxx3-rk3566_defconfig | 1 - configs/bpi-r2-pro-rk3568_defconfig | 1 - configs/evb-rk3568_defconfig | 1 - configs/generic-rk3568_defconfig | 1 - configs/lubancat-2-rk3568_defconfig | 1 - configs/nanopi-r5c-rk3568_defconfig | 1 - configs/nanopi-r5s-rk3568_defconfig | 1 - configs/odroid-m1-rk3568_defconfig | 1 - configs/pinetab2-rk3566_defconfig | 1 - configs/quartz64-a-rk3566_defconfig | 1 - configs/quartz64-b-rk3566_defconfig | 1 - configs/radxa-cm3-io-rk3566_defconfig | 1 - configs/radxa-e25-rk3568_defconfig | 1 - configs/rock-3a-rk3568_defconfig | 1 - configs/soquartz-blade-rk3566_defconfig | 1 - configs/soquartz-cm4-rk3566_defconfig | 1 - configs/soquartz-model-a-rk3566_defconfig | 1 - 17 files changed, 17 deletions(-)
configs/anbernic-rgxx3-rk3566_defconfig +0 -1
@@ -21,7 +21,6 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-anbernic-rgxx3.dtb" # CONFIG_CONSOLE_MUX is not set -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_RNG_SEED=y CONFIG_SPL_MAX_SIZE=0x40000
configs/bpi-r2-pro-rk3568_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-bpi-r2-pro.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/evb-rk3568_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-evb1-v10.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/generic-rk3568_defconfig +0 -1
@@ -20,7 +20,6 @@ CONFIG_SPL_LOAD_FIT=y # CONFIG_BOOTMETH_VBE is not set CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-generic.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/lubancat-2-rk3568_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-lubancat-2.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/nanopi-r5c-rk3568_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-nanopi-r5c.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/nanopi-r5s-rk3568_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-nanopi-r5s.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/odroid-m1-rk3568_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-odroid-m1.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/pinetab2-rk3566_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-pinetab2-v2.0.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/quartz64-a-rk3566_defconfig +0 -1
@@ -24,7 +24,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-quartz64-a.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/quartz64-b-rk3566_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-quartz64-b.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/radxa-cm3-io-rk3566_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-radxa-cm3-io.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/radxa-e25-rk3568_defconfig +0 -1
@@ -18,7 +18,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-radxa-e25.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/rock-3a-rk3568_defconfig +0 -1
@@ -22,7 +22,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-3a.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/soquartz-blade-rk3566_defconfig +0 -1
@@ -18,7 +18,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-soquartz-blade.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/soquartz-cm4-rk3566_defconfig +0 -1
@@ -18,7 +18,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-soquartz-cm4.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/soquartz-model-a-rk3566_defconfig +0 -1
@@ -18,7 +18,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-soquartz-model-a.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
Signature · 1 line
2.44.0
RFC PATCH v2 8/23 rockchip: RK3588: Read the reset cause from clock reset unit for RK3588 SoC
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3588 SoC.
--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)
arch/arm/include/asm/arch-rockchip/cru.h +2 -0
@@ -19,6 +19,8 @@# include <asm/arch-rockchip/cru_rk3399.h> #elif defined(CONFIG_ROCKCHIP_RK3568 )#include <asm/arch-rockchip/cru_rk3568.h> +#elif defined(CONFIG_ROCKCHIP_RK3588 ) +#include <asm/arch-rockchip/cru_rk3588.h> #endif /* CRU_GLB_RST_ST */
arch/arm/mach-rockchip/cpu-info.c +2 -0
@@ -20,6 +20,8 @@ char *get_reset_cause(void)struct rockchip_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3568 )struct rk3568_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3588 ) +struct rk3588_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Signature · 1 line
2.44.0
Re: [PATCH RFC v2 08/23] rockchip: RK3588: Read the reset cause from clock reset unit for RK3588 SoC
Hello Anand,
Quoted 18 lines · Anand Moon
From: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3588 SoC.
Cc Jagan Teki <[email protected]>Signed-off-by Anand Moon <[email protected]>Signed-off-by Anand Moon <[email protected]>--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)arch/arm/include/asm/arch-rockchip/cru.h +0
-0
arch/arm/include/asm/arch-rockchip/cru.h line 21
Quoted 3 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0@@ -19,6 +19,8 @@# include <asm/arch-rockchip/cru_rk3399.h> #elif defined(CONFIG_ROCKCHIP_RK3568 )#include <asm/arch-rockchip/cru_rk3568.h>
Although not related to this patch directly, single space character should be added between "#" and "include", for consistency.
arch/arm/include/asm/arch-rockchip/cru.h line 23
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +2
-0+#elif defined(CONFIG_ROCKCHIP_RK3588 ) +#include <asm/arch-rockchip/cru_rk3588.h>
The same comment as above, bit this time related to this patch.
Quoted 16 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#endif /* CRU_GLB_RST_ST */ arch/arm/mach-rockchip/cpu-info.c +2
-0@@ -20,6 +20,8 @@ char *get_reset_cause(void)struct rockchip_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3568 )struct rk3568_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3588 ) +struct rk3588_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
RFC PATCH v2 9/23 rockchip: RK3588: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all RK3588 boards. Its used to determine the reset cause of the board.
--- configs/coolpi-4b-rk3588s_defconfig | 1 - configs/coolpi-cm5-evb-rk3588_defconfig | 1 - configs/evb-rk3588_defconfig | 1 - configs/generic-rk3588_defconfig | 1 - configs/jaguar-rk3588_defconfig | 1 - configs/nanopc-t6-rk3588_defconfig | 1 - configs/neu6a-io-rk3588_defconfig | 1 - configs/neu6b-io-rk3588_defconfig | 1 - configs/orangepi-5-plus-rk3588_defconfig | 1 - configs/orangepi-5-rk3588s_defconfig | 1 - configs/quartzpro64-rk3588_defconfig | 1 - configs/rock5a-rk3588s_defconfig | 1 - configs/rock5b-rk3588_defconfig | 1 - configs/toybrick-rk3588_defconfig | 1 - configs/turing-rk1-rk3588_defconfig | 1 - 15 files changed, 15 deletions(-)
configs/coolpi-4b-rk3588s_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-coolpi-4b.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/coolpi-cm5-evb-rk3588_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-coolpi-cm5-evb.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/evb-rk3588_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-evb1-v10.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/generic-rk3588_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_SPL_LOAD_FIT=y # CONFIG_BOOTMETH_VBE is not set CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-generic.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/jaguar-rk3588_defconfig +0 -1
@@ -22,7 +22,6 @@ CONFIG_SPL_LOAD_FIT=y # CONFIG_BOOTMETH_VBE is not set CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-jaguar.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CYCLIC=y CONFIG_SPL_MAX_SIZE=0x40000
configs/nanopc-t6-rk3588_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/neu6a-io-rk3588_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-edgeble-neu6a-io.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/neu6b-io-rk3588_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-edgeble-neu6b-io.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/orangepi-5-plus-rk3588_defconfig +0 -1
@@ -24,7 +24,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/orangepi-5-rk3588s_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/quartzpro64-rk3588_defconfig +0 -1
@@ -19,7 +19,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-quartzpro64.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/rock5a-rk3588s_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-rock-5a.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/rock5b-rk3588_defconfig +0 -1
@@ -24,7 +24,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-rock-5b.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/toybrick-rk3588_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-toybrick-x0.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/turing-rk1-rk3588_defconfig +0 -1
@@ -19,7 +19,6 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-turing-rk1.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
Signature · 1 line
2.44.0
RFC PATCH v2 10/23 rockchip: PX30: Read the reset cause from clock reset unit for PX30 SoC
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for PX30 SoC.
--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)
arch/arm/include/asm/arch-rockchip/cru.h +2 -0
@@ -21,6 +21,8 @@#include <asm/arch-rockchip/cru_rk3568.h> #elif defined(CONFIG_ROCKCHIP_RK3588 )#include <asm/arch-rockchip/cru_rk3588.h> +#elif defined(CONFIG_ROCKCHIP_PX30 ) +#include <asm/arch-rockchip/cru_px30.h> #endif /* CRU_GLB_RST_ST */
arch/arm/mach-rockchip/cpu-info.c +2 -0
@@ -22,6 +22,8 @@ char *get_reset_cause(void)struct rk3568_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3588 )struct rk3588_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_PX30 ) +struct px30_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Signature · 1 line
2.44.0
Re: [PATCH RFC v2 10/23] rockchip: PX30: Read the reset cause from clock reset unit for PX30 SoC
Hello Anand,
Quoted 18 lines · Anand Moon
From: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for PX30 SoC.
Cc Jagan Teki <[email protected]>Signed-off-by Anand Moon <[email protected]>Signed-off-by Anand Moon <[email protected]>--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)arch/arm/include/asm/arch-rockchip/cru.h +0
-0
arch/arm/include/asm/arch-rockchip/cru.h line 21
Quoted 1 line
arch/arm/include/asm/arch-rockchip/cru.h +0
-0@@ -21,6 +21,8 @@#include <asm/arch-rockchip/cru_rk3568.h>
Although not related to this patch directly, a single space character should be added between "#" and "include", for consistency.
arch/arm/include/asm/arch-rockchip/cru.h line 23
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#elif defined(CONFIG_ROCKCHIP_RK3588 )#include <asm/arch-rockchip/cru_rk3588.h>
The same comment as above.
arch/arm/include/asm/arch-rockchip/cru.h line 25
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +2
-0+#elif defined(CONFIG_ROCKCHIP_PX30 ) +#include <asm/arch-rockchip/cru_px30.h>
The same comment as above, bit this time related to this patch.
Quoted 16 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#endif /* CRU_GLB_RST_ST */ arch/arm/mach-rockchip/cpu-info.c +2
-0@@ -22,6 +22,8 @@ char *get_reset_cause(void)struct rk3568_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3588 )struct rk3588_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_PX30 ) +struct px30_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
RFC PATCH v2 11/23 rockchip: PX30: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all PX30 boards. Its used to determine the reset cause of the board.
--- configs/evb-px30_defconfig | 1 - configs/firefly-px30_defconfig | 1 - configs/px30-core-ctouch2-of10-px30_defconfig | 1 - configs/px30-core-ctouch2-px30_defconfig | 1 - configs/px30-core-edimm2.2-px30_defconfig | 1 - configs/ringneck-px30_defconfig | 1 - 6 files changed, 6 deletions(-)
configs/evb-px30_defconfig +0 -1
@@ -32,7 +32,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/px30-evb.dtb" # CONFIG_CONSOLE_MUX is not set -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x20000
configs/firefly-px30_defconfig +0 -1
@@ -33,7 +33,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/px30-firefly.dtb" # CONFIG_CONSOLE_MUX is not set -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x20000
configs/px30-core-ctouch2-of10-px30_defconfig +0 -1
@@ -33,7 +33,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/px30-engicam-px30-core-ctouch2-of10.dtb" # CONFIG_CONSOLE_MUX is not set -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x20000
configs/px30-core-ctouch2-px30_defconfig +0 -1
@@ -33,7 +33,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/px30-engicam-px30-core-ctouch2.dtb" # CONFIG_CONSOLE_MUX is not set -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x20000
configs/px30-core-edimm2.2-px30_defconfig +0 -1
@@ -33,7 +33,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/px30-engicam-px30-core-edimm2.2.dtb" # CONFIG_CONSOLE_MUX is not set -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x20000
configs/ringneck-px30_defconfig +0 -1
@@ -21,7 +21,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/px30-ringneck-haikou.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x20000
Signature · 1 line
2.44.0
RFC PATCH v2 12/23 rockchip: RK3288: Read the reset cause from clock reset unit for RK3288 SoC
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3288 SoC.
--- arch/arm/mach-rockchip/cpu-info.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-rockchip/cpu-info.c +2 -0
@@ -24,6 +24,8 @@ char *get_reset_cause(void)struct rk3588_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_PX30 )struct px30_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3288 ) +struct rockchip_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Signature · 1 line
2.44.0
RFC PATCH v2 13/23 rockchip: RK3288: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all RK3288 boards. Its used to determine the reset cause of the board.
--- configs/chromebit_mickey_defconfig | 1 - configs/chromebook_jerry_defconfig | 1 - configs/chromebook_minnie_defconfig | 1 - configs/chromebook_speedy_defconfig | 1 - 4 files changed, 4 deletions(-)
configs/chromebit_mickey_defconfig +0 -1
@@ -31,7 +31,6 @@ CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-mickey.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_LOG=y -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SPL_PAD_TO=0x7f8000
configs/chromebook_jerry_defconfig +0 -1
@@ -30,7 +30,6 @@ CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-jerry.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_LOG=y -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SPL_PAD_TO=0x7f8000
configs/chromebook_minnie_defconfig +0 -1
@@ -31,7 +31,6 @@ CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-minnie.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_LOG=y -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SPL_PAD_TO=0x7f8000
configs/chromebook_speedy_defconfig +0 -1
@@ -31,7 +31,6 @@ CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-speedy.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_LOG=y -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SPL_PAD_TO=0x7f8000
Signature · 1 line
2.44.0
RFC PATCH v2 14/23 rockchip: RK3308: Read the reset cause from clock reset unit for RK3308 SoC
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3308 SoC.
--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)
arch/arm/include/asm/arch-rockchip/cru.h +2 -0
@@ -23,6 +23,8 @@#include <asm/arch-rockchip/cru_rk3588.h> #elif defined(CONFIG_ROCKCHIP_PX30 )#include <asm/arch-rockchip/cru_px30.h> +#elif defined(CONFIG_ROCKCHIP_RK3308 ) +#include <asm/arch-rockchip/cru_rk3308.h> #endif /* CRU_GLB_RST_ST */
arch/arm/mach-rockchip/cpu-info.c +2 -0
@@ -26,6 +26,8 @@ char *get_reset_cause(void)struct px30_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3288 )struct rockchip_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3308 ) +struct rk3308_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Signature · 1 line
2.44.0
Re: [PATCH RFC v2 14/23] rockchip: RK3308: Read the reset cause from clock reset unit for RK3308 SoC
Hello Anand,
Quoted 18 lines · Anand Moon
From: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3308 SoC.
Cc Jagan Teki <[email protected]>Signed-off-by Anand Moon <[email protected]>Signed-off-by Anand Moon <[email protected]>--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)arch/arm/include/asm/arch-rockchip/cru.h +0
-0
arch/arm/include/asm/arch-rockchip/cru.h line 23
Quoted 1 line
arch/arm/include/asm/arch-rockchip/cru.h +0
-0@@ -23,6 +23,8 @@#include <asm/arch-rockchip/cru_rk3588.h>
Although not related to this patch directly, a single space character should be added between "#" and "include", for consistency.
arch/arm/include/asm/arch-rockchip/cru.h line 25
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#elif defined(CONFIG_ROCKCHIP_PX30 )#include <asm/arch-rockchip/cru_px30.h>
The same comment as above.
arch/arm/include/asm/arch-rockchip/cru.h line 27
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +2
-0+#elif defined(CONFIG_ROCKCHIP_RK3308 ) +#include <asm/arch-rockchip/cru_rk3308.h>
The same comment as above, bit this time related to this patch.
Quoted 16 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#endif /* CRU_GLB_RST_ST */ arch/arm/mach-rockchip/cpu-info.c +2
-0@@ -26,6 +26,8 @@ char *get_reset_cause(void)struct px30_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3288 )struct rockchip_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3308 ) +struct rk3308_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
RFC PATCH v2 15/23 rockchip: RK3308: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all RK3308 boards. Its used to determine the reset cause of the board.
--- configs/evb-rk3308_defconfig | 1 - configs/roc-cc-rk3308_defconfig | 1 - configs/rock-pi-s-rk3308_defconfig | 1 - 3 files changed, 3 deletions(-)
configs/evb-rk3308_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-evb.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
configs/roc-cc-rk3308_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-roc-cc.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
configs/rock-pi-s-rk3308_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-rock-pi-s.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
Signature · 1 line
2.44.0
RFC PATCH v2 16/23 rockchip: RK3368: Read the reset cause from clock reset unit for RK3368 SoC
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3368 SoC.
--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)
arch/arm/include/asm/arch-rockchip/cru.h +2 -0
@@ -25,6 +25,8 @@#include <asm/arch-rockchip/cru_px30.h> #elif defined(CONFIG_ROCKCHIP_RK3308 )#include <asm/arch-rockchip/cru_rk3308.h> +#elif defined(CONFIG_ROCKCHIP_RK3368 ) +#include <asm/arch-rockchip/cru_rk3368.h> #endif /* CRU_GLB_RST_ST */
arch/arm/mach-rockchip/cpu-info.c +2 -0
@@ -28,6 +28,8 @@ char *get_reset_cause(void)struct rockchip_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3308 )struct rk3308_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3368 ) +struct rk3368_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Signature · 1 line
2.44.0
Re: [PATCH RFC v2 16/23] rockchip: RK3368: Read the reset cause from clock reset unit for RK3368 SoC
Hello Anand,
Quoted 18 lines · Anand Moon
From: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RK3368 SoC.
Cc Jagan Teki <[email protected]>Signed-off-by Anand Moon <[email protected]>Signed-off-by Anand Moon <[email protected]>--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)arch/arm/include/asm/arch-rockchip/cru.h +0
-0
arch/arm/include/asm/arch-rockchip/cru.h line 25
Quoted 1 line
arch/arm/include/asm/arch-rockchip/cru.h +0
-0@@ -25,6 +25,8 @@#include <asm/arch-rockchip/cru_px30.h>
Although not related to this patch directly, a single space character should be added between "#" and "include", for consistency.
arch/arm/include/asm/arch-rockchip/cru.h line 27
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#elif defined(CONFIG_ROCKCHIP_RK3308 )#include <asm/arch-rockchip/cru_rk3308.h>
The same comment as above.
arch/arm/include/asm/arch-rockchip/cru.h line 29
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +2
-0+#elif defined(CONFIG_ROCKCHIP_RK3368 ) +#include <asm/arch-rockchip/cru_rk3368.h>
The same comment as above, bit this time related to this patch.
Quoted 16 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#endif /* CRU_GLB_RST_ST */ arch/arm/mach-rockchip/cpu-info.c +2
-0@@ -28,6 +28,8 @@ char *get_reset_cause(void)struct rockchip_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3308 )struct rk3308_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3368 ) +struct rk3368_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
RFC PATCH v2 17/23 rockchip: RK3368: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all RK3368 boards. Its used to determine the reset cause of the board.
--- configs/evb-px5_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/sheep-rk3368_defconfig | 1 - 4 files changed, 4 deletions(-)
configs/evb-px5_defconfig +0 -1
@@ -37,7 +37,6 @@ CONFIG_SPL_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_BOOTSTAGE_FDT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-px5-evb.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/geekbox_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-geekbox.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_REGMAP=y
configs/lion-rk3368_defconfig +0 -1
@@ -34,7 +34,6 @@ CONFIG_SPL_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_BOOTSTAGE_FDT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-lion-haikou.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000
configs/sheep-rk3368_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-sheep.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.44.0
RFC PATCH v2 18/23 rockchip: RV1108: Read the reset cause from clock reset unit for RV1108 SoC
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RV1108 SoC.
--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)
arch/arm/include/asm/arch-rockchip/cru.h +2 -0
@@ -27,6 +27,8 @@#include <asm/arch-rockchip/cru_rk3308.h> #elif defined(CONFIG_ROCKCHIP_RK3368 )#include <asm/arch-rockchip/cru_rk3368.h> +#elif defined(CONFIG_ROCKCHIP_RV1108 ) +#include <asm/arch-rockchip/cru_rv1108.h> #endif /* CRU_GLB_RST_ST */
arch/arm/mach-rockchip/cpu-info.c +2 -0
@@ -30,6 +30,8 @@ char *get_reset_cause(void)struct rk3308_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3368 )struct rk3368_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RV1108 ) +struct rv1108_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Signature · 1 line
2.44.0
Re: [PATCH RFC v2 18/23] rockchip: RV1108: Read the reset cause from clock reset unit for RV1108 SoC
Hello Anand,
Quoted 18 lines · Anand Moon
From: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RV1108 SoC.
Cc Jagan Teki <[email protected]>Signed-off-by Anand Moon <[email protected]>Signed-off-by Anand Moon <[email protected]>--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)arch/arm/include/asm/arch-rockchip/cru.h +0
-0
arch/arm/include/asm/arch-rockchip/cru.h line 27
Quoted 1 line
arch/arm/include/asm/arch-rockchip/cru.h +0
-0@@ -27,6 +27,8 @@#include <asm/arch-rockchip/cru_rk3308.h>
Although not related to this patch directly, a single space character should be added between "#" and "include", for consistency.
arch/arm/include/asm/arch-rockchip/cru.h line 29
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#elif defined(CONFIG_ROCKCHIP_RK3368 )#include <asm/arch-rockchip/cru_rk3368.h>
The same comment as above.
arch/arm/include/asm/arch-rockchip/cru.h line 31
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +2
-0+#elif defined(CONFIG_ROCKCHIP_RV1108 ) +#include <asm/arch-rockchip/cru_rv1108.h>
The same comment as above, bit this time related to this patch.
Quoted 16 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#endif /* CRU_GLB_RST_ST */ arch/arm/mach-rockchip/cpu-info.c +2
-0@@ -30,6 +30,8 @@ char *get_reset_cause(void)struct rk3308_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RK3368 )struct rk3368_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RV1108 ) +struct rv1108_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
RFC PATCH v2 19/23 rockchip: RV1108: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all RV1108 boards. Its used to determine the reset cause of the board.
--- configs/elgin-rv1108_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - 2 files changed, 2 deletions(-)
configs/elgin-rv1108_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_SYS_LOAD_ADDR=0x62000000 CONFIG_DEBUG_UART=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_DEFAULT_FDT_FILE="rv1108-elgin-r1.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_LATE_INIT=y
configs/evb-rv1108_defconfig +0 -1
@@ -14,7 +14,6 @@ CONFIG_SYS_LOAD_ADDR=0x62000000 CONFIG_DEBUG_UART=y CONFIG_BOOTCOMMAND="sf probe;sf read 0x62000000 0x140800 0x500000;dcache off;go 0x62000000" CONFIG_DEFAULT_FDT_FILE="rv1108-evb.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_USB=y
Signature · 1 line
2.44.0
RFC PATCH v2 20/23 rockchip: RV1126: Read the reset cause from clock reset unit for RV1126 SoC
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RV1126 SoC.
--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)
arch/arm/include/asm/arch-rockchip/cru.h +2 -0
@@ -29,6 +29,8 @@#include <asm/arch-rockchip/cru_rk3368.h> #elif defined(CONFIG_ROCKCHIP_RV1108 )#include <asm/arch-rockchip/cru_rv1108.h> +#elif defined(CONFIG_ROCKCHIP_RV1126 ) +#include <asm/arch-rockchip/cru_rv1126.h> #endif /* CRU_GLB_RST_ST */
arch/arm/mach-rockchip/cpu-info.c +2 -0
@@ -32,6 +32,8 @@ char *get_reset_cause(void)struct rk3368_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RV1108 )struct rv1108_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RV1126 ) +struct rv1126_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Signature · 1 line
2.44.0
Re: [PATCH RFC v2 20/23] rockchip: RV1126: Read the reset cause from clock reset unit for RV1126 SoC
Hello Anand,
Quoted 18 lines · Anand Moon
From: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RV1126 SoC.
Cc Jagan Teki <[email protected]>Signed-off-by Anand Moon <[email protected]>Signed-off-by Anand Moon <[email protected]>--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)arch/arm/include/asm/arch-rockchip/cru.h +0
-0
arch/arm/include/asm/arch-rockchip/cru.h line 29
Quoted 1 line
arch/arm/include/asm/arch-rockchip/cru.h +0
-0@@ -29,6 +29,8 @@#include <asm/arch-rockchip/cru_rk3368.h>
Although not related to this patch directly, a single space character should be added between "#" and "include", for consistency.
arch/arm/include/asm/arch-rockchip/cru.h line 31
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#elif defined(CONFIG_ROCKCHIP_RV1108 )#include <asm/arch-rockchip/cru_rv1108.h>
The same comment as above.
arch/arm/include/asm/arch-rockchip/cru.h line 33
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +2
-0+#elif defined(CONFIG_ROCKCHIP_RV1126 ) +#include <asm/arch-rockchip/cru_rv1126.h>
The same comment as above, but this time related to this patch.
Quoted 16 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#endif /* CRU_GLB_RST_ST */ arch/arm/mach-rockchip/cpu-info.c +2
-0@@ -32,6 +32,8 @@ char *get_reset_cause(void)struct rk3368_cru *cru =rockchip_get_cru ();#elif IS_ENABLED (CONFIG_ROCKCHIP_RV1108 )struct rv1108_cru *cru =rockchip_get_cru (); +#elif IS_ENABLED (CONFIG_ROCKCHIP_RV1126 ) +struct rv1126_cru *cru =rockchip_get_cru ();#endif char *cause =NULL ;
Re: [PATCH RFC v2 20/23] rockchip: RV1126: Read the reset cause from clock reset unit for RV1126 SoC
Hi Dragan,
Quoted 16 lines · Dragan Simic
Hello Anand,
Quoted 12 lines · Anand Moon
From: Anand Moon <[email protected]>
Read the reset cause from clock reset unit for RV1126 SoC.
Cc Jagan Teki <[email protected]>Signed-off-by Anand Moon <[email protected]>Signed-off-by Anand Moon <[email protected]>--- arch/arm/include/asm/arch-rockchip/cru.h | 2 ++ arch/arm/mach-rockchip/cpu-info.c | 2 ++ 2 files changed, 4 insertions(+)
Quoted 11 lines
arch/arm/include/asm/arch-rockchip/cru.h line 29
Quoted 7 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0@@ -29,6 +29,8 @@#include <asm/arch-rockchip/cru_rk3368.h> Although not related to this patch directly, a single space character should be added between "#" and "include", for consistency.
Not sure of this.
Quoted 11 lines
arch/arm/include/asm/arch-rockchip/cru.h line 31
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#elif defined(CONFIG_ROCKCHIP_RV1108 )#include <asm/arch-rockchip/cru_rv1108.h> The same comment as above.
arch/arm/include/asm/arch-rockchip/cru.h line 33
Quoted 2 lines
arch/arm/include/asm/arch-rockchip/cru.h +2
-0+#elif defined(CONFIG_ROCKCHIP_RV1126 ) +#include <asm/arch-rockchip/cru_rv1126.h> The same comment as above, but this time related to this patch.
Quoted 1 line
arch/arm/include/asm/arch-rockchip/cru.h +0
-0#endif
Let me check this again if needed. I will update in the next version.
Thanks
-Anand
RFC PATCH v2 21/23 rockchip: RV1126: Enable display cpuinfo support on all boards
In reply to Anand MoonFrom: Anand Moon <[email protected]>
Enable DISPLAY_CPUINFO options to support on all RV1126 boards. Its used to determine the reset cause of the board.
--- configs/neu2-io-rv1126_defconfig | 1 - configs/sonoff-ihost-rv1126_defconfig | 1 - 2 files changed, 2 deletions(-)
configs/neu2-io-rv1126_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_DEBUG_UART=y CONFIG_FIT_VERBOSE=y CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DEFAULT_FDT_FILE="rv1126-edgeble-neu2-io.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_PAD_TO=0x7f8000 CONFIG_SPL_NO_BSS_LIMIT=y
configs/sonoff-ihost-rv1126_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DEFAULT_FDT_FILE="rv1126-sonoff-ihost.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_PAD_TO=0x7f8000 CONFIG_SPL_NO_BSS_LIMIT=y
Signature · 1 line
2.44.0
RFC PATCH v2 22/23 sysreset: rockchip: use fst reset for ARM64 SOC
In reply to Anand MoonFrom: Kever Yang <[email protected]>
Rockchip ARM64 SOC will change cpu entry, only fst reset can reset it.
--- drivers/sysreset/sysreset_rockchip.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/sysreset/sysreset_rockchip.c +5 -0
@@ -22,7 +22,12 @@ int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type)switch (type) {case SYSRESET_WARM : +#ifdef CONFIG_ARM64 +/* Rockchip 64bit SOC need fst reset for cpu reset entry */ +writel (0xfdb9 , cru_base + offset->glb_srst_fst_value); +#else writel (0xeca8 , cru_base + offset->glb_srst_snd_value); +#endif break ;case SYSRESET_COLD :writel (0xfdb9 , cru_base + offset->glb_srst_fst_value);
Signature · 1 line
2.44.0
Re: [PATCH RFC v2 22/23] sysreset: rockchip: use fst reset for ARM64 SOC
Hi Anand and Kever,
Quoted 3 lines · Anand Moon
From: Kever Yang <[email protected]>
Rockchip ARM64 SOC will change cpu entry, only fst reset can reset it.
What is this trying to fix? And what SoCs is affected?
My arm64 RK SoCs seem to reset using warm reset (second global reset).
Quoted 12 lines
Cc Jagan Teki <[email protected]>Signed-off-by Kever Yang <[email protected]>--- drivers/sysreset/sysreset_rockchip.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/sysreset/sysreset_rockchip.c +0
-0
drivers/sysreset/sysreset_rockchip.c int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type) · line 30
Quoted 9 lines
drivers/sysreset/sysreset_rockchip.c +5
-0@@ -22,7 +22,12 @@ int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type)switch (type) {case SYSRESET_WARM : +#ifdef CONFIG_ARM64 +/* Rockchip 64bit SOC need fst reset for cpu reset entry */ +writel (0xfdb9 , cru_base + offset->glb_srst_fst_value); +#else writel (0xeca8 , cru_base + offset->glb_srst_snd_value); +#endif
If this is needed maybe use something like this and let it fall through to SYSRESET_COLD?
if (!IS_ENABLED(CONFIG_ARM64)) {
writel(0xeca8, cru_base + offset->glb_srst_snd_value);
break;}
Regards,
Jonas
Quoted 3 lines
drivers/sysreset/sysreset_rockchip.c +0
-0break ;case SYSRESET_COLD :writel (0xfdb9 , cru_base + offset->glb_srst_fst_value);
Re: [PATCH RFC v2 22/23] sysreset: rockchip: use fst reset for ARM64 SOC
Hi Jonas
Quoted 12 lines · Jonas Karlman
Hi Anand and Kever,
Quoted 3 lines · Anand Moon
From: Kever Yang <[email protected]>
Rockchip ARM64 SOC will change cpu entry, only fst reset can reset it.
What is this trying to fix? And what SoCs is affected?
My arm64 RK SoCs seem to reset using warm reset (second global reset).
I found this patch related to CRU so it was added in this series. My goal is to test all the remaining SoC and see if any thing is missing in my testing.
Quoted 25 lines
Quoted 12 lines
Cc Jagan Teki <[email protected]>Signed-off-by Kever Yang <[email protected]>--- drivers/sysreset/sysreset_rockchip.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/sysreset/sysreset_rockchip.c +0
-0drivers/sysreset/sysreset_rockchip.c int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type) · line 30
Quoted 9 lines
drivers/sysreset/sysreset_rockchip.c +5
-0@@ -22,7 +22,12 @@ int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type)switch (type) {case SYSRESET_WARM : +#ifdef CONFIG_ARM64 +/* Rockchip 64bit SOC need fst reset for cpu reset entry */ +writel (0xfdb9 , cru_base + offset->glb_srst_fst_value); +#else writel (0xeca8 , cru_base + offset->glb_srst_snd_value); +#endif If this is needed maybe use something like this and let it fall through to
SYSRESET_COLD?
Quoted 5 lines
if (!IS_ENABLED(CONFIG_ARM64)) {
writel(0xeca8, cru_base + offset->glb_srst_snd_value);
break;
}Ok I will update this in next version
Quoted 2 lines
Regards,
Jonas
Thanks
-Anand
Re: [PATCH RFC v2 22/23] sysreset: rockchip: use fst reset for ARM64 SOC
In reply to Jonas KarlmanQuoted 7 lines · Jonas Karlman
Hi Anand and Kever,
Quoted 3 lines · Anand Moon
From: Kever Yang <[email protected]>
Rockchip ARM64 SOC will change cpu entry, only fst reset can reset it.
What is this trying to fix? And what SoCs is affected?
Both fst and snd softreset are available for SoCs, but the fst reset more thing.
This commit msg is about: in some case the CPU entry may change after system boot,
eg. the wakeup code for deep sleep mode(which may power off) is locate at a different address;
with fst reset, the CPU entry is reset to the one bootRom used but the snd reset can not.
All the mass produced product with ARM64 SoCs are using the first global reset for warn reset now.
Thanks,
- Kever
Quoted 36 lines
My arm64 RK SoCs seem to reset using warm reset (second global reset).
Quoted 11 lines
Cc Jagan Teki <[email protected]>Signed-off-by Kever Yang <[email protected]>--- drivers/sysreset/sysreset_rockchip.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/sysreset/sysreset_rockchip.c +0
-0drivers/sysreset/sysreset_rockchip.c int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type) · line 30
Quoted 9 lines
drivers/sysreset/sysreset_rockchip.c +5
-0@@ -22,7 +22,12 @@ int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type)switch (type) {case SYSRESET_WARM : +#ifdef CONFIG_ARM64 +/* Rockchip 64bit SOC need fst reset for cpu reset entry */ +writel (0xfdb9 , cru_base + offset->glb_srst_fst_value); +#else writel (0xeca8 , cru_base + offset->glb_srst_snd_value); +#endif If this is needed maybe use something like this and let it fall through to
SYSRESET_COLD?if (!IS_ENABLED(CONFIG_ARM64)) { writel(0xeca8, cru_base + offset->glb_srst_snd_value); break; }Regards,
JonasQuoted 3 lines
drivers/sysreset/sysreset_rockchip.c +0
-0break ;case SYSRESET_COLD :writel (0xfdb9 , cru_base + offset->glb_srst_fst_value);
Re: [PATCH RFC v2 22/23] sysreset: rockchip: use fst reset for ARM64 SOC
In reply to Anand MoonHello Anand,
Quoted 16 lines · Anand Moon
From: Kever Yang <[email protected]>
Rockchip ARM64 SOC will change cpu entry, only fst reset can reset it.
Cc Jagan Teki <[email protected]>Signed-off-by Kever Yang <[email protected]>--- drivers/sysreset/sysreset_rockchip.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/sysreset/sysreset_rockchip.c +0
-0
drivers/sysreset/sysreset_rockchip.c int rockchip_sysreset_request(struct udevice *dev, · line 27
Quoted 6 lines
drivers/sysreset/sysreset_rockchip.c +2
-0@@ -22,7 +22,12 @@ int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type) switch (type) {case SYSRESET_WARM : +#ifdef CONFIG_ARM64 +/* Rockchip 64bit SOC need fst reset for cpu reset entry */
s/Rockchip 64bit SOC need fst reset for cpu reset entry
/Rockchip 64-bit SoCs need FST reset for CPU reset entry/
Quoted 7 lines
drivers/sysreset/sysreset_rockchip.c +3
-0+writel (0xfdb9 , cru_base + offset->glb_srst_fst_value); +#else writel (0xeca8 , cru_base + offset->glb_srst_snd_value); +#endif break ;case SYSRESET_COLD :
writel(0xfdb9, cru_base + offset->glb_srst_fst_value);
RFC PATCH v2 23/23 sysreset: rockchip: use dev_read_addr_ptr get cru base
In reply to Anand MoonFrom: Andy Yan <[email protected]>
Use system api dev_read_addr_ptr to get cru reg base, rather than rockchip private api rockchip_get_cru, which will be cleanup later.
--- drivers/sysreset/sysreset_rockchip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/sysreset/sysreset_rockchip.c +2 -2
@@ -8,14 +8,14 @@#include <errno.h> #include <sysreset.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3328.h> +#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/hardware.h> #include <linux/err.h> int rockchip_sysreset_request (struct udevice *dev,enum sysreset_t type) {struct sysreset_reg *offset =dev_get_priv (dev); -unsigned long cru_base = (unsigned long )rockchip_get_cru (); +unsigned long cru_base = (unsigned long )dev_read_addr_ptr (dev->parent);if (IS_ERR_VALUE (cru_base))return (int )cru_base;
Signature · 1 line
2.44.0