2021-07-15 03:14:49

by Dennis Gilmore

[permalink] [raw]
Subject: arm64: dts: rockchip: helios64: SPI, tsadc, and stdout-path

Dropped the USB patch from V1, this set enables the SPI flash and sets
aliases, enables tsadc, and set stdout-path

Dennis



2021-07-15 03:14:49

by Dennis Gilmore

[permalink] [raw]
Subject: [PATCH v2 3/3] arm64: dts: rockchip: helios64: enable tsadc on helios64

Enable the tsadc thermal controller on the helios64

Signed-off-by: Dennis Gilmore <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
index 09c5a6fa11ff..b44e54571c31 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -502,6 +502,14 @@ &tcphy1 {
status = "okay";
};

+&tsadc {
+ /* tshut mode 0:CRU 1:GPIO */
+ rockchip,hw-tshut-mode = <1>;
+ /* tshut polarity 0:LOW 1:HIGH */
+ rockchip,hw-tshut-polarity = <1>;
+ status = "okay";
+};
+
&u2phy1 {
status = "okay";

--
2.31.1

2021-07-15 03:14:49

by Dennis Gilmore

[permalink] [raw]
Subject: [PATCH v2 1/3] arm64: dts: rockchip: helios64: set stdout-path

set the default output path to uart2

Signed-off-by: Dennis Gilmore <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
index aeedf098f67c..bdcf6472664c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -43,6 +43,10 @@ avdd_1v8_s0: avdd-1v8-s0 {
vin-supply = <&vcc3v3_sys_s3>;
};

+ chosen {
+ stdout-path = "serial2:1500000n8";
+ };
+
clkin_gmac: external-gmac-clock {
compatible = "fixed-clock";
clock-frequency = <125000000>;
--
2.31.1

2021-07-15 03:40:17

by Dennis Gilmore

[permalink] [raw]
Subject: [PATCH v2 2/3] arm64: dts: rockchip: helios64: add SPI support

add SPI support for the helios64, u-boot can live in spi1, spi2 is user
accessible, spi5 is for the sata controller rom.
https://wiki.kobol.io/helios64/spi/

Signed-off-by: Dennis Gilmore <[email protected]>
---
.../dts/rockchip/rk3399-kobol-helios64.dts | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
index bdcf6472664c..09c5a6fa11ff 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -21,6 +21,9 @@ / {
aliases {
mmc0 = &sdmmc;
mmc1 = &sdhci;
+ spi1 = &spi1;
+ spi2 = &spi2;
+ spi5 = &spi5;
};

avdd_0v9_s0: avdd-0v9-s0 {
@@ -473,6 +476,27 @@ &sdmmc {
status = "okay";
};

+&spi1 {
+ status = "okay";
+
+ spiflash: flash@0 {
+ compatible = "jedec,spi-nor";
+ reg = <0x0>;
+ spi-max-frequency = <25000000>;
+ status = "okay";
+ m25p,fast-read;
+ };
+};
+
+/* UEXT connector */
+&spi2 {
+ status = "okay";
+};
+
+&spi5 {
+ status = "okay";
+};
+
&tcphy1 {
/* phy for &usbdrd_dwc3_1 */
status = "okay";
--
2.31.1

2021-07-15 22:44:54

by Heiko Stübner

[permalink] [raw]
Subject: Re: [PATCH v2 1/3] arm64: dts: rockchip: helios64: set stdout-path

On Wed, 14 Jul 2021 21:56:29 -0500, Dennis Gilmore wrote:
> set the default output path to uart2

Applied, thanks!

[1/3] arm64: dts: rockchip: helios64: set stdout-path
commit: a1536b7fd2d75a6836094cfce513807f0b6f8b2c
[2/3] arm64: dts: rockchip: helios64: add SPI support
commit: 0ead44ed102d6391c9535395a99164fe44038b21
[3/3] arm64: dts: rockchip: helios64: enable tsadc on helios64
commit: ae2a8a1ed3283ebb5abe21be04773cebada16b9c

Best regards,
--
Heiko Stuebner <[email protected]>