Helios64 - Temporary Fix for Linux Kernel (current, 5.8) crash due to LPDDR4 configuration issue (#2200)

* Helios64: rework vdd_log and vdd_center

* helios64: Use rockchip binaries for legacy and current branch

Fully open source bootloader only on dev branch

Signed-off-by: Aditya Prayoga <aditya@kobol.io>

* rework vdd_log and vdd_center patches
This commit is contained in:
Aditya Prayoga 2020-09-15 23:41:58 +07:00 committed by GitHub
parent 6f6543c6f5
commit ec768b6e89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 36 deletions

View file

@ -22,7 +22,7 @@ if [[ $BOARD == roc-rk3399-pc ]]; then
elif [[ $BOARD == helios64 ]]; then
if [[ $BRANCH == legacy ]]; then
if [[ $BRANCH == legacy || $BRANCH == current ]]; then
BOOT_USE_BLOBS=yes
DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.24.bin'
MINILOADER_BLOB='rk33/rk3399_miniloader_v1.19.bin'

View file

@ -1,13 +1,13 @@
From 20d538b02c0d5bb9faf4470a9c57ce4551b95564 Mon Sep 17 00:00:00 2001
From 6446809b001f0b53fb33b68d307d08acc82eca8f Mon Sep 17 00:00:00 2001
From: Aditya Prayoga <aditya@kobol.io>
Date: Fri, 11 Sep 2020 20:57:53 +0700
Date: Tue, 15 Sep 2020 20:46:04 +0700
Subject: [PATCH] Add Helios64 board device tree
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3399-helios64.dts | 1257 +++++++++++++++++
2 files changed, 1258 insertions(+)
.../boot/dts/rockchip/rk3399-helios64.dts | 1263 +++++++++++++++++
2 files changed, 1264 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-helios64.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
@ -24,10 +24,10 @@ index dbebbf9fe..2b1e29649 100644
dtb-$(CONFIG_ARCH_ROCKCHIP) += \
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-helios64.dts
new file mode 100644
index 000000000..51462db75
index 000000000..ef95aa489
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-helios64.dts
@@ -0,0 +1,1257 @@
@@ -0,0 +1,1263 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2020 Aditya Prayoga (aditya@kobol.io)
@ -263,13 +263,18 @@ index 000000000..51462db75
+ regulator-name = "vdd_log";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <800000>;
+ regulator-min-microvolt = <830000>;
+ regulator-max-microvolt = <1400000>;
+ vin-supply = <&vcc5v0_sys>;
+
+ /* for rockchip boot on */
+ rockchip,pwm_id = <2>;
+ rockchip,pwm_voltage = <1000000>;
+ rockchip,pwm_voltage = <900000>;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <900000>;
+ };
+ };
+
+ power_hdd_a: power-hdd-a {
@ -611,11 +616,12 @@ index 000000000..51462db75
+ regulator-name = "vdd_center";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <750000>;
+ regulator-max-microvolt = <1350000>;
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-ramp-delay = <6001>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <950000>;
+ };
+ };
+

View file

@ -1,13 +1,13 @@
From ce21ecd70dc2432e2f8aaf063e9c123980f5844c Mon Sep 17 00:00:00 2001
From 8f81af6941883fdc1d238d85bf282c2a61ffa349 Mon Sep 17 00:00:00 2001
From: Aditya Prayoga <aditya@kobol.io>
Date: Mon, 14 Sep 2020 08:36:32 +0700
Date: Tue, 15 Sep 2020 20:04:22 +0700
Subject: [PATCH] Add board Helios64
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3399-helios64.dts | 1079 +++++++++++++++++
2 files changed, 1080 insertions(+)
.../boot/dts/rockchip/rk3399-helios64.dts | 1084 +++++++++++++++++
2 files changed, 1085 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-helios64.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
@ -24,10 +24,10 @@ index 473e14e12..b8e6e86e0 100644
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-helios64.dts
new file mode 100644
index 000000000..5f47b2556
index 000000000..fae17f416
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-helios64.dts
@@ -0,0 +1,1079 @@
@@ -0,0 +1,1084 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 Aditya Prayoga (aditya@kobol.io)
@ -230,9 +230,13 @@ index 000000000..5f47b2556
+ regulator-name = "vdd_log";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <800000>;
+ regulator-min-microvolt = <830000>;
+ regulator-max-microvolt = <1400000>;
+ vin-supply = <&vcc5v0_sys>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <900000>;
+ };
+ };
+
+ power_hdd_a: power-hdd-a {
@ -514,11 +518,12 @@ index 000000000..5f47b2556
+ regulator-name = "vdd_center";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <750000>;
+ regulator-max-microvolt = <1350000>;
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-ramp-delay = <6001>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <950000>;
+ };
+ };
+

