Browse Source

Merge branch 'CR_6516_CPU_vol_fix_mason.huo' into 'jh7110-master'

CR#6516 board: starfive: Add the default cpu max voltage

See merge request sdk/u-boot!78
andy.hu 2 months ago
parent
commit
c25f1ddd87

+ 2 - 1
board/starfive/devkits/starfive_devkits.c

@@ -219,7 +219,6 @@ static void get_cpu_voltage_type(struct udevice *dev)
 			env_set("cpu_max_vol", "1020000");
 			break;
 		default:
-			env_set("cpu_max_vol", "1040000");
 			break;
 		}
 	}
@@ -361,6 +360,8 @@ err:
 	eth_env_set_enetaddr("eth0addr", mac0);
 	eth_env_set_enetaddr("eth1addr", mac1);
 
+	/* Set the default cpu max voltage. */
+	env_set("cpu_max_vol", "1040000");
 #if CONFIG_IS_ENABLED(STARFIVE_OTP)
 	get_cpu_voltage_type(dev);
 #endif

+ 3 - 1
board/starfive/evb/starfive_evb.c

@@ -229,7 +229,6 @@ static void get_cpu_voltage_type(struct udevice *dev)
 			env_set("cpu_max_vol", "1020000");
 			break;
 		default:
-			env_set("cpu_max_vol", "1040000");
 			break;
 		}
 	}
@@ -281,6 +280,9 @@ err:
 	eth_env_set_enetaddr("eth1addr", mac1);
 
 	chip = get_chip_type();
+
+       /* Set the default cpu max voltage. */
+       env_set("cpu_max_vol", "1040000");
 #if CONFIG_IS_ENABLED(STARFIVE_OTP)
 	get_cpu_voltage_type(dev);
 #endif

+ 3 - 1
board/starfive/visionfive2/starfive_visionfive2.c

@@ -322,7 +322,6 @@ static void get_cpu_voltage_type(struct udevice *dev)
 			env_set("cpu_max_vol", "1020000");
 			break;
 		default:
-			env_set("cpu_max_vol", "1040000");
 			break;
 		}
 	}
@@ -484,6 +483,9 @@ err:
 
 	get_chip_type();
 	set_uboot_fdt_addr_env();
+
+	/* Set the default cpu max voltage. */
+	env_set("cpu_max_vol", "1040000");
 #if CONFIG_IS_ENABLED(STARFIVE_OTP)
 	get_cpu_voltage_type(dev);
 #endif