Skip to contentSkip to conversation

board: gateworks: venice: display hwmon details by default

PATCH Superseded Tim Harvey 2 participants 9 messages Aug 18, 2021

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Tim Harvey

author
#0 lore raw

PATCH 1/5 board: gateworks: venice: display hwmon details by default

Display hwmon values by default when using the 'gsc' command.

---
 board/gateworks/venice/gsc.c | 3 +++
 1 file changed, 3 insertions(+)
board/gateworks/venice/gsc.c +3 -0
index 7d6acd7b4a..065d1fb8cc 100644
@@ -527,6 +527,9 @@ static int gsc_info(int verbose)
 		printf("%d\n", buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24);
 	}
 
+	/* Display hwmon */
+	gsc_hwmon();
+
 	return 0;
 }
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/5 board: gateworks: venice: do not overwrite serial#

Do not overwrite existing serial# env to avoid:

---
 board/gateworks/venice/imx8mm_venice.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
board/gateworks/venice/imx8mm_venice.c +2 -1
index 2a97d55d32..46f4bff925 100644
@@ -114,7 +114,8 @@ int board_late_init(void)
 	led_default_state();
 
 	/* Set board serial/model */
-	env_set_ulong("serial#", gsc_get_serial());
+	if (!env_get("serial#"))
+		env_set_ulong("serial#", gsc_get_serial());
 	env_set("model", gsc_get_model());
 
 	/* Set fdt_file vars */
Signature · 1 line
2.17.1
reviewer
#2 lore raw

Re: [PATCH 2/5] board: gateworks: venice: do not overwrite serial#

Hi Tim,

Quoted 2 lines · Tim Harvey

Do not overwrite existing serial# env to avoid:

Missed a sentence here?

author
#3 lore raw

Re: [PATCH 2/5] board: gateworks: venice: do not overwrite serial#

Quoted 8 lines · Fabio Estevam

Hi Tim,

Quoted 2 lines · Tim Harvey

Do not overwrite existing serial# env to avoid:

Missed a sentence here?

Ooops... the error starts with '#' so was not put in the commit. Should I send just that one patch as a v2 and leave the rest alone?

Thanks,

Tim

reviewer
#4 lore raw

Re: [PATCH 2/5] board: gateworks: venice: do not overwrite serial#

Hi Tim,

Quoted 2 lines · Tim Harvey

Ooops... the error starts with '#' so was not put in the commit. Should I send just that one patch as a v2 and leave the rest alone?

It is preferred if you could just re-send the whole series as v2.

It makes Stefano's life easier :-)

The other patches look good to me.

author
#5 lore raw

Re: [PATCH 2/5] board: gateworks: venice: do not overwrite serial#

Quoted 5 lines · Fabio Estevam

Hi Tim,

On Wed, Aug 18, 2021 at 7:03 PM Tim Harvey <[email protected]> wrote:

Quoted 8 lines
Quoted 2 lines

Ooops... the error starts with '#' so was not put in the commit. Should I send just that one patch as a v2 and leave the rest alone?

It is preferred if you could just re-send the whole series as v2.

It makes Stefano's life easier :-)

The other patches look good to me.

Fabio,

Thanks - re-submitted v2.

Tim

author
#6 lore raw

PATCH 3/5 arm: dts: imx8mm-venice-gw700x: fix mp5416 pmic config

In reply to Tim Harvey

Fix various MP5416 PMIC configurations:
- Update regulator names per dt-bindings
- ensure values fit among valid register values
- add required regulator-max-microamp property
- add regulator-always-on prop

---
 arch/arm/dts/imx8mm-venice-gw700x.dtsi | 56 +++++++++++++++++---------
 1 file changed, 37 insertions(+), 19 deletions(-)
