Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a38b67c authored by Vadim Pasternak's avatar Vadim Pasternak Committed by Andy Shevchenko
Browse files

platform/x86: mlx-platform: mlxcpld-hotplug driver style fixes 



The patch contains several styling fixes:
  - Make names of hotplug devices shorter;
  - Change register offset assignment to defines;
  - Add defines for the all event masks;
  - Use PLATFORM_DEVID_NONE instead of -1;

Signed-off-by: default avatarVadim Pasternak <vadimp@mellanox.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 3e491607

drivers/platform/x86/mlx-platform.c

+50 −34
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ 
/* LPC bus IO offsets */

#define MLXPLAT_CPLD_LPC_I2C_BASE_ADRR		0x2000

#define MLXPLAT_CPLD_LPC_REG_BASE_ADRR		0x2500

#define MLXPLAT_CPLD_LPC_REG_AGGR_ADRR		0x253a

#define MLXPLAT_CPLD_LPC_REG_PSU_ADRR		0x2558

#define MLXPLAT_CPLD_LPC_REG_PWR_ADRR		0x2564

#define MLXPLAT_CPLD_LPC_REG_FAN_ADRR		0x2588

#define MLXPLAT_CPLD_LPC_IO_RANGE		0x100

#define MLXPLAT_CPLD_LPC_I2C_CH1_OFF		0xdb

#define MLXPLAT_CPLD_LPC_I2C_CH2_OFF		0xda
@@ -56,6 +60,17 @@ 
				  MLXPLAT_CPLD_LPC_I2C_CH2_OFF) | \

				  MLXPLAT_CPLD_LPC_PIO_OFFSET)



/* Masks for aggregation, psu, pwr and fan event in CPLD related registers. */

#define MLXPLAT_CPLD_AGGR_PSU_MASK_DEF	0x08

#define MLXPLAT_CPLD_AGGR_PWR_MASK_DEF	0x08

#define MLXPLAT_CPLD_AGGR_FAN_MASK_DEF	0x40

#define MLXPLAT_CPLD_AGGR_MASK_DEF	(MLXPLAT_CPLD_AGGR_PSU_MASK_DEF | \

					 MLXPLAT_CPLD_AGGR_FAN_MASK_DEF)

#define MLXPLAT_CPLD_AGGR_MASK_MSN21XX	0x04

#define MLXPLAT_CPLD_PSU_MASK		GENMASK(1, 0)

#define MLXPLAT_CPLD_PWR_MASK		GENMASK(1, 0)

#define MLXPLAT_CPLD_FAN_MASK		GENMASK(3, 0)



/* Start channel numbers */

#define MLXPLAT_CPLD_CH1			2

#define MLXPLAT_CPLD_CH2			10
@@ -123,7 +138,7 @@ static struct i2c_mux_reg_platform_data mlxplat_mux_data[] = { 
};



/* Platform hotplug devices */

static struct mlxcpld_hotplug_device mlxplat_mlxcpld_hotplug_psu[] = {

static struct mlxcpld_hotplug_device mlxplat_mlxcpld_psu[] = {

	{

		.brdinfo = { I2C_BOARD_INFO("24c02", 0x51) },

		.bus = 10,
@@ -134,7 +149,7 @@ static struct mlxcpld_hotplug_device mlxplat_mlxcpld_hotplug_psu[] = { 
	},

};



static struct mlxcpld_hotplug_device mlxplat_mlxcpld_hotplug_pwr[] = {

static struct mlxcpld_hotplug_device mlxplat_mlxcpld_pwr[] = {

	{

		.brdinfo = { I2C_BOARD_INFO("dps460", 0x59) },

		.bus = 10,
@@ -145,7 +160,7 @@ static struct mlxcpld_hotplug_device mlxplat_mlxcpld_hotplug_pwr[] = { 
	},

};



static struct mlxcpld_hotplug_device mlxplat_mlxcpld_hotplug_fan[] = {

static struct mlxcpld_hotplug_device mlxplat_mlxcpld_fan[] = {

	{

		.brdinfo = { I2C_BOARD_INFO("24c32", 0x50) },

