On 2019/11/28 下午2:14, Vasily Khoruzhick wrote:
Rockpro64 doesn't boot reliably after soft reset, so let's force power on reset by asserting sysreset pin if we detected soft reset.
Signed-off-by: Vasily Khoruzhick anarsoul@gmail.com
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 8 ++++++++ configs/rockpro64-rk3399_defconfig | 1 + 2 files changed, 9 insertions(+)
diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi index 4648513ea9..bb94bcf7be 100644 --- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi @@ -6,11 +6,19 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr4-100.dtsi" / {
- config {
sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>;- };
- chosen { u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci; }; };
+&gpio1 {
- u-boot,dm-pre-reloc;
+};
- &vdd_center { regulator-min-microvolt = <950000>; regulator-max-microvolt = <950000>;
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index 49e27c91cb..d153ac5485 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_SPL_GPIO_SUPPORT=y CONFIG_ROCKCHIP_RK3399=y CONFIG_ENV_OFFSET=0x3F8000 CONFIG_TARGET_ROCKPRO64_RK3399=y