Commit 89fec128 authored by Tomer Maimon's avatar Tomer Maimon Committed by Guenter Roeck
Browse files

hwmon: (npcm750-pwm-fan) Add NPCM8xx support 



Adding Pulse Width Modulation (PWM) and fan tacho NPCM8xx support to
NPCM PWM and fan tacho driver.
NPCM8xx uses a different number of PWM devices.

As part of adding NPCM8XX support:
- Add NPCM8xx specific compatible string.
- Add data to handle architecture-specific PWM parameters.

Signed-off-by: default avatarTomer Maimon <tmaimon77@gmail.com>
Link: https://lore.kernel.org/r/20231031075806.400872-2-tmaimon77@gmail.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent a39b6ac3

drivers/hwmon/npcm750-pwm-fan.c

+26 −4
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ 
#define NPCM7XX_PWM_CTRL_CH3_EN_BIT		BIT(16)



/* Define the maximum PWM channel number */

#define NPCM7XX_PWM_MAX_CHN_NUM			8

#define NPCM7XX_PWM_MAX_CHN_NUM			12

#define NPCM7XX_PWM_MAX_CHN_NUM_IN_A_MODULE	4

#define NPCM7XX_PWM_MAX_MODULES                 2

#define NPCM7XX_PWM_MAX_MODULES                 3



/* Define the Counter Register, value = 100 for match 100% */

#define NPCM7XX_PWM_COUNTER_DEFAULT_NUM		255
@@ -171,6 +171,10 @@ 
#define FAN_PREPARE_TO_GET_FIRST_CAPTURE	0x01

#define FAN_ENOUGH_SAMPLE			0x02



struct npcm_hwmon_info {

	u32 pwm_max_channel;

};



struct npcm7xx_fan_dev {

	u8 fan_st_flg;

	u8 fan_pls_per_rev;
@@ -204,6 +208,7 @@ struct npcm7xx_pwm_fan_data { 
	struct timer_list fan_timer;

	struct npcm7xx_fan_dev fan_dev[NPCM7XX_FAN_MAX_CHN_NUM];

	struct npcm7xx_cooling_device *cdev[NPCM7XX_PWM_MAX_CHN_NUM];

	const struct npcm_hwmon_info *info;

	u8 fan_select;

};
@@ -542,7 +547,7 @@ static umode_t npcm7xx_pwm_is_visible(const void *_data, u32 attr, int channel) 
{

	const struct npcm7xx_pwm_fan_data *data = _data;



	if (!data->pwm_present[channel])

	if (!data->pwm_present[channel] || channel >= data->info->pwm_max_channel)

		return 0;



	switch (attr) {
@@ -638,6 +643,10 @@ static const struct hwmon_channel_info * const npcm7xx_info[] = { 
			   HWMON_PWM_INPUT,

			   HWMON_PWM_INPUT,

			   HWMON_PWM_INPUT,

			   HWMON_PWM_INPUT,

			   HWMON_PWM_INPUT,

			   HWMON_PWM_INPUT,

			   HWMON_PWM_INPUT,

			   HWMON_PWM_INPUT),

	HWMON_CHANNEL_INFO(fan,

			   HWMON_F_INPUT,
@@ -670,6 +679,14 @@ static const struct hwmon_chip_info npcm7xx_chip_info = { 
	.info = npcm7xx_info,

};



static const struct npcm_hwmon_info npxm7xx_hwmon_info = {

	.pwm_max_channel = 8,

};



static const struct npcm_hwmon_info npxm8xx_hwmon_info = {

	.pwm_max_channel = 12,

};



static u32 npcm7xx_pwm_init(struct npcm7xx_pwm_fan_data *data)

{

	int m, ch;
@@ -925,6 +942,10 @@ static int npcm7xx_pwm_fan_probe(struct platform_device *pdev) 
	if (!data)

		return -ENOMEM;



	data->info = device_get_match_data(dev);

	if (!data->info)

		return -EINVAL;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pwm");

	if (!res) {

		dev_err(dev, "pwm resource not found\n");
@@ -1017,7 +1038,8 @@ static int npcm7xx_pwm_fan_probe(struct platform_device *pdev) 
}



static const struct of_device_id of_pwm_fan_match_table[] = {

	{ .compatible = "nuvoton,npcm750-pwm-fan", },

	{ .compatible = "nuvoton,npcm750-pwm-fan", .data = &npxm7xx_hwmon_info},

	{ .compatible = "nuvoton,npcm845-pwm-fan", .data = &npxm8xx_hwmon_info},

	{},

};

MODULE_DEVICE_TABLE(of, of_pwm_fan_match_table);