		.bus = 11,
@@ -166,38 +181,38 @@ static struct mlxcpld_hotplug_device mlxplat_mlxcpld_hotplug_fan[] = { 


/* Platform hotplug default data */

static

struct mlxcpld_hotplug_platform_data mlxplat_mlxcpld_hotplug_default_data = {

	.top_aggr_offset = (MLXPLAT_CPLD_LPC_REG_BASE_ADRR | 0x3a),

	.top_aggr_mask = 0x48,

	.top_aggr_psu_mask = 0x08,

	.psu_reg_offset = (MLXPLAT_CPLD_LPC_REG_BASE_ADRR | 0x58),

	.psu_mask = 0x03,

	.psu_count = ARRAY_SIZE(mlxplat_mlxcpld_hotplug_psu),

	.psu = mlxplat_mlxcpld_hotplug_psu,

	.top_aggr_pwr_mask = 0x08,

	.pwr_reg_offset = (MLXPLAT_CPLD_LPC_REG_BASE_ADRR | 0x64),

	.pwr_mask = 0x03,

	.pwr_count = ARRAY_SIZE(mlxplat_mlxcpld_hotplug_pwr),

	.pwr = mlxplat_mlxcpld_hotplug_pwr,

	.top_aggr_fan_mask = 0x40,

	.fan_reg_offset = (MLXPLAT_CPLD_LPC_REG_BASE_ADRR | 0x88),

	.fan_mask = 0x0f,

	.fan_count = ARRAY_SIZE(mlxplat_mlxcpld_hotplug_fan),

	.fan = mlxplat_mlxcpld_hotplug_fan,

struct mlxcpld_hotplug_platform_data mlxplat_mlxcpld_default_data = {

	.top_aggr_offset = MLXPLAT_CPLD_LPC_REG_AGGR_ADRR,

	.top_aggr_mask = MLXPLAT_CPLD_AGGR_MASK_DEF,

	.top_aggr_psu_mask = MLXPLAT_CPLD_AGGR_PSU_MASK_DEF,

	.psu_reg_offset = MLXPLAT_CPLD_LPC_REG_PSU_ADRR,

	.psu_mask = MLXPLAT_CPLD_PSU_MASK,

	.psu_count = ARRAY_SIZE(mlxplat_mlxcpld_psu),

	.psu = mlxplat_mlxcpld_psu,

	.top_aggr_pwr_mask = MLXPLAT_CPLD_AGGR_PWR_MASK_DEF,

	.pwr_reg_offset = MLXPLAT_CPLD_LPC_REG_PWR_ADRR,

	.pwr_mask = MLXPLAT_CPLD_PWR_MASK,

	.pwr_count = ARRAY_SIZE(mlxplat_mlxcpld_pwr),

	.pwr = mlxplat_mlxcpld_pwr,

	.top_aggr_fan_mask = MLXPLAT_CPLD_AGGR_FAN_MASK_DEF,

	.fan_reg_offset = MLXPLAT_CPLD_LPC_REG_FAN_ADRR,

	.fan_mask = MLXPLAT_CPLD_FAN_MASK,

	.fan_count = ARRAY_SIZE(mlxplat_mlxcpld_fan),

	.fan = mlxplat_mlxcpld_fan,

};



/* Platform hotplug MSN21xx system family data */

static

struct mlxcpld_hotplug_platform_data mlxplat_mlxcpld_hotplug_msn21xx_data = {

	.top_aggr_offset = (MLXPLAT_CPLD_LPC_REG_BASE_ADRR | 0x3a),

	.top_aggr_mask = 0x04,

	.top_aggr_pwr_mask = 0x04,

	.pwr_reg_offset = (MLXPLAT_CPLD_LPC_REG_BASE_ADRR | 0x64),

	.pwr_mask = 0x03,

	.pwr_count = ARRAY_SIZE(mlxplat_mlxcpld_hotplug_pwr),

struct mlxcpld_hotplug_platform_data mlxplat_mlxcpld_msn21xx_data = {

	.top_aggr_offset = MLXPLAT_CPLD_LPC_REG_AGGR_ADRR,

	.top_aggr_mask = MLXPLAT_CPLD_AGGR_MASK_MSN21XX,

	.top_aggr_pwr_mask = MLXPLAT_CPLD_AGGR_MASK_MSN21XX,

	.pwr_reg_offset = MLXPLAT_CPLD_LPC_REG_PWR_ADRR,

	.pwr_mask = MLXPLAT_CPLD_PWR_MASK,

	.pwr_count = ARRAY_SIZE(mlxplat_mlxcpld_pwr),

};



static struct resource mlxplat_mlxcpld_hotplug_resources[] = {

static struct resource mlxplat_mlxcpld_resources[] = {

	[0] = DEFINE_RES_IRQ_NAMED(17, "mlxcpld-hotplug"),

};
@@ -213,7 +228,7 @@ static int __init mlxplat_dmi_default_matched(const struct dmi_system_id *dmi) 
		mlxplat_mux_data[i].n_values =

				ARRAY_SIZE(mlxplat_default_channels[i]);

	}

	mlxplat_hotplug = &mlxplat_mlxcpld_hotplug_default_data;

	mlxplat_hotplug = &mlxplat_mlxcpld_default_data;



	return 1;

};
@@ -227,7 +242,7 @@ static int __init mlxplat_dmi_msn21xx_matched(const struct dmi_system_id *dmi) 
		mlxplat_mux_data[i].n_values =

				ARRAY_SIZE(mlxplat_msn21xx_channels);

	}

	mlxplat_hotplug = &mlxplat_mlxcpld_hotplug_msn21xx_data;

	mlxplat_hotplug = &mlxplat_mlxcpld_msn21xx_data;



	return 1;

};
@@ -314,9 +329,10 @@ static int __init mlxplat_init(void) 
	}



	priv->pdev_hotplug = platform_device_register_resndata(

				&mlxplat_dev->dev, "mlxcpld-hotplug", -1,

				mlxplat_mlxcpld_hotplug_resources,

				ARRAY_SIZE(mlxplat_mlxcpld_hotplug_resources),

				&mlxplat_dev->dev, "mlxcpld-hotplug",

				PLATFORM_DEVID_NONE,

				mlxplat_mlxcpld_resources,

				ARRAY_SIZE(mlxplat_mlxcpld_resources),

				mlxplat_hotplug, sizeof(*mlxplat_hotplug));

	if (IS_ERR(priv->pdev_hotplug)) {

		err = PTR_ERR(priv->pdev_hotplug);