|
@@ -83,6 +83,7 @@
|
|
#define MLXPLAT_CPLD_PSU_MASK GENMASK(1, 0)
|
|
#define MLXPLAT_CPLD_PSU_MASK GENMASK(1, 0)
|
|
#define MLXPLAT_CPLD_PWR_MASK GENMASK(1, 0)
|
|
#define MLXPLAT_CPLD_PWR_MASK GENMASK(1, 0)
|
|
#define MLXPLAT_CPLD_FAN_MASK GENMASK(3, 0)
|
|
#define MLXPLAT_CPLD_FAN_MASK GENMASK(3, 0)
|
|
|
|
+#define MLXPLAT_CPLD_FAN_NG_MASK GENMASK(5, 0)
|
|
|
|
|
|
/* Start channel numbers */
|
|
/* Start channel numbers */
|
|
#define MLXPLAT_CPLD_CH1 2
|
|
#define MLXPLAT_CPLD_CH1 2
|
|
@@ -170,6 +171,15 @@ static struct i2c_board_info mlxplat_mlxcpld_psu[] = {
|
|
},
|
|
},
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+static struct i2c_board_info mlxplat_mlxcpld_ng_psu[] = {
|
|
|
|
+ {
|
|
|
|
+ I2C_BOARD_INFO("24c32", 0x51),
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ I2C_BOARD_INFO("24c32", 0x50),
|
|
|
|
+ },
|
|
|
|
+};
|
|
|
|
+
|
|
static struct i2c_board_info mlxplat_mlxcpld_pwr[] = {
|
|
static struct i2c_board_info mlxplat_mlxcpld_pwr[] = {
|
|
{
|
|
{
|
|
I2C_BOARD_INFO("dps460", 0x59),
|
|
I2C_BOARD_INFO("dps460", 0x59),
|
|
@@ -476,6 +486,103 @@ struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_msn201x_data = {
|
|
.mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW,
|
|
.mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW,
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+/* Platform hotplug next generation system family data */
|
|
|
|
+static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_psu_items_data[] = {
|
|
|
|
+ {
|
|
|
|
+ .label = "psu1",
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
|
|
|
|
+ .mask = BIT(0),
|
|
|
|
+ .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[0],
|
|
|
|
+ .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .label = "psu2",
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
|
|
|
|
+ .mask = BIT(1),
|
|
|
|
+ .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[1],
|
|
|
|
+ .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
|
|
|
|
+ },
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_fan_items_data[] = {
|
|
|
|
+ {
|
|
|
|
+ .label = "fan1",
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
|
|
|
|
+ .mask = BIT(0),
|
|
|
|
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .label = "fan2",
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
|
|
|
|
+ .mask = BIT(1),
|
|
|
|
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .label = "fan3",
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
|
|
|
|
+ .mask = BIT(2),
|
|
|
|
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .label = "fan4",
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
|
|
|
|
+ .mask = BIT(3),
|
|
|
|
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .label = "fan5",
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
|
|
|
|
+ .mask = BIT(4),
|
|
|
|
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .label = "fan6",
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
|
|
|
|
+ .mask = BIT(5),
|
|
|
|
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
|
|
|
|
+ },
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct mlxreg_core_item mlxplat_mlxcpld_default_ng_items[] = {
|
|
|
|
+ {
|
|
|
|
+ .data = mlxplat_mlxcpld_default_ng_psu_items_data,
|
|
|
|
+ .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
|
|
|
|
+ .mask = MLXPLAT_CPLD_PSU_MASK,
|
|
|
|
+ .count = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_psu_items_data),
|
|
|
|
+ .inversed = 1,
|
|
|
|
+ .health = false,
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .data = mlxplat_mlxcpld_default_ng_pwr_items_data,
|
|
|
|
+ .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
|
|
|
|
+ .mask = MLXPLAT_CPLD_PWR_MASK,
|
|
|
|
+ .count = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_pwr_items_data),
|
|
|
|
+ .inversed = 0,
|
|
|
|
+ .health = false,
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .data = mlxplat_mlxcpld_default_ng_fan_items_data,
|
|
|
|
+ .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
|
|
|
|
+ .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
|
|
|
|
+ .mask = MLXPLAT_CPLD_FAN_NG_MASK,
|
|
|
|
+ .count = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_fan_items_data),
|
|
|
|
+ .inversed = 1,
|
|
|
|
+ .health = false,
|
|
|
|
+ },
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static
|
|
|
|
+struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_default_ng_data = {
|
|
|
|
+ .items = mlxplat_mlxcpld_default_ng_items,
|
|
|
|
+ .counter = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_items),
|
|
|
|
+ .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
|
|
|
|
+ .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
|
|
|
|
+ .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
|
|
|
|
+ .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW,
|
|
|
|
+};
|
|
|
|
+
|
|
static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg)
|
|
static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg)
|
|
{
|
|
{
|
|
switch (reg) {
|
|
switch (reg) {
|
|
@@ -633,6 +740,20 @@ static int __init mlxplat_dmi_msn201x_matched(const struct dmi_system_id *dmi)
|
|
return 1;
|
|
return 1;
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+static int __init mlxplat_dmi_qmb7xx_matched(const struct dmi_system_id *dmi)
|
|
|
|
+{
|
|
|
|
+ int i;
|
|
|
|
+
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(mlxplat_mux_data); i++) {
|
|
|
|
+ mlxplat_mux_data[i].values = mlxplat_msn21xx_channels;
|
|
|
|
+ mlxplat_mux_data[i].n_values =
|
|
|
|
+ ARRAY_SIZE(mlxplat_msn21xx_channels);
|
|
|
|
+ }
|
|
|
|
+ mlxplat_hotplug = &mlxplat_mlxcpld_default_ng_data;
|
|
|
|
+
|
|
|
|
+ return 1;
|
|
|
|
+};
|
|
|
|
+
|
|
static const struct dmi_system_id mlxplat_dmi_table[] __initconst = {
|
|
static const struct dmi_system_id mlxplat_dmi_table[] __initconst = {
|
|
{
|
|
{
|
|
.callback = mlxplat_dmi_msn274x_matched,
|
|
.callback = mlxplat_dmi_msn274x_matched,
|
|
@@ -683,6 +804,27 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "MSN201"),
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "MSN201"),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
|
|
+ {
|
|
|
|
+ .callback = mlxplat_dmi_qmb7xx_matched,
|
|
|
|
+ .matches = {
|
|
|
|
+ DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),
|
|
|
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "QMB7"),
|
|
|
|
+ },
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .callback = mlxplat_dmi_qmb7xx_matched,
|
|
|
|
+ .matches = {
|
|
|
|
+ DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),
|
|
|
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "SN37"),
|
|
|
|
+ },
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ .callback = mlxplat_dmi_qmb7xx_matched,
|
|
|
|
+ .matches = {
|
|
|
|
+ DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),
|
|
|
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "SN34"),
|
|
|
|
+ },
|
|
|
|
+ },
|
|
{ }
|
|
{ }
|
|
};
|
|
};
|
|
|
|
|