aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/mlx-platform.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/platform/x86/mlx-platform.c')
-rw-r--r--drivers/platform/x86/mlx-platform.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
index 27de29961f5e..60bf758ff382 100644
--- a/drivers/platform/x86/mlx-platform.c
+++ b/drivers/platform/x86/mlx-platform.c
@@ -89,6 +89,13 @@
89/* Number of LPC attached MUX platform devices */ 89/* Number of LPC attached MUX platform devices */
90#define MLXPLAT_CPLD_LPC_MUX_DEVS 2 90#define MLXPLAT_CPLD_LPC_MUX_DEVS 2
91 91
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
92/* mlxplat_priv - platform private data 99/* mlxplat_priv - platform private data
93 * @pdev_i2c - i2c controller platform device 100 * @pdev_i2c - i2c controller platform device
94 * @pdev_mux - array of mux platform devices 101 * @pdev_mux - array of mux platform devices
@@ -190,14 +197,14 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_psu_items_data[] = {
190 .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, 197 .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
191 .mask = BIT(0), 198 .mask = BIT(0),
192 .hpdev.brdinfo = &mlxplat_mlxcpld_psu[0], 199 .hpdev.brdinfo = &mlxplat_mlxcpld_psu[0],
193 .hpdev.nr = 10, 200 .hpdev.nr = MLXPLAT_CPLD_PSU_DEFAULT_NR,
194 }, 201 },
195 { 202 {
196 .label = "psu2", 203 .label = "psu2",
197 .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, 204 .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
198 .mask = BIT(1), 205 .mask = BIT(1),
199 .hpdev.brdinfo = &mlxplat_mlxcpld_psu[1], 206 .hpdev.brdinfo = &mlxplat_mlxcpld_psu[1],
200 .hpdev.nr = 10, 207 .hpdev.nr = MLXPLAT_CPLD_PSU_DEFAULT_NR,
201 }, 208 },
202}; 209};
203 210
@@ -207,14 +214,14 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_pwr_items_data[] = {
207 .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, 214 .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
208 .mask = BIT(0), 215 .mask = BIT(0),
209 .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[0], 216 .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[0],
210 .hpdev.nr = 10, 217 .hpdev.nr = MLXPLAT_CPLD_PSU_DEFAULT_NR,
211 }, 218 },
212 { 219 {
213 .label = "pwr2", 220 .label = "pwr2",
214 .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, 221 .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
215 .mask = BIT(1), 222 .mask = BIT(1),
216 .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[1], 223 .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[1],
217 .hpdev.nr = 10, 224 .hpdev.nr = MLXPLAT_CPLD_PSU_DEFAULT_NR,
218 }, 225 },
219}; 226};
220 227
@@ -224,28 +231,28 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_fan_items_data[] = {
224 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, 231 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
225 .mask = BIT(0), 232 .mask = BIT(0),
226 .hpdev.brdinfo = &mlxplat_mlxcpld_fan[0], 233 .hpdev.brdinfo = &mlxplat_mlxcpld_fan[0],
227 .hpdev.nr = 11, 234 .hpdev.nr = MLXPLAT_CPLD_FAN1_DEFAULT_NR,
228 }, 235 },
229 { 236 {
230 .label = "fan2", 237 .label = "fan2",
231 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, 238 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
232 .mask = BIT(1), 239 .mask = BIT(1),
233 .hpdev.brdinfo = &mlxplat_mlxcpld_fan[1], 240 .hpdev.brdinfo = &mlxplat_mlxcpld_fan[1],
234 .hpdev.nr = 12, 241 .hpdev.nr = MLXPLAT_CPLD_FAN2_DEFAULT_NR,
235 }, 242 },
236 { 243 {
237 .label = "fan3", 244 .label = "fan3",
238 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, 245 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
239 .mask = BIT(2), 246 .mask = BIT(2),
240 .hpdev.brdinfo = &mlxplat_mlxcpld_fan[2], 247 .hpdev.brdinfo = &mlxplat_mlxcpld_fan[2],
241 .hpdev.nr = 13, 248 .hpdev.nr = MLXPLAT_CPLD_FAN3_DEFAULT_NR,
242 }, 249 },
243 { 250 {
244 .label = "fan4", 251 .label = "fan4",
245 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, 252 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
246 .mask = BIT(3), 253 .mask = BIT(3),
247 .hpdev.brdinfo = &mlxplat_mlxcpld_fan[3], 254 .hpdev.brdinfo = &mlxplat_mlxcpld_fan[3],
248 .hpdev.nr = 14, 255 .hpdev.nr = MLXPLAT_CPLD_FAN4_DEFAULT_NR,
249 }, 256 },
250}; 257};
251 258