Merge branch 'cherry-eda65fa42b9' into 'master'

[pickman] Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-pmic

See merge request u-boot/u-boot!273

.pickman-history

@@ -1227,3 +1227,57 @@ Rebased onto latest ci/master. Build verified OK.
 
 ---
 
+## 2025-12-20: us/next
+
+Branch: cherry-eda65fa42b9
+
+Commits:
+- eda65fa42b9 power: regulator: replace printf() with pr_err()
+- 7e261a05a50 power: replace magic numbers with macros
+- b9fe3ec8a23 power: pmic: tps65941: Fix TI TPS65224 PMIC compatiable
+- ecc2bd711a3 Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-pmic
+
+### Conversation log
+The repository state is clean. Now let me create and checkout the new branch based on ci/master:
+
+Now let me cherry-pick the first commit:
+
+First commit cherry-picked successfully. Now the second commit:
+
+Second commit cherry-picked successfully. Now the third commit:
+
+Third commit cherry-picked successfully. Now the fourth commit - this is a merge commit, so I need to use special flags:
+
+The merge commit is empty (as expected since changes are already included). Let me commit it with --allow-empty to preserve the merge history:
+
+All 4 commits have been cherry-picked. Let me verify with git log:
+
+All 4 commits are present. Now let me run the build verification:
+
+The build completed successfully with no warnings or errors.
+
+## Summary
+
+**Cherry-pick completed successfully!**
+
+### Commits cherry-picked (4 of 4):
+1. `363c60e3bae` - power: regulator: replace printf() with pr_err()
+2. `be28b481e1f` - power: replace magic numbers with macros
+3. `e336f09708e` - power: pmic: tps65941: Fix TI TPS65224 PMIC compatiable
+4. `c5b960baaed` - Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-pmic
+
+### Build result: **OK**
+- No warnings
+- No errors
+
+### Fix-ups made: **None**
+- All commits applied cleanly without conflicts
+
+### Branch status:
+- Current branch: `cherry-eda65fa42b9`
+- Based on: `ci/master`
+- 4 commits ahead of `ci/master`
+- Ready for pushing
+
+---
+

drivers/power/pmic/tps65941.c

@@ -74,7 +74,7 @@ static const struct udevice_id tps65941_ids[] = {
 	{ .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 },

drivers/power/regulator/tps65219_regulator.c

@@ -72,12 +72,12 @@ static int tps65219_buck_enable(struct udevice *dev, int op, bool *enable)
 
 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 @@ static int tps65219_buck_val2volt(int val)
 {
 	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 @@ static int tps65219_ldo_volt2val(int idx, int uV)
 	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 @@ static int tps65219_ldo_val2volt(int idx, int val)
 	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 @@ static int tps65219_ldo_probe(struct udevice *dev)
 	/* 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 @@ static int tps65219_buck_probe(struct udevice *dev)
 	/* 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;
 	}
 

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