View file

@ -1,13 +1,13 @@
From 89fcfe49a259d7f8a21bd88c8a7ebab651bb4417 Mon Sep 17 00:00:00 2001
From 0ad85609017068d93c0311c34438db4e43588090 Mon Sep 17 00:00:00 2001
From: Aditya Prayoga <aditya@kobol.io>
Date: Mon, 14 Sep 2020 08:31:22 +0700
Date: Tue, 15 Sep 2020 18:41:54 +0700
Subject: [PATCH] Patching something
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3399-helios64-u-boot.dtsi | 134 +++
arch/arm/dts/rk3399-helios64.dts | 1147 ++++++++++++++++++++++
arch/arm/dts/rk3399-helios64-u-boot.dtsi | 140 +++
arch/arm/dts/rk3399-helios64.dts | 1152 ++++++++++++++++++++++
arch/arm/mach-rockchip/rk3399/Kconfig | 17 +
board/kobol/helios64/Kconfig | 24 +
board/kobol/helios64/MAINTAINERS | 6 +
@ -17,7 +17,7 @@ Signed-off-by: Aditya Prayoga <aditya@kobol.io>
board/kobol/helios64/sys_otp.h | 10 +
configs/helios64-rk3399_defconfig | 149 +++
include/configs/helios64.h | 47 +
12 files changed, 2050 insertions(+)
12 files changed, 2061 insertions(+)
create mode 100644 arch/arm/dts/rk3399-helios64-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3399-helios64.dts
create mode 100644 board/kobol/helios64/Kconfig
@ -43,10 +43,10 @@ index 530d60bf..d9fd6cf1 100644
rk3399-khadas-edge-v.dtb \
diff --git a/arch/arm/dts/rk3399-helios64-u-boot.dtsi b/arch/arm/dts/rk3399-helios64-u-boot.dtsi
new file mode 100644
index 00000000..db362d44
index 00000000..2988a209
--- /dev/null
+++ b/arch/arm/dts/rk3399-helios64-u-boot.dtsi
@@ -0,0 +1,134 @@
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2020 Aditya Prayoga (aditya@kobol.io)
@ -178,15 +178,21 @@ index 00000000..db362d44
+ };
+};
+
+&vdd_log {
+&vdd_center {
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <950000>;
+ regulator-init-microvolt = <950000>;
+};
+
+&vdd_log {
+ regulator-init-microvolt = <900000>;
+};
diff --git a/arch/arm/dts/rk3399-helios64.dts b/arch/arm/dts/rk3399-helios64.dts
new file mode 100644
index 00000000..c4fedbf0
index 00000000..9d067505
--- /dev/null
+++ b/arch/arm/dts/rk3399-helios64.dts
@@ -0,0 +1,1147 @@
@@ -0,0 +1,1152 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 Aditya Prayoga (aditya@kobol.io)
@ -395,9 +401,13 @@ index 00000000..c4fedbf0
+ regulator-name = "vdd_log";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <800000>;
+ regulator-min-microvolt = <830000>;
+ regulator-max-microvolt = <1400000>;
+ vin-supply = <&vcc5v0_sys>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <900000>;
+ };
+ };
+
+ power_hdd_a: power-hdd-a {
@ -690,11 +700,12 @@ index 00000000..c4fedbf0
+ regulator-name = "vdd_center";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <750000>;
+ regulator-max-microvolt = <1350000>;
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-ramp-delay = <6001>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <950000>;
+ };
+ };
+