@@ -473,7 +473,7 @@ static struct i2c_mux_reg_platform_data mlxplat_modular_mux_data[] = {
473
473
},
474
474
};
475
475
476
- /* Platform channels for rack swicth system family */
476
+ /* Platform channels for rack switch system family */
477
477
static const int mlxplat_rack_switch_channels [] = {
478
478
1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 ,
479
479
};
@@ -2085,7 +2085,7 @@ static struct mlxreg_core_data mlxplat_mlxcpld_global_wp_items_data[] = {
2085
2085
},
2086
2086
};
2087
2087
2088
- static struct mlxreg_core_item mlxplat_mlxcpld_nvlink_blade_items [] = {
2088
+ static struct mlxreg_core_item mlxplat_mlxcpld_chassis_blade_items [] = {
2089
2089
{
2090
2090
.data = mlxplat_mlxcpld_global_wp_items_data ,
2091
2091
.aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF ,
@@ -2098,9 +2098,9 @@ static struct mlxreg_core_item mlxplat_mlxcpld_nvlink_blade_items[] = {
2098
2098
};
2099
2099
2100
2100
static
2101
- struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_nvlink_blade_data = {
2102
- .items = mlxplat_mlxcpld_nvlink_blade_items ,
2103
- .counter = ARRAY_SIZE (mlxplat_mlxcpld_nvlink_blade_items ),
2101
+ struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_chassis_blade_data = {
2102
+ .items = mlxplat_mlxcpld_chassis_blade_items ,
2103
+ .counter = ARRAY_SIZE (mlxplat_mlxcpld_chassis_blade_items ),
2104
2104
.cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET ,
2105
2105
.mask = MLXPLAT_CPLD_AGGR_MASK_COMEX ,
2106
2106
.cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET ,
@@ -3848,8 +3848,8 @@ static struct mlxreg_core_platform_data mlxplat_modular_regs_io_data = {
3848
3848
.counter = ARRAY_SIZE (mlxplat_mlxcpld_modular_regs_io_data ),
3849
3849
};
3850
3850
3851
- /* Platform register access for NVLink blade systems family data */
3852
- static struct mlxreg_core_data mlxplat_mlxcpld_nvlink_blade_regs_io_data [] = {
3851
+ /* Platform register access for chassis blade systems family data */
3852
+ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data [] = {
3853
3853
{
3854
3854
.label = "cpld1_version" ,
3855
3855
.reg = MLXPLAT_CPLD_LPC_REG_CPLD1_VER_OFFSET ,
@@ -4046,9 +4046,9 @@ static struct mlxreg_core_data mlxplat_mlxcpld_nvlink_blade_regs_io_data[] = {
4046
4046
},
4047
4047
};
4048
4048
4049
- static struct mlxreg_core_platform_data mlxplat_nvlink_blade_regs_io_data = {
4050
- .data = mlxplat_mlxcpld_nvlink_blade_regs_io_data ,
4051
- .counter = ARRAY_SIZE (mlxplat_mlxcpld_nvlink_blade_regs_io_data ),
4049
+ static struct mlxreg_core_platform_data mlxplat_chassis_blade_regs_io_data = {
4050
+ .data = mlxplat_mlxcpld_chassis_blade_regs_io_data ,
4051
+ .counter = ARRAY_SIZE (mlxplat_mlxcpld_chassis_blade_regs_io_data ),
4052
4052
};
4053
4053
4054
4054
/* Platform FAN default */
@@ -5168,22 +5168,22 @@ static int __init mlxplat_dmi_modular_matched(const struct dmi_system_id *dmi)
5168
5168
return 1 ;
5169
5169
}
5170
5170
5171
- static int __init mlxplat_dmi_nvlink_blade_matched (const struct dmi_system_id * dmi )
5171
+ static int __init mlxplat_dmi_chassis_blade_matched (const struct dmi_system_id * dmi )
5172
5172
{
5173
5173
int i ;
5174
5174
5175
5175
mlxplat_max_adap_num = MLXPLAT_CPLD_MAX_PHYS_ADAPTER_NUM ;
5176
5176
mlxplat_mux_num = ARRAY_SIZE (mlxplat_default_mux_data );
5177
5177
mlxplat_mux_data = mlxplat_default_mux_data ;
5178
- mlxplat_hotplug = & mlxplat_mlxcpld_nvlink_blade_data ;
5178
+ mlxplat_hotplug = & mlxplat_mlxcpld_chassis_blade_data ;
5179
5179
mlxplat_hotplug -> deferred_nr =
5180
5180
mlxplat_msn21xx_channels [MLXPLAT_CPLD_GRP_CHNL_NUM - 1 ];
5181
5181
for (i = 0 ; i < mlxplat_mux_num ; i ++ ) {
5182
5182
mlxplat_mux_data [i ].values = mlxplat_msn21xx_channels ;
5183
5183
mlxplat_mux_data [i ].n_values =
5184
5184
ARRAY_SIZE (mlxplat_msn21xx_channels );
5185
5185
}
5186
- mlxplat_regs_io = & mlxplat_nvlink_blade_regs_io_data ;
5186
+ mlxplat_regs_io = & mlxplat_chassis_blade_regs_io_data ;
5187
5187
mlxplat_i2c = & mlxplat_mlxcpld_i2c_ng_data ;
5188
5188
mlxplat_regmap_config = & mlxplat_mlxcpld_regmap_config_ng400 ;
5189
5189
@@ -5288,7 +5288,7 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = {
5288
5288
},
5289
5289
},
5290
5290
{
5291
- .callback = mlxplat_dmi_nvlink_blade_matched ,
5291
+ .callback = mlxplat_dmi_chassis_blade_matched ,
5292
5292
.matches = {
5293
5293
DMI_MATCH (DMI_BOARD_NAME , "VMOD0015" ),
5294
5294
},
0 commit comments