Skip to content

Commit 2b06a1c

Browse files
vadimp-nvidiaandy-shev
authored andcommitted
platform/x86: mlx-platform: Fix extended topology configuration for power supply units
Fix topology configuration for power supply units in structure 'mlxplat_mlxcpld_ext_pwr_items_data', due to hardware change. Note: no need to backport the fix, since there is no such hardware yet (equipped with four power) at the filed. Signed-off-by: Vadim Pasternak <[email protected]> Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]>
1 parent fce55cc commit 2b06a1c

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

drivers/platform/x86/mlx-platform.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171
#define MLXPLAT_CPLD_NR_NONE -1
172172
#define MLXPLAT_CPLD_PSU_DEFAULT_NR 10
173173
#define MLXPLAT_CPLD_PSU_MSNXXXX_NR 4
174-
#define MLXPLAT_CPLD_PSU_MSNXXXX_NR2 3
175174
#define MLXPLAT_CPLD_FAN1_DEFAULT_NR 11
176175
#define MLXPLAT_CPLD_FAN2_DEFAULT_NR 12
177176
#define MLXPLAT_CPLD_FAN3_DEFAULT_NR 13
@@ -347,6 +346,15 @@ static struct i2c_board_info mlxplat_mlxcpld_pwr[] = {
347346
},
348347
};
349348

349+
static struct i2c_board_info mlxplat_mlxcpld_ext_pwr[] = {
350+
{
351+
I2C_BOARD_INFO("dps460", 0x5b),
352+
},
353+
{
354+
I2C_BOARD_INFO("dps460", 0x5a),
355+
},
356+
};
357+
350358
static struct i2c_board_info mlxplat_mlxcpld_fan[] = {
351359
{
352360
I2C_BOARD_INFO("24c32", 0x50),
@@ -921,15 +929,15 @@ static struct mlxreg_core_data mlxplat_mlxcpld_ext_pwr_items_data[] = {
921929
.label = "pwr3",
922930
.reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
923931
.mask = BIT(2),
924-
.hpdev.brdinfo = &mlxplat_mlxcpld_pwr[0],
925-
.hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR2,
932+
.hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[0],
933+
.hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
926934
},
927935
{
928936
.label = "pwr4",
929937
.reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
930938
.mask = BIT(3),
931-
.hpdev.brdinfo = &mlxplat_mlxcpld_pwr[1],
932-
.hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR2,
939+
.hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[1],
940+
.hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
933941
},
934942
};
935943

0 commit comments

Comments
 (0)