Skip to content

drivers: hwmon: nct7363: Add Ghana fan pump config #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amd-knieman wants to merge 1 commit into
base: integ_sp8
Choose a base branch
from
+22 −2
Open

drivers: hwmon: nct7363: Add Ghana fan pump config #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-ghana.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@
nct7363@20 {
compatible = "nct,nct7363";
reg = <0x20>;
fan_sel_gpio = <3>;
fan_sel_gpio = <255>; /* pump profile: PWM0=PUMP1/P0, PWM3=PUMP2/P1, tach on GPIO01/02/04/05 */
};
};
};
Expand Down
22 changes: 21 additions & 1 deletion drivers/hwmon/nct7363.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ store_pwm(struct device *dev, struct device_attribute *attr,
nct7362_write_value(client, NCT7362_REG_PWM(index), tmpVal & 0xFF);

//add for setting GPIOx H->L when set pwm in the first time
if(data->bmc_set_pwm == 0)
if(data->bmc_set_pwm == 0 && data->fan_sel_gpio < 18)
{
u8 reg_value=0;
u8 gpio = (u8)data->fan_sel_gpio;
Expand Down Expand Up @@ -370,6 +370,21 @@ static void nct7362_init_client(struct i2c_client *client,u32 gpio)
nct7362_write_value(client, NCT7362_REG_GPIO_10_13_CONFIG, 0xA9);
nct7362_write_value(client, NCT7362_REG_GPIO_14_17_CONFIG, 0x6A);
}
else if(gpio == 0xFF)
{
// Pump controller default (fan_sel_gpio omitted in DTS):
// PWM0 (PUMP1/P0) + PWM3 (PUMP2/P1); tach on GPIO01,02,04,05; rest GPIO
// 2-bit pin encoding: 00=GPIO, 01=PWM output, 10=FANIN
nct7362_write_value(client, NCT7362_REG_WDT_CONFIG, 0x00);
nct7362_write_value(client, NCT7362_REG_PWM_CTRL1, 0x09); // PWM0 (bit0) + PWM3 (bit3)
nct7362_write_value(client, NCT7362_REG_PWM_CTRL2, 0x00); // no PWM8/PWM15
nct7362_write_value(client, NCT7362_REG_FANIN_CTRL1, 0x00); // GPIO08-15 unconnected, keep as GPIO
nct7362_write_value(client, NCT7362_REG_FANIN_CTRL2, 0x36); // FANIN9(GPIO01),10(GPIO02),12(GPIO04),13(GPIO05)
nct7362_write_value(client, NCT7362_REG_GPIO_00_03_CONFIG, 0x69); // [01][10][10][01] PWM,FANIN,FANIN,PWM
nct7362_write_value(client, NCT7362_REG_GPIO_04_07_CONFIG, 0x0A); // [00][00][10][10] GPIO,GPIO,FANIN,FANIN
nct7362_write_value(client, NCT7362_REG_GPIO_10_13_CONFIG, 0x00); // all GPIO (unconnected)
nct7362_write_value(client, NCT7362_REG_GPIO_14_17_CONFIG, 0x00); // all GPIO (unconnected)
}
}

static int __init nct7362d_find(int addr, struct i2c_client *client, struct i2c_board_info *info)
Expand Down Expand Up @@ -435,6 +450,11 @@ static int nct736x_init(struct i2c_client *client,u32 gpio)
nct7362_write_value(client, NCT7362_REG_PWM(8), NCT7362_REG_PWM_DEFAULT_VALUE);
nct7362_write_value(client, NCT7362_REG_PWM(15), NCT7362_REG_PWM_DEFAULT_VALUE);
}
if (gpio==0xFF)
{
// Set Default PWM3 to 50% (PUMP2/P1 node)
nct7362_write_value(client, NCT7362_REG_PWM(3), NCT7362_REG_PWM_DEFAULT_VALUE);
}
return 0;
}

Expand Down