rk3399: Add redundant boot support
Subsystems (6)
v4 cover rk3399: Add redundant boot support
Boot redundancy is one of the key criteria for switch recovery or golden partition based on the bootcount value, which indeed very much needed in production systems on the fields.
This is v4 patchset support redundant boot on Rockchip rk3399.
Changes for v4:
- fixed compilation issue
- add wdt kconfig option
- tested wdt and bootcount
Changes for v3:
- rework of cru.h to include rk3288
- rebase on master
Changes for v2:
- Handle TPL build for watchdog, if TPL won't enable
- Fix comments for dw_wdt driver-model comments from Andy
- Add Kconfig items for WDT_TPL
- Support WDT on TPL as well
- Use SYS_SOC for cpu-info
Any inputs?
Jagan.
Jagan Teki (8):
rockchip: Add cpu-info
rockchip: rk3399: Enable DISPLAY_CPUINFO
arm: rockchip: Add common cru.h
rockchip: Add common reset cause
rockchip: rk3399: Add bootcount support
watchdog: kconfig: Enable designware for rk3399 [DO NOT MERGE] roc-rk3399-pc: Enable watchdog [DO NOT MERGE] roc-rk3399-pc: Enable bootcount
arch/arm/include/asm/arch-rockchip/clock.h | 4 +- arch/arm/include/asm/arch-rockchip/cru.h | 30 +++++++++ .../include/asm/arch-rockchip/cru_rk3288.h | 20 ++---- .../include/asm/arch-rockchip/cru_rk3399.h | 11 ++-- arch/arm/mach-rockchip/Kconfig | 2 + arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/cpu-info.c | 65 +++++++++++++++++++ arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3288/rk3288.c | 41 +----------- arch/arm/mach-rockchip/rk3399/Kconfig | 10 +++ arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- configs/evb-rk3288_defconfig | 1 - configs/evb-rk3399_defconfig | 1 - configs/ficus-rk3399_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/firefly-rk3399_defconfig | 1 - configs/khadas-edge-captain-rk3399_defconfig | 1 - configs/khadas-edge-rk3399_defconfig | 1 - configs/khadas-edge-v-rk3399_defconfig | 1 - configs/leez-rk3399_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/nanopc-t4-rk3399_defconfig | 1 - configs/nanopi-m4-rk3399_defconfig | 1 - configs/nanopi-neo4-rk3399_defconfig | 1 - configs/orangepi-rk3399_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/puma-rk3399_defconfig | 1 - configs/roc-pc-rk3399_defconfig | 3 +- configs/rock-pi-4-rk3399_defconfig | 1 - configs/rock960-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/tinker-s-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - drivers/clk/rockchip/clk_rk3288.c | 42 ++++++------ drivers/clk/rockchip/clk_rk3399.c | 36 +++++----- drivers/ram/rockchip/sdram_rk3288.c | 10 +-- drivers/ram/rockchip/sdram_rk3399.c | 10 +-- drivers/video/rockchip/rk3288_mipi.c | 2 +- drivers/video/rockchip/rk3399_mipi.c | 2 +- drivers/video/rockchip/rk_mipi.c | 2 +- drivers/watchdog/Kconfig | 1 + include/configs/rk3399_common.h | 5 +- 45 files changed, 182 insertions(+), 144 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/cru.h create mode 100644 arch/arm/mach-rockchip/cpu-info.c
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v4 1/8 rockchip: Add cpu-info
Add cpu information for rockchip soc.
This would help to print the SoC family number, with associated temparature, clock and reason for reset etc.
--- arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/cpu-info.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 arch/arm/mach-rockchip/cpu-info.c
arch/arm/mach-rockchip/Makefile +1 -0
@@ -22,6 +22,7 @@ ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),) # we can have the preprocessor correctly recognise both 0x0 and 0 # meaning "turn it off". obj-y += boot_mode.o +obj-$(CONFIG_DISPLAY_CPUINFO) += cpu-info.o obj-$(CONFIG_ROCKCHIP_COMMON_BOARD) += board.o obj-$(CONFIG_MISC_INIT_R) += misc.o endif
arch/arm/mach-rockchip/cpu-info.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* +* (C) Copyright 2019 Amarula Solutions(India) +* Author: Jagan Teki <[email protected]> +*/ + +#include <common.h> + +int print_cpuinfo (void ) +{ +printf ("SoC: Rockchip %s\n" ,CONFIG_SYS_SOC ); + +/* TODO print operating temparature and clock */ + +return 0 ; +}
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v4 2/8 rockchip: rk3399: Enable DISPLAY_CPUINFO
In reply to Jagan TekiRK3288, RK3399 are now support cpu-info, so enable DISPLAY_CPUINFO by default.
--- configs/evb-rk3288_defconfig | 1 - configs/evb-rk3399_defconfig | 1 - configs/ficus-rk3399_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/firefly-rk3399_defconfig | 1 - configs/khadas-edge-captain-rk3399_defconfig | 1 - configs/khadas-edge-rk3399_defconfig | 1 - configs/khadas-edge-v-rk3399_defconfig | 1 - configs/leez-rk3399_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/nanopc-t4-rk3399_defconfig | 1 - configs/nanopi-m4-rk3399_defconfig | 1 - configs/nanopi-neo4-rk3399_defconfig | 1 - configs/orangepi-rk3399_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/puma-rk3399_defconfig | 1 - configs/roc-pc-rk3399_defconfig | 1 - configs/rock-pi-4-rk3399_defconfig | 1 - configs/rock960-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/tinker-s-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - 24 files changed, 24 deletions(-)
configs/evb-rk3288_defconfig +0 -1
@@ -14,7 +14,6 @@ CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-evb-rk808.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
configs/evb-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-evb.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/ficus-rk3399_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_SPL_TEXT_BASE=0xff8c2000 -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/firefly-rk3288_defconfig +0 -1
@@ -14,7 +14,6 @@ CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-firefly.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
configs/firefly-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-firefly.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/khadas-edge-captain-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-khadas-edge-captain.dtbi" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/khadas-edge-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-khadas-edge.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/khadas-edge-v-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-khadas-edge-v.dtbi" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/leez-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-leez-p710.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
configs/miqi-rk3288_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_SPL_TEXT_BASE=0xff704000 CONFIG_USE_PREBOOT=y CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-miqi.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
configs/nanopc-t4-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopc-t4.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/nanopi-m4-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/nanopi-neo4-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-neo4.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/orangepi-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-orangepi.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/phycore-rk3288_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_USE_PREBOOT=y CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_DEFAULT_FDT_FILE="rk3288-phycore-rdk.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
configs/popmetal-rk3288_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_USE_PREBOOT=y CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_DEFAULT_FDT_FILE="rk3288-popmetal.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
configs/puma-rk3399_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_SPL_TEXT_BASE=0xff8c2000 CONFIG_SPL_FIT_GENERATOR="board/theobroma-systems/puma_rk3399/fit_spl_atf.sh" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" CONFIG_MISC_INIT_R=y -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/roc-pc-rk3399_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/rock-pi-4-rk3399_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4.dtb" CONFIG_MISC_INIT_R=y -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/rock960-rk3399_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/rockpro64-rk3399_defconfig +0 -1
@@ -10,7 +10,6 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" CONFIG_MISC_INIT_R=y -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y
configs/tinker-rk3288_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_USE_PREBOOT=y CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_DEFAULT_FDT_FILE="rk3288-tinker.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
configs/tinker-s-rk3288_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-tinker-s.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x300000
configs/vyasa-rk3288_defconfig +0 -1
@@ -14,7 +14,6 @@ CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-vyasa.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v4 3/8 arm: rockchip: Add common cru.h
In reply to Jagan TekiFew of the rockchip family SoC atleast rk3288, rk3399 are sharing some cru register bits so adding common code between these SoC families would require to include both cru include files that indeed resulting function declarations error.
So, create a common cru include as cru.h then
include the rk3399 arch cru include file and move
the common cru register bit definitions into it.
The rest of rockchip cru files will add it in future.
--- arch/arm/include/asm/arch-rockchip/clock.h | 4 +- arch/arm/include/asm/arch-rockchip/cru.h | 18 ++++++++ .../include/asm/arch-rockchip/cru_rk3288.h | 6 +-- .../include/asm/arch-rockchip/cru_rk3399.h | 11 +++-- arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3288/rk3288.c | 4 +- arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- drivers/clk/rockchip/clk_rk3288.c | 42 +++++++++---------- drivers/clk/rockchip/clk_rk3399.c | 36 ++++++++-------- drivers/ram/rockchip/sdram_rk3288.c | 10 ++--- drivers/ram/rockchip/sdram_rk3399.c | 10 ++--- drivers/video/rockchip/rk3288_mipi.c | 2 +- drivers/video/rockchip/rk3399_mipi.c | 2 +- drivers/video/rockchip/rk_mipi.c | 2 +- 15 files changed, 85 insertions(+), 68 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/cru.h
arch/arm/include/asm/arch-rockchip/clock.h +2 -2
@@ -153,10 +153,10 @@ void *rockchip_get_cru(void);*/ void *rockchip_get_pmucru (void ); -struct rk3288_cru ; +struct rockchip_cru ;struct rk3288_grf ; -void rk3288_clk_configure_cpu (struct rk3288_cru *cru,struct rk3288_grf *grf); +void rk3288_clk_configure_cpu (struct rockchip_cru *cru,struct rk3288_grf *grf);int rockchip_get_clk (struct udevice **devp);
arch/arm/include/asm/arch-rockchip/cru.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* +* (C) Copyright 2019 Amarula Solutions. +* Author: Jagan Teki <[email protected]> +*/ + +#ifndef _ROCKCHIP_CLOCK_H +#define _ROCKCHIP_CLOCK_H + +#if defined(CONFIG_ROCKCHIP_RK3288 ) +# include <asm/arch-rockchip/cru_rk3288.h> +#elif defined(CONFIG_ROCKCHIP_RK3399 ) +# include <asm/arch-rockchip/cru_rk3399.h> +#endif + +#define MHz 1000000 + +#endif /* _ROCKCHIP_CLOCK_H */
arch/arm/include/asm/arch-rockchip/cru_rk3288.h +3 -3
@@ -27,11 +27,11 @@/* Private data for the clock driver - used by rockchip_get_cru() */ struct rk3288_clk_priv {struct rk3288_grf *grf; -struct rk3288_cru *cru; +struct rockchip_cru *cru;ulong rate; }; -struct rk3288_cru { +struct rockchip_cru {struct rk3288_pll {u32 con0;u32 con1;
@@ -58,7 +58,7 @@ struct rk3288_cru {u32 cru_sdio1_con[2 ];u32 cru_emmc_con[2 ]; }; -check_member (rk3288_cru, cru_emmc_con[1 ],0x021c ); +check_member (rockchip_cru, cru_emmc_con[1 ],0x021c );/* CRU_CLKSEL11_CON */ enum {
arch/arm/include/asm/arch-rockchip/cru_rk3399.h +5 -6
@@ -10,7 +10,7 @@/* Private data for the clock driver - used by rockchip_get_cru() */ struct rk3399_clk_priv { -struct rk3399_cru *cru; +struct rockchip_cru *cru; };struct rk3399_pmuclk_priv {
@@ -33,7 +33,7 @@ struct rk3399_pmucru { };check_member (rk3399_pmucru, pmucru_gatedis_con[1 ],0x134 ); -struct rk3399_cru { +struct rockchip_cru {u32 apll_l_con[6 ];u32 reserved[2 ];u32 apll_b_con[6 ];
@@ -65,8 +65,7 @@ struct rk3399_cru {u32 sdio0_con[2 ];u32 sdio1_con[2 ]; }; -check_member (rk3399_cru, sdio1_con[1 ],0x594 ); -#define MHz 1000000 +check_member (rockchip_cru, sdio1_con[1 ],0x594 );#define KHz 1000#define OSC_HZ (24*MHz)#define LPLL_HZ (600*MHz)
@@ -107,9 +106,9 @@ enum apll_b_frequencies { APLL_B_600_MHZ, }; -void rk3399_configure_cpu_l (struct rk3399_cru *cru, +void rk3399_configure_cpu_l (struct rockchip_cru *cru,enum apll_l_frequencies apll_l_freq); -void rk3399_configure_cpu_b (struct rk3399_cru *cru, +void rk3399_configure_cpu_b (struct rockchip_cru *cru,enum apll_b_frequencies apll_b_freq);#endif /* __ASM_ARCH_CRU_RK3399_H_ */
arch/arm/mach-rockchip/rk3288/clk_rk3288.c +1 -1
@@ -8,7 +8,7 @@#include <dm.h> #include <syscon.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3288.h> +#include <asm/arch-rockchip/cru.h> int rockchip_get_clk (struct udevice **devp) {
arch/arm/mach-rockchip/rk3288/rk3288.c +2 -2
@@ -11,7 +11,7 @@#include <asm/io.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3288.h> +#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/hardware.h> #include <asm/arch-rockchip/grf_rk3288.h> #include <asm/arch-rockchip/pmu_rk3288.h>
@@ -104,7 +104,7 @@ void board_debug_uart_init(void)static void rk3288_detect_reset_reason (void ) { -struct rk3288_cru *cru =rockchip_get_cru (); +struct rockchip_cru *cru =rockchip_get_cru ();const char *reason;if (IS_ERR (cru))
arch/arm/mach-rockchip/rk3399/clk_rk3399.c +1 -1
@@ -8,7 +8,7 @@#include <dm.h> #include <syscon.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/cru.h> static int rockchip_get_cruclk (struct udevice **devp) {
arch/arm/mach-rockchip/rk3399/rk3399.c +1 -1
@@ -240,7 +240,7 @@ static void rk3399_force_power_on_reset(void)void spl_board_init (void ) {#if defined(SPL_GPIO_SUPPORT ) -struct rk3399_cru *cru =rockchip_get_cru (); +struct rockchip_cru *cru =rockchip_get_cru ();/* * The RK3399 resets only 'almost all logic' (see also in the TRM
drivers/clk/rockchip/clk_rk3288.c +21 -21
162 lines not on this page · raw message
drivers/clk/rockchip/clk_rk3399.c +18 -18
@@ -14,7 +14,7 @@#include <bitfield.h> #include <asm/io.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/hardware.h> #include <dm/lists.h> #include <dt-bindings/clock/rk3399-cru.h>
@@ -418,7 +418,7 @@ static int pll_para_config(u32 freq_hz, struct pll_div *div)return 0 ; } -void rk3399_configure_cpu_l (struct rk3399_cru *cru, +void rk3399_configure_cpu_l (struct rockchip_cru *cru,enum apll_l_frequencies apll_l_freq) {u32 aclkm_div;
@@ -453,7 +453,7 @@ void rk3399_configure_cpu_l(struct rk3399_cru *cru, atclk_div << ATCLK_CORE_L_DIV_SHIFT); } -void rk3399_configure_cpu_b (struct rk3399_cru *cru, +void rk3399_configure_cpu_b (struct rockchip_cru *cru,enum apll_b_frequencies apll_b_freq) {u32 aclkm_div;
@@ -505,7 +505,7 @@ void rk3399_configure_cpu_b(struct rk3399_cru *cru,#define I2C_PMUCLK_REG_VALUE (bus, clk_div) \ ((clk_div - 1) << CLK_I2C ##bus## _DIV_CON_SHIFT) -static ulong rk3399_i2c_get_clk (struct rk3399_cru *cru,ulong clk_id) +static ulong rk3399_i2c_get_clk (struct rockchip_cru *cru,ulong clk_id) {u32 div, con;
@@ -542,7 +542,7 @@ static ulong rk3399_i2c_get_clk(struct rk3399_cru *cru, ulong clk_id)return DIV_TO_RATE (GPLL_HZ , div); } -static ulong rk3399_i2c_set_clk (struct rk3399_cru *cru,ulong clk_id,uint hz) +static ulong rk3399_i2c_set_clk (struct rockchip_cru *cru,ulong clk_id,uint hz) {int src_clk_div;
@@ -619,7 +619,7 @@ static const struct spi_clkreg spi_clkregs[] = { .sel_shift = CLK_SPI5_PLL_SEL_SHIFT, }, }; -static ulong rk3399_spi_get_clk (struct rk3399_cru *cru,ulong clk_id) +static ulong rk3399_spi_get_clk (struct rockchip_cru *cru,ulong clk_id) {const struct spi_clkreg *spiclk =NULL ;u32 div, val;
@@ -641,7 +641,7 @@ static ulong rk3399_spi_get_clk(struct rk3399_cru *cru, ulong clk_id)return DIV_TO_RATE (GPLL_HZ , div); } -static ulong rk3399_spi_set_clk (struct rk3399_cru *cru,ulong clk_id,uint hz) +static ulong rk3399_spi_set_clk (struct rockchip_cru *cru,ulong clk_id,uint hz) {const struct spi_clkreg *spiclk =NULL ;int src_clk_div;
@@ -668,7 +668,7 @@ static ulong rk3399_spi_set_clk(struct rk3399_cru *cru, ulong clk_id, uint hz)return rk3399_spi_get_clk (cru, clk_id); } -static ulong rk3399_vop_set_clk (struct rk3399_cru *cru,ulong clk_id,u32 hz) +static ulong rk3399_vop_set_clk (struct rockchip_cru *cru,ulong clk_id,u32 hz) {struct pll_div vpll_config = {0 };int aclk_vop =198 * MHz;
@@ -712,7 +712,7 @@ static ulong rk3399_vop_set_clk(struct rk3399_cru *cru, ulong clk_id, u32 hz)return hz; } -static ulong rk3399_mmc_get_clk (struct rk3399_cru *cru,uint clk_id) +static ulong rk3399_mmc_get_clk (struct rockchip_cru *cru,uint clk_id) {u32 div, con;
@@ -739,7 +739,7 @@ static ulong rk3399_mmc_get_clk(struct rk3399_cru *cru, uint clk_id)return DIV_TO_RATE (GPLL_HZ , div); } -static ulong rk3399_mmc_set_clk (struct rk3399_cru *cru, +static ulong rk3399_mmc_set_clk (struct rockchip_cru *cru,ulong clk_id,ulong set_rate) {int src_clk_div;
@@ -792,7 +792,7 @@ static ulong rk3399_mmc_set_clk(struct rk3399_cru *cru,return rk3399_mmc_get_clk (cru, clk_id); } -static ulong rk3399_gmac_set_clk (struct rk3399_cru *cru,ulong rate) +static ulong rk3399_gmac_set_clk (struct rockchip_cru *cru,ulong rate) {ulong ret;
@@ -817,7 +817,7 @@ static ulong rk3399_gmac_set_clk(struct rk3399_cru *cru, ulong rate) }#define PMUSGRF_DDR_RGN_CON16 0xff330040 -static ulong rk3399_ddr_set_clk (struct rk3399_cru *cru, +static ulong rk3399_ddr_set_clk (struct rockchip_cru *cru,ulong set_rate) {struct pll_div dpll_cfg;
@@ -863,7 +863,7 @@ static ulong rk3399_ddr_set_clk(struct rk3399_cru *cru,return set_rate; } -static ulong rk3399_saradc_get_clk (struct rk3399_cru *cru) +static ulong rk3399_saradc_get_clk (struct rockchip_cru *cru) {u32 div, val;
@@ -874,7 +874,7 @@ static ulong rk3399_saradc_get_clk(struct rk3399_cru *cru)return DIV_TO_RATE (OSC_HZ , div); } -static ulong rk3399_saradc_set_clk (struct rk3399_cru *cru,uint hz) +static ulong rk3399_saradc_set_clk (struct rockchip_cru *cru,uint hz) {int src_clk_div;
@@ -1071,7 +1071,7 @@ static struct clk_ops rk3399_clk_ops = { };#ifdef CONFIG_SPL_BUILD -static void rkclk_init (struct rk3399_cru *cru) +static void rkclk_init (struct rockchip_cru *cru) {u32 aclk_div;u32 hclk_div;
@@ -1188,15 +1188,15 @@ static int rk3399_clk_bind(struct udevice *dev)debug ("Warning: No sysreset driver: ret=%d\n" , ret); }else { priv =malloc (sizeof (struct sysreset_reg )); - priv->glb_srst_fst_value = offsetof(struct rk3399_cru , + priv->glb_srst_fst_value = offsetof(struct rockchip_cru , glb_srst_fst_value); - priv->glb_srst_snd_value = offsetof(struct rk3399_cru , + priv->glb_srst_snd_value = offsetof(struct rockchip_cru , glb_srst_snd_value); sys_child->priv = priv; }#if CONFIG_IS_ENABLED (RESET_ROCKCHIP ) - ret = offsetof(struct rk3399_cru, softrst_con[0]); + ret = offsetof(struct rockchip_cru, softrst_con[0]); ret =rockchip_reset_bind (dev, ret,21 );if (ret)debug ("Warning: software reset driver bind faile\n" );
drivers/ram/rockchip/sdram_rk3288.c +5 -5
@@ -16,7 +16,7 @@#include <syscon.h> #include <asm/io.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3288.h> +#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/ddr_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h> #include <asm/arch-rockchip/pmu_rk3288.h>
@@ -36,7 +36,7 @@ struct dram_info {struct chan_info chan[2 ];struct ram_info info;struct clk ddr_clk; -struct rk3288_cru *cru; +struct rockchip_cru *cru;struct rk3288_grf *grf;struct rk3288_sgrf *sgrf;struct rk3288_pmu *pmu;
@@ -92,7 +92,7 @@ static void copy_to_reg(u32 *dest, const u32 *src, u32 n) } } -static void ddr_reset (struct rk3288_cru *cru,u32 ch,u32 ctl,u32 phy) +static void ddr_reset (struct rockchip_cru *cru,u32 ch,u32 ctl,u32 phy) {u32 phy_ctl_srstn_shift =4 +5 * ch;u32 ctl_psrstn_shift =3 +5 * ch;
@@ -109,7 +109,7 @@ static void ddr_reset(struct rk3288_cru *cru, u32 ch, u32 ctl, u32 phy) phy << phy_srstn_shift); } -static void ddr_phy_ctl_reset (struct rk3288_cru *cru,u32 ch,u32 n) +static void ddr_phy_ctl_reset (struct rockchip_cru *cru,u32 ch,u32 n) {u32 phy_ctl_srstn_shift =4 +5 * ch;
@@ -117,7 +117,7 @@ static void ddr_phy_ctl_reset(struct rk3288_cru *cru, u32 ch, u32 n) 1 << phy_ctl_srstn_shift, n << phy_ctl_srstn_shift); } -static void phy_pctrl_reset (struct rk3288_cru *cru, +static void phy_pctrl_reset (struct rockchip_cru *cru,struct rk3288_ddr_publ *publ,int channel) {
drivers/ram/rockchip/sdram_rk3399.c +5 -5
@@ -14,7 +14,7 @@#include <syscon.h> #include <asm/io.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/grf_rk3399.h> #include <asm/arch-rockchip/pmu_rk3399.h> #include <asm/arch-rockchip/hardware.h>
@@ -66,7 +66,7 @@ struct dram_info {u32 pwrup_srefresh_exit[2 ];struct chan_info chan[2 ];struct clk ddr_clk; -struct rk3399_cru *cru; +struct rockchip_cru *cru;struct rk3399_grf_regs *grf;struct rk3399_pmu_regs *pmu;struct rk3399_pmucru *pmucru;
@@ -228,7 +228,7 @@ static void *get_ddrc0_con(struct dram_info *dram, u8 channel)return (channel ==0 ) ? &dram->grf->ddrc0_con0 : &dram->grf->ddrc1_con0; } -static void rkclk_ddr_reset (struct rk3399_cru *cru,u32 channel,u32 ctl, +static void rkclk_ddr_reset (struct rockchip_cru *cru,u32 channel,u32 ctl,u32 phy) { channel &=0x1 ;
@@ -239,7 +239,7 @@ static void rkclk_ddr_reset(struct rk3399_cru *cru, u32 channel, u32 ctl, &cru->softrst_con[4]); } -static void phy_pctrl_reset (struct rk3399_cru *cru,u32 channel) +static void phy_pctrl_reset (struct rockchip_cru *cru,u32 channel) {rkclk_ddr_reset (cru, channel,1 ,1 );udelay (10 );
@@ -2945,7 +2945,7 @@ static int sdram_init(struct dram_info *dram,for (channel =0 ; channel <2 ; channel++) {const struct chan_info *chan = &dram->chan[channel]; -struct rk3399_cru *cru = dram->cru; +struct rockchip_cru *cru = dram->cru;struct rk3399_ddr_publ_regs *publ = chan->publ;phy_pctrl_reset (cru, channel);
drivers/video/rockchip/rk3288_mipi.c +1 -1
@@ -18,7 +18,7 @@#include <dm/uclass-internal.h> #include <linux/kernel.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3288.h> +#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/grf_rk3288.h> #include <asm/arch-rockchip/hardware.h> #include <asm/arch-rockchip/rockchip_mipi_dsi.h>
drivers/video/rockchip/rk3399_mipi.c +1 -1
@@ -18,7 +18,7 @@#include <dm/uclass-internal.h> #include <linux/kernel.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/grf_rk3399.h> #include <asm/arch-rockchip/hardware.h> #include <asm/arch-rockchip/rockchip_mipi_dsi.h>
drivers/video/rockchip/rk_mipi.c +1 -1
@@ -18,7 +18,7 @@#include <dm/uclass-internal.h> #include <linux/kernel.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/grf_rk3399.h> #include <asm/arch-rockchip/rockchip_mipi_dsi.h>
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v4 4/8 rockchip: Add common reset cause
In reply to Jagan TekiAdd cpu reset cause in common cpu-info file.
This would help to print the reset cause for various resets.
Right now it support rk3288, rk3399. rest of rockchip platforms doesn't have reset cause support ye but this code is more feasible to extend the same.
--- arch/arm/include/asm/arch-rockchip/cru.h | 12 +++++ .../include/asm/arch-rockchip/cru_rk3288.h | 14 +----- arch/arm/mach-rockchip/cpu-info.c | 49 +++++++++++++++++++ arch/arm/mach-rockchip/rk3288/rk3288.c | 39 --------------- 4 files changed, 62 insertions(+), 52 deletions(-)
arch/arm/include/asm/arch-rockchip/cru.h +12 -0
@@ -13,6 +13,18 @@# include <asm/arch-rockchip/cru_rk3399.h> #endif +/* CRU_GLB_RST_ST */ +enum { +GLB_POR_RST , +FST_GLB_RST_ST =BIT (0 ), +SND_GLB_RST_ST =BIT (1 ), +FST_GLB_TSADC_RST_ST =BIT (2 ), +SND_GLB_TSADC_RST_ST =BIT (3 ), +FST_GLB_WDT_RST_ST =BIT (4 ), +SND_GLB_WDT_RST_ST =BIT (5 ), +GLB_RST_ST_MASK =GENMASK (5 ,0 ), +}; +#define MHz 1000000#endif /* _ROCKCHIP_CLOCK_H */
arch/arm/include/asm/arch-rockchip/cru_rk3288.h +1 -13
@@ -51,7 +51,7 @@ struct rockchip_cru {u32 cru_glb_cnt_th;u32 cru_glb_rst_con;u32 reserved3; -u32 cru_glb_rst_st; +u32 glb_rst_st;u32 reserved4;u32 cru_sdmmc_con[2 ];u32 cru_sdio0_con[2 ];
@@ -227,16 +227,4 @@ enum { CLKF_MASK = 0x1fff << CLKF_SHIFT, }; -/* CRU_GLB_RST_ST */ -enum { -GLB_POR_RST , -FST_GLB_RST_ST =BIT (0 ), -SND_GLB_RST_ST =BIT (1 ), -FST_GLB_TSADC_RST_ST =BIT (2 ), -SND_GLB_TSADC_RST_ST =BIT (3 ), -FST_GLB_WDT_RST_ST =BIT (4 ), -SND_GLB_WDT_RST_ST =BIT (5 ), -GLB_RST_ST_MASK =GENMASK (5 ,0 ), -}; -#endif
arch/arm/mach-rockchip/cpu-info.c +49 -0
59 lines not on this page · raw message
arch/arm/mach-rockchip/rk3288/rk3288.c +0 -39
@@ -102,43 +102,6 @@ void board_debug_uart_init(void) }#endif -static void rk3288_detect_reset_reason (void ) -{ -struct rockchip_cru *cru =rockchip_get_cru (); -const char *reason; - -if (IS_ERR (cru)) -return ; - -switch (cru->cru_glb_rst_st) { -case GLB_POR_RST : - reason ="POR" ; -break ; -case FST_GLB_RST_ST : -case SND_GLB_RST_ST : - reason ="RST" ; -break ; -case FST_GLB_TSADC_RST_ST : -case SND_GLB_TSADC_RST_ST : - reason ="THERMAL" ; -break ; -case FST_GLB_WDT_RST_ST : -case SND_GLB_WDT_RST_ST : - reason ="WDOG" ; -break ; -default : - reason ="unknown reset" ; - } - -env_set ("reset_reason" , reason); - -/* -* Clear cru_glb_rst_st, so we can determine the last reset cause -* for following resets. -*/ -rk_clrreg (&cru->cru_glb_rst_st,GLB_RST_ST_MASK ); -} -__weak int rk3288_board_late_init (void ) {return 0 ;
@@ -146,8 +109,6 @@ __weak int rk3288_board_late_init(void)int rk_board_late_init (void ) { -rk3288_detect_reset_reason (); -return rk3288_board_late_init (); }
Signature · 1 line
2.18.0.321.gffc6fa0e3
A message that is not in the archive (sent off-list or not yet received): 20200109085222.22670-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org
PATCH v4 5/8 rockchip: rk3399: Add bootcount support
Add bootcount support for Rockchip rk3399.
The bootcount value is preserved in PMU_SYS_REG0 register, this would help to support redundent boot.
Once the redundant boot triggers, the altboot command will look for extlinux-rollback.conf on particular bootable partition which supposed to be a recovery partition where redundant boot required.
--- arch/arm/mach-rockchip/Kconfig | 2 ++ arch/arm/mach-rockchip/rk3399/Kconfig | 10 ++++++++++ include/configs/rk3399_common.h | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/Kconfig +2 -0
@@ -244,6 +244,8 @@ config ROCKCHIP_RK3399 imply TPL_CLK imply TPL_TINY_MEMSET imply TPL_ROCKCHIP_COMMON_BOARD + imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT + imply CMD_BOOTCOUNT if BOOTCOUNT_LIMIT help The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72 and quad-core Cortex-A53.
arch/arm/mach-rockchip/rk3399/Kconfig +10 -0
@@ -113,6 +113,16 @@ config TPL_TEXT_BASE config SPL_STACK_R_ADDR default 0x04000000 +if BOOTCOUNT_LIMIT + +config BOOTCOUNT_BOOTLIMIT + default 3 + +config SYS_BOOTCOUNT_ADDR + default 0xff3100f0 # PMU_SYS_REG0 + +endif # BOOTCOUNT_LIMIT + source "board/rockchip/evb_rk3399/Kconfig" source "board/theobroma-systems/puma_rk3399/Kconfig" source "board/vamrs/rock960_rk3399/Kconfig"
include/configs/rk3399_common.h +4 -1
@@ -63,7 +63,10 @@"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \"partitions=" PARTS_DEFAULT \ROCKCHIP_DEVICE_SETTINGS \ - BOOTENV +BOOTENV \ +"altbootcmd=" \ +"setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \ + "run distro_bootcmd\0"#endif
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v4 6/8 watchdog: kconfig: Enable designware for rk3399
In reply to a message not in the archiveEnable designware watchdog driver for rk3399 if WDT defined.
---
Changes for v4:
- This change on top of below series
https://patchwork.ozlabs.org/project/uboot/list/?series=151431
drivers/watchdog/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/watchdog/Kconfig +1 -0
@@ -48,6 +48,7 @@ config ULP_WATCHDOG config DESIGNWARE_WATCHDOG bool "Designware watchdog timer support" select HW_WATCHDOG if !WDT + default y if WDT && ROCKCHIP_RK3399 help Enable this to support Designware Watchdog Timer IP, present e.g. on Altera SoCFPGA SoCs.
Signature · 1 line
2.18.0.321.gffc6fa0e3
A message that is not in the archive (sent off-list or not yet received): 20200109085222.22670-7-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org
Kever Yang
Reviewed-byRe: [PATCH v4 6/8] watchdog: kconfig: Enable designware for rk3399
Quoted 4 lines · Jagan Teki
Enable designware watchdog driver for rk3399 if WDT defined.
Cc Marek Vasut <[email protected]>Signed-off-by Jagan Teki <[email protected]>
Thanks,
- Kever
Quoted 13 lines
---
Changes for v4:
- This change on top of below series
https://patchwork.ozlabs.org/project/uboot/list/?series=151431drivers/watchdog/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/watchdog/Kconfig +0
-0
drivers/watchdog/Kconfig config ULP_WATCHDOG · line 54
Quoted 7 lines
drivers/watchdog/Kconfig +1
-0@@ -48,6 +48,7 @@ config ULP_WATCHDOG config DESIGNWARE_WATCHDOG bool "Designware watchdog timer support" select HW_WATCHDOG if !WDT + default y if WDT && ROCKCHIP_RK3399 help Enable this to support Designware Watchdog Timer IP, present e.g. on Altera SoCFPGA SoCs.
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v4 7/8 roc-rk3399-pc: Enable watchdog
In reply to a message not in the archiveEnable watchdog suport for ROC-RK3399-PC board.
--- configs/roc-pc-rk3399_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/roc-pc-rk3399_defconfig +1 -0
@@ -54,3 +54,4 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_WDT=y
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v4 8/8 roc-rk3399-pc: Enable bootcount
In reply to Jagan TekiEnable bootcount suport for ROC-RK3399-PC board.
--- configs/roc-pc-rk3399_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/roc-pc-rk3399_defconfig +1 -0
@@ -55,3 +55,4 @@ CONFIG_USB_ETHER_SMSC95XX=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y CONFIG_WDT=y +CONFIG_BOOTCOUNT_LIMIT=y
Signature · 1 line
2.18.0.321.gffc6fa0e3