summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/i2c/adm1026/adm1026.c38
-rw-r--r--src/drivers/i2c/adm1027/adm1027.c9
-rw-r--r--src/drivers/i2c/adt7463/adt7463.c8
-rw-r--r--src/drivers/i2c/i2cmux/i2cmux.c26
-rw-r--r--src/drivers/i2c/i2cmux2/i2cmux2.c24
-rw-r--r--src/drivers/i2c/lm63/lm63.c24
6 files changed, 61 insertions, 68 deletions
diff --git a/src/drivers/i2c/adm1026/adm1026.c b/src/drivers/i2c/adm1026/adm1026.c
index 14b07aa90c..1aaae52e6d 100644
--- a/src/drivers/i2c/adm1026/adm1026.c
+++ b/src/drivers/i2c/adm1026/adm1026.c
@@ -7,7 +7,7 @@
#include <cpu/x86/msr.h>
#include "chip.h"
-#define ADM1026_DEVICE 0x2d /* Either 0x2c or 0x2d or 0x2e */
+#define ADM1026_DEVICE 0x2d /* Either 0x2c or 0x2d or 0x2e */
#define ADM1026_REG_CONFIG1 0x00
#define CFG1_MONITOR 0x01
#define CFG1_INT_ENABLE 0x02
@@ -24,38 +24,38 @@ static void adm1026_enable_monitoring(device_t dev);
static void adm1026_init(device_t dev)
{
- if (dev->enabled && dev->path.type == DEVICE_PATH_I2C)
- {
- if(ops_smbus_bus(get_pbus_smbus(dev))) {
- if( dev->bus->dev->path.type == DEVICE_PATH_I2C) smbus_set_link(dev); // it is under mux
+ if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) {
+ if (ops_smbus_bus(get_pbus_smbus(dev))) {
+ if (dev->bus->dev->path.type == DEVICE_PATH_I2C)
+ smbus_set_link(dev); // it is under mux
adm1026_enable_monitoring(dev);
}
-
}
-
}
+
static void adm1026_enable_monitoring(device_t dev)
{
- int result;
- result = smbus_read_byte(dev, ADM1026_REG_CONFIG1);
+ int result;
+ result = smbus_read_byte(dev, ADM1026_REG_CONFIG1);
- result = (result | CFG1_MONITOR) & ~(CFG1_INT_CLEAR | CFG1_RESET);
- result = smbus_write_byte(dev, ADM1026_REG_CONFIG1, result);
+ result = (result | CFG1_MONITOR) & ~(CFG1_INT_CLEAR | CFG1_RESET);
+ result = smbus_write_byte(dev, ADM1026_REG_CONFIG1, result);
- result = smbus_read_byte(dev, ADM1026_REG_CONFIG1);
- if (!(result & CFG1_MONITOR)) {
- printk(BIOS_DEBUG, "ADM1026: monitoring would not enable");
- }
+ result = smbus_read_byte(dev, ADM1026_REG_CONFIG1);
+ if (!(result & CFG1_MONITOR)) {
+ printk(BIOS_DEBUG, "ADM1026: monitoring would not enable");
+ }
}
+
static void adm1026_noop(device_t dummy)
{
}
static struct device_operations adm1026_operations = {
- .read_resources = adm1026_noop,
- .set_resources = adm1026_noop,
- .enable_resources = adm1026_noop,
- .init = adm1026_init,
+ .read_resources = adm1026_noop,
+ .set_resources = adm1026_noop,
+ .enable_resources = adm1026_noop,
+ .init = adm1026_init,
};
static void enable_dev(struct device *dev)
diff --git a/src/drivers/i2c/adm1027/adm1027.c b/src/drivers/i2c/adm1027/adm1027.c
index bca2c0dbc8..516a8897d8 100644
--- a/src/drivers/i2c/adm1027/adm1027.c
+++ b/src/drivers/i2c/adm1027/adm1027.c
@@ -47,7 +47,6 @@ static void adm1027_init(device_t dev)
smbus_set_link(dev); // it is under mux
adm1027_enable_monitoring(dev);
}
-
}
}
@@ -56,10 +55,10 @@ static void adm1027_noop(device_t dummy)
}
static struct device_operations adm1027_operations = {
- .read_resources = adm1027_noop,
- .set_resources = adm1027_noop,
- .enable_resources = adm1027_noop,
- .init = adm1027_init,
+ .read_resources = adm1027_noop,
+ .set_resources = adm1027_noop,
+ .enable_resources = adm1027_noop,
+ .init = adm1027_init,
};
static void enable_dev(struct device *dev)
diff --git a/src/drivers/i2c/adt7463/adt7463.c b/src/drivers/i2c/adt7463/adt7463.c
index 25a65c8371..3967bf712e 100644
--- a/src/drivers/i2c/adt7463/adt7463.c
+++ b/src/drivers/i2c/adt7463/adt7463.c
@@ -91,10 +91,10 @@ static void adt7463_noop(device_t dummy)
}
static struct device_operations adt7463_operations = {
- .read_resources = adt7463_noop,
- .set_resources = adt7463_noop,
- .enable_resources = adt7463_noop,
- .init = adt7463_init,
+ .read_resources = adt7463_noop,
+ .set_resources = adt7463_noop,
+ .enable_resources = adt7463_noop,
+ .init = adt7463_init,
};
static void enable_dev(struct device *dev)
diff --git a/src/drivers/i2c/i2cmux/i2cmux.c b/src/drivers/i2c/i2cmux/i2cmux.c
index 14c52ccfd3..44bf390028 100644
--- a/src/drivers/i2c/i2cmux/i2cmux.c
+++ b/src/drivers/i2c/i2cmux/i2cmux.c
@@ -9,32 +9,30 @@
static void i2cmux_set_link(device_t dev, unsigned int link)
{
- if (dev->enabled && dev->path.type == DEVICE_PATH_I2C)
- {
- if(ops_smbus_bus(get_pbus_smbus(dev))) {
- smbus_write_byte(dev, 0x01, 1<<link); // output value
- smbus_write_byte(dev, 0x03, 0); // all output
+ if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) {
+ if (ops_smbus_bus(get_pbus_smbus(dev))) {
+ smbus_write_byte(dev, 0x01, 1 << link); // output value
+ smbus_write_byte(dev, 0x03, 0); // all output
}
-
}
-
}
+
static void i2cmux_noop(device_t dummy)
{
}
static struct device_operations i2cmux_operations = {
- .read_resources = i2cmux_noop,
- .set_resources = i2cmux_noop,
- .enable_resources = i2cmux_noop,
- .init = i2cmux_noop,
- .scan_bus = scan_static_bus,
- .set_link = i2cmux_set_link,
+ .read_resources = i2cmux_noop,
+ .set_resources = i2cmux_noop,
+ .enable_resources = i2cmux_noop,
+ .init = i2cmux_noop,
+ .scan_bus = scan_static_bus,
+ .set_link = i2cmux_set_link,
};
static void enable_dev(struct device *dev)
{
- if(dev->link_list != NULL)
+ if (dev->link_list != NULL)
dev->ops = &i2cmux_operations;
}
diff --git a/src/drivers/i2c/i2cmux2/i2cmux2.c b/src/drivers/i2c/i2cmux2/i2cmux2.c
index c0f8e70878..dc8ec25d89 100644
--- a/src/drivers/i2c/i2cmux2/i2cmux2.c
+++ b/src/drivers/i2c/i2cmux2/i2cmux2.c
@@ -9,31 +9,29 @@
static void i2cmux2_set_link(device_t dev, unsigned int link)
{
- if (dev->enabled && dev->path.type == DEVICE_PATH_I2C)
- {
- if(ops_smbus_bus(get_pbus_smbus(dev))) {
- smbus_send_byte(dev, link); // output value
+ if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) {
+ if (ops_smbus_bus(get_pbus_smbus(dev))) {
+ smbus_send_byte(dev, link); // output value
}
-
}
-
}
+
static void i2cmux2_noop(device_t dummy)
{
}
static struct device_operations i2cmux2_operations = {
- .read_resources = i2cmux2_noop,
- .set_resources = i2cmux2_noop,
- .enable_resources = i2cmux2_noop,
- .init = i2cmux2_noop,
- .scan_bus = scan_static_bus,
- .set_link = i2cmux2_set_link,
+ .read_resources = i2cmux2_noop,
+ .set_resources = i2cmux2_noop,
+ .enable_resources = i2cmux2_noop,
+ .init = i2cmux2_noop,
+ .scan_bus = scan_static_bus,
+ .set_link = i2cmux2_set_link,
};
static void enable_dev(struct device *dev)
{
- if(dev->link_list != NULL)
+ if (dev->link_list != NULL)
dev->ops = &i2cmux2_operations;
}
diff --git a/src/drivers/i2c/lm63/lm63.c b/src/drivers/i2c/lm63/lm63.c
index 05302a68da..d98a245de5 100644
--- a/src/drivers/i2c/lm63/lm63.c
+++ b/src/drivers/i2c/lm63/lm63.c
@@ -7,32 +7,30 @@
#include <cpu/x86/msr.h>
#include "chip.h"
-
static void lm63_init(device_t dev)
{
int result;
- if (dev->enabled && dev->path.type == DEVICE_PATH_I2C)
- {
- if(ops_smbus_bus(get_pbus_smbus(dev))) {
- if( dev->bus->dev->path.type == DEVICE_PATH_I2C) smbus_set_link(dev); // it is under mux
+ if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) {
+ if (ops_smbus_bus(get_pbus_smbus(dev))) {
+ if (dev->bus->dev->path.type == DEVICE_PATH_I2C)
+ smbus_set_link(dev); // it is under mux
result = smbus_read_byte(dev, 0x03);
-// result &= ~0x04;
+// result &= ~0x04;
result |= 0x04;
- smbus_write_byte(dev, 0x03, result & 0xff); // config lm63
+ smbus_write_byte(dev, 0x03, result & 0xff); // config lm63
}
-
}
-
}
+
static void lm63_noop(device_t dummy)
{
}
static struct device_operations lm63_operations = {
- .read_resources = lm63_noop,
- .set_resources = lm63_noop,
- .enable_resources = lm63_noop,
- .init = lm63_init,
+ .read_resources = lm63_noop,
+ .set_resources = lm63_noop,
+ .enable_resources = lm63_noop,
+ .init = lm63_init,
};
static void enable_dev(struct device *dev)