sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/i2c/w83795: Add option to use auxiliary SMBUS controller

Browse Source 
Change-Id: I5a9b5eba992853b84b0cb6c3a1764edf42ac49b2
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/12080
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Peter Stuge <peter@stuge.se>
Tested-by: build bot (Jenkins)
This commit is contained in:
Timothy Pearson
2015-10-17 04:37:10 -05:00
committed by Peter Stuge
parent acbdade5cd
commit f7e0a1aaaa
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/i2c/w83795/chip.h
View File

@ -139,4 +139,11 @@ struct drivers_i2c_w83795_config {
uint8_t fan6_duty; /* % of full speed (0-100) */ uint8_t fan6_duty; /* % of full speed (0-100) */
uint8_t fan7_duty; /* % of full speed (0-100) */ uint8_t fan7_duty; /* % of full speed (0-100) */
uint8_t fan8_duty; /* % of full speed (0-100) */ uint8_t fan8_duty; /* % of full speed (0-100) */
uint8_t smbus_aux; /* 0 == device located on primary SMBUS,
* 1 == device located on first auxiliary
* SMBUS channel,
* <n> == device located on <n> auxiliary
* SMBUS channel
*/
}; };

17
src/drivers/i2c/w83795/w83795.c
View File

@ -146,7 +146,18 @@ static void w83795_init(struct device *dev, w83795_fan_mode_t mode, u8 dts_src)
uint8_t val; uint8_t val;
uint16_t limit_value; uint16_t limit_value;
#if IS_ENABLED(CONFIG_SMBUS_HAS_AUX_CHANNELS)
uint8_t smbus_aux_channel_prev = smbus_get_current_channel();
smbus_switch_to_channel(config->smbus_aux);
printk(BIOS_DEBUG, "Set SMBUS controller to channel %d\n", config->smbus_aux);
#endif
if (smbus_read_byte(dev, 0x00) < 0) { if (smbus_read_byte(dev, 0x00) < 0) {
#if IS_ENABLED(CONFIG_SMBUS_HAS_AUX_CHANNELS)
/* Restore SMBUS channel setting */
smbus_switch_to_channel(smbus_aux_channel_prev);
printk(BIOS_DEBUG, "Set SMBUS controller to channel %d\n", smbus_aux_channel_prev);
#endif
printk(BIOS_ERR, "W83795G/ADG Nuvoton H/W Monitor not found\n"); printk(BIOS_ERR, "W83795G/ADG Nuvoton H/W Monitor not found\n");
return; return;
} }
@ -338,6 +349,12 @@ static void w83795_init(struct device *dev, w83795_fan_mode_t mode, u8 dts_src)
val = w83795_read(dev, W83795_REG_CONFIG); val = w83795_read(dev, W83795_REG_CONFIG);
val |= W83795_REG_CONFIG_START; val |= W83795_REG_CONFIG_START;
w83795_write(dev, W83795_REG_CONFIG, val); w83795_write(dev, W83795_REG_CONFIG, val);
#if IS_ENABLED(CONFIG_SMBUS_HAS_AUX_CHANNELS)
/* Restore SMBUS channel setting */
smbus_switch_to_channel(smbus_aux_channel_prev);
printk(BIOS_DEBUG, "Set SMBUS controller to channel %d\n", smbus_aux_channel_prev);
#endif
} }
static void w83795_hwm_init(struct device *dev) static void w83795_hwm_init(struct device *dev)