Skip to content

Commit ba814fd

Browse files
mellanoxbmcdvhart
authored andcommitted
platform/x86: mlx-platform: Use defines for bus assignment
Add defines for the bus IDs, used for hotplug device topology to improve code readability. Defines added for FAN and power units. Signed-off-by: Vadim Pasternak <[email protected]> Signed-off-by: Darren Hart (VMware) <[email protected]>
1 parent b81e830 commit ba814fd

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

drivers/platform/x86/mlx-platform.c

+15-8
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,13 @@
8989
/* Number of LPC attached MUX platform devices */
9090
#define MLXPLAT_CPLD_LPC_MUX_DEVS 2
9191

92+
/* Hotplug devices adapter numbers */
93+
#define MLXPLAT_CPLD_PSU_DEFAULT_NR 10
94+
#define MLXPLAT_CPLD_FAN1_DEFAULT_NR 11
95+
#define MLXPLAT_CPLD_FAN2_DEFAULT_NR 12
96+
#define MLXPLAT_CPLD_FAN3_DEFAULT_NR 13
97+
#define MLXPLAT_CPLD_FAN4_DEFAULT_NR 14
98+
9299
/* mlxplat_priv - platform private data
93100
* @pdev_i2c - i2c controller platform device
94101
* @pdev_mux - array of mux platform devices
@@ -190,14 +197,14 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_psu_items_data[] = {
190197
.reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
191198
.mask = BIT(0),
192199
.hpdev.brdinfo = &mlxplat_mlxcpld_psu[0],
193-
.hpdev.nr = 10,
200+
.hpdev.nr = MLXPLAT_CPLD_PSU_DEFAULT_NR,
194201
},
195202
{
196203
.label = "psu2",
197204
.reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
198205
.mask = BIT(1),
199206
.hpdev.brdinfo = &mlxplat_mlxcpld_psu[1],
200-
.hpdev.nr = 10,
207+
.hpdev.nr = MLXPLAT_CPLD_PSU_DEFAULT_NR,
201208
},
202209
};
203210

@@ -207,14 +214,14 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_pwr_items_data[] = {
207214
.reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
208215
.mask = BIT(0),
209216
.hpdev.brdinfo = &mlxplat_mlxcpld_pwr[0],
210-
.hpdev.nr = 10,
217+
.hpdev.nr = MLXPLAT_CPLD_PSU_DEFAULT_NR,
211218
},
212219
{
213220
.label = "pwr2",
214221
.reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
215222
.mask = BIT(1),
216223
.hpdev.brdinfo = &mlxplat_mlxcpld_pwr[1],
217-
.hpdev.nr = 10,
224+
.hpdev.nr = MLXPLAT_CPLD_PSU_DEFAULT_NR,
218225
},
219226
};
220227

@@ -224,28 +231,28 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_fan_items_data[] = {
224231
.reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
225232
.mask = BIT(0),
226233
.hpdev.brdinfo = &mlxplat_mlxcpld_fan[0],
227-
.hpdev.nr = 11,
234+
.hpdev.nr = MLXPLAT_CPLD_FAN1_DEFAULT_NR,
228235
},
229236
{
230237
.label = "fan2",
231238
.reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
232239
.mask = BIT(1),
233240
.hpdev.brdinfo = &mlxplat_mlxcpld_fan[1],
234-
.hpdev.nr = 12,
241+
.hpdev.nr = MLXPLAT_CPLD_FAN2_DEFAULT_NR,
235242
},
236243
{
237244
.label = "fan3",
238245
.reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
239246
.mask = BIT(2),
240247
.hpdev.brdinfo = &mlxplat_mlxcpld_fan[2],
241-
.hpdev.nr = 13,
248+
.hpdev.nr = MLXPLAT_CPLD_FAN3_DEFAULT_NR,
242249
},
243250
{
244251
.label = "fan4",
245252
.reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
246253
.mask = BIT(3),
247254
.hpdev.brdinfo = &mlxplat_mlxcpld_fan[3],
248-
.hpdev.nr = 14,
255+
.hpdev.nr = MLXPLAT_CPLD_FAN4_DEFAULT_NR,
249256
},
250257
};
251258

0 commit comments

Comments
 (0)