arch/arm/dts/imx8mm-venice-gw700x.dtsi +37 -19
index cc850e7dce..f182a816b5 100644
@@ -282,65 +282,83 @@
 		reg = <0x69>;
 
 		regulators {
+			/* vdd_0p95: DRAM/GPU/VPU */
 			buck1 {
-				regulator-name = "vdd_0p95";
-				regulator-min-microvolt = <805000>;
+				regulator-name = "buck1";
+				regulator-min-microvolt = <800000>;
 				regulator-max-microvolt = <1000000>;
-				regulator-max-microamp = <2500000>;
+				regulator-min-microamp  = <3800000>;
+				regulator-max-microamp  = <6800000>;
 				regulator-boot-on;
+				regulator-always-on;
 			};
 
+			/* vdd_soc */
 			buck2 {
-				regulator-name = "vdd_soc";
-				regulator-min-microvolt = <805000>;
+				regulator-name = "buck2";
+				regulator-min-microvolt = <800000>;
 				regulator-max-microvolt = <900000>;
-				regulator-max-microamp = <1000000>;
+				regulator-min-microamp  = <2200000>;
+				regulator-max-microamp  = <5200000>;
 				regulator-boot-on;
+				regulator-always-on;
 			};
 
+			/* vdd_arm */
 			buck3_reg: buck3 {
-				regulator-name = "vdd_arm";
-				regulator-min-microvolt = <805000>;
+				regulator-name = "buck3";
+				regulator-min-microvolt = <800000>;
 				regulator-max-microvolt = <1000000>;
-				regulator-max-microamp = <2200000>;
-				regulator-boot-on;
+				regulator-min-microamp  = <3800000>;
+				regulator-max-microamp  = <6800000>;
+				regulator-always-on;
 			};
 
+			/* vdd_1p8 */
 			buck4 {
-				regulator-name = "vdd_1p8";
+				regulator-name = "buck4";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-max-microamp = <500000>;
+				regulator-min-microamp  = <2200000>;
+				regulator-max-microamp  = <5200000>;
 				regulator-boot-on;
+				regulator-always-on;
 			};
 
+			/* nvcc_snvs_1p8 */
 			ldo1 {
-				regulator-name = "nvcc_snvs_1p8";
+				regulator-name = "ldo1";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-max-microamp = <300000>;
 				regulator-boot-on;
+				regulator-always-on;
 			};
 
+			/* vdd_snvs_0p8 */
 			ldo2 {
-				regulator-name = "vdd_snvs_0p8";
+				regulator-name = "ldo2";
 				regulator-min-microvolt = <800000>;
 				regulator-max-microvolt = <800000>;
 				regulator-boot-on;
+				regulator-always-on;
 			};
 
+			/* vdd_0p9 */
 			ldo3 {
-				regulator-name = "vdd_0p95";
-				regulator-min-microvolt = <800000>;
-				regulator-max-microvolt = <800000>;
+				regulator-name = "ldo3";
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <900000>;
 				regulator-boot-on;
+				regulator-always-on;
 			};
 
+			/* vdd_1p8 */
 			ldo4 {
-				regulator-name = "vdd_1p8";
+				regulator-name = "ldo4";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-boot-on;
+				regulator-always-on;
 			};
 		};
 	};
Signature · 1 line
2.17.1
author
#7 lore raw

PATCH 4/5 board: gateworks: venice: update thermal temp thresholds per cpu grade

In reply to Tim Harvey

Update the passive/critical thermal zone dt config per CPU temperature grade.

---
 board/gateworks/venice/imx8mm_venice.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
board/gateworks/venice/imx8mm_venice.c +18 -0
index 46f4bff925..4e05802b6f 100644
@@ -156,8 +156,26 @@ int board_mmc_get_env_dev(int devno)
 
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
+	int off;
+
 	/* set board model dt prop */
 	fdt_setprop_string(blob, 0, "board", gsc_get_model());
 
+	/* update temp thresholds */
+	off = fdt_path_offset(blob, "/thermal-zones/cpu-thermal/trips");
+	if (off >= 0) {
+		int minc, maxc, prop;
+
+		get_cpu_temp_grade(&minc, &maxc);
+		fdt_for_each_subnode(prop, blob, off) {
+			const char *type = fdt_getprop(blob, prop, "type", NULL);
+
+			if (type && (!strcmp("critical", type)))
+				fdt_setprop_u32(blob, prop, "temperature", maxc * 1000);
+			else if (type && (!strcmp("passive", type)))
+				fdt_setprop_u32(blob, prop, "temperature", (maxc - 10) * 1000);
+		}
+	}
+
 	return 0;
 }
Signature · 1 line
2.17.1
author
#8 lore raw

PATCH 5/5 arm: dts: imx8mm-venice*: remove thermal zone overrides

In reply to Tim Harvey

Remove the unnecessary thermal zone overrides.

---
 arch/arm/dts/imx8mm-venice-gw7901.dts | 12 ------------
 arch/arm/dts/imx8mm-venice-gw7902.dts | 12 ------------
 2 files changed, 24 deletions(-)
arch/arm/dts/imx8mm-venice-gw7901.dts +0 -12
index 124e1e4e70..d5cdbb7f99 100644
@@ -1041,15 +1041,3 @@
 		>;
 	};
 };
-
-&cpu_alert0 {
-	temperature = <95000>;
-	hysteresis = <2000>;
-	type = "passive";
-};
-
-&cpu_crit0 {
-	temperature = <105000>;
-	hysteresis = <2000>;
-	type = "critical";
-};
arch/arm/dts/imx8mm-venice-gw7902.dts +0 -12
index 2948821644..07e436be95 100644
@@ -913,15 +913,3 @@
 		>;
 	};
 };
-
-&cpu_alert0 {
-	temperature = <95000>;
-	hysteresis = <2000>;
-	type = "passive";
-};
-
-&cpu_crit0 {
-	temperature = <105000>;
-	hysteresis = <2000>;
-	type = "critical";
-};
Signature · 1 line
2.17.1