Merge tag 'xilinx-for-v2025.04-rc1-v2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
AMD/Xilinx changes for v2025.04-rc1 v2
Versal:
- Enable dfu support for SPI with multiboot
ZynqMP:
- Align multiboot reg description
- DT syncups
- Wire missing DTs in defconfig
- Kria: Remove usb hub initialization via commands
- Kria: Update DP reset in psu_init
AMD/Xilinx:
- Enable SPI_STACKED_PARALLEL configs
SPI/ZYNQMP_GQSPI:
- Update debug message to use log_debug()
RTC:
- Enable ZYNQMP_RTC for Versal SOCs
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
index c3490db2..57d4705 100644
--- a/drivers/power/pmic/tps65941.c
+++ b/drivers/power/pmic/tps65941.c
@@ -74,7 +74,7 @@
{ .compatible = "ti,tps659412", .data = TPS659411 },
{ .compatible = "ti,tps659413", .data = TPS659413 },
{ .compatible = "ti,lp876441", .data = LP876441 },
- { .compatible = "ti,tps65224", .data = TPS65224 },
+ { .compatible = "ti,tps65224-q1", .data = TPS65224 },
{ .compatible = "ti,tps6594-q1", .data = TPS659411 },
{ .compatible = "ti,tps6593-q1", .data = TPS659413 },
{ .compatible = "ti,lp8764-q1", .data = LP876441 },
diff --git a/drivers/power/regulator/tps65219_regulator.c b/drivers/power/regulator/tps65219_regulator.c
index b7124fe..88abc89 100644
--- a/drivers/power/regulator/tps65219_regulator.c
+++ b/drivers/power/regulator/tps65219_regulator.c
@@ -72,12 +72,12 @@
static int tps65219_buck_volt2val(int uV)
{
- if (uV > TPS65219_BUCK_VOLT_MAX)
+ if (uV > TPS65219_BUCK_3V4)
return -EINVAL;
- else if (uV >= 1400000)
- return (uV - 1400000) / 100000 + 0x20;
- else if (uV >= 600000)
- return (uV - 600000) / 25000 + 0x00;
+ else if (uV >= TPS65219_BUCK_1V4)
+ return (uV - TPS65219_BUCK_1V4) / TPS65219_VOLT_STEP_100MV + TPS65219_BUCK_REG_1V4;
+ else if (uV >= TPS65219_BUCK_0V6)
+ return (uV - TPS65219_BUCK_0V6) / TPS65219_VOLT_STEP_25MV + TPS65219_BUCK_REG_0V6;
else
return -EINVAL;
}
@@ -86,12 +86,12 @@
{
if (val > TPS65219_VOLT_MASK)
return -EINVAL;
- else if (val > 0x34)
- return TPS65219_BUCK_VOLT_MAX;
- else if (val > 0x20)
- return 1400000 + (val - 0x20) * 100000;
- else if (val >= 0)
- return 600000 + val * 25000;
+ else if (val > TPS65219_BUCK_REG_3V4)
+ return TPS65219_BUCK_3V4;
+ else if (val > TPS65219_BUCK_REG_1V4)
+ return TPS65219_BUCK_1V4 + (val - TPS65219_BUCK_REG_1V4) * TPS65219_VOLT_STEP_100MV;
+ else if (val >= TPS65219_BUCK_REG_0V6)
+ return TPS65219_BUCK_0V6 + val * TPS65219_VOLT_STEP_25MV;
else
return -EINVAL;
}
@@ -161,7 +161,7 @@
if (uV > max)
return -EINVAL;
else if (uV >= base)
- return (uV - TPS65219_LDO12_VOLT_MIN) / 50000;
+ return (uV - TPS65219_LDO12_VOLT_MIN) / TPS65219_VOLT_STEP_50MV;
else
return -EINVAL;
}
@@ -187,7 +187,7 @@
else if (val <= reg_base)
return base;
else if (val >= 0)
- return TPS65219_LDO12_VOLT_MIN + (50000 * val);
+ return TPS65219_LDO12_VOLT_MIN + (TPS65219_VOLT_STEP_50MV * val);
else
return -EINVAL;
}
@@ -250,7 +250,7 @@
/* idx must be in 1..TPS65219_LDO_NUM */
idx = dev->driver_data;
if (idx < 1 || idx > TPS65219_LDO_NUM) {
- printf("Wrong ID for regulator\n");
+ pr_err("Wrong ID for regulator\n");
return -EINVAL;
}
@@ -271,7 +271,7 @@
/* idx must be in 1..TPS65219_BUCK_NUM */
idx = dev->driver_data;
if (idx < 1 || idx > TPS65219_BUCK_NUM) {
- printf("Wrong ID for regulator\n");
+ pr_err("Wrong ID for regulator\n");
return -EINVAL;
}
diff --git a/include/power/tps65219.h b/include/power/tps65219.h
index aa81b92..e8780af 100644
--- a/include/power/tps65219.h
+++ b/include/power/tps65219.h
@@ -17,10 +17,20 @@
#define TPS65219_BUCK_DRIVER "tps65219_buck"
#define TPS65219_VOLT_MASK 0x3F
-#define TPS65219_BUCK_VOLT_MAX 3400000
-
#define TPS65219_ENABLE_CTRL_REG 0x2
+#define TPS65219_VOLT_STEP_25MV 25000
+#define TPS65219_VOLT_STEP_50MV 50000
+#define TPS65219_VOLT_STEP_100MV 100000
+
+#define TPS65219_BUCK_0V6 600000
+#define TPS65219_BUCK_1V4 1400000
+#define TPS65219_BUCK_3V4 3400000
+
+#define TPS65219_BUCK_REG_0V6 0x00
+#define TPS65219_BUCK_REG_1V4 0x20
+#define TPS65219_BUCK_REG_3V4 0x34
+
#define TPS65219_BUCK1_VOUT_REG 0xa
#define TPS65219_BUCK2_VOUT_REG 0x9
#define TPS65219_BUCK3_VOUT_REG 0x8