summaryrefslogtreecommitdiff
path: root/src/ec
diff options
context:
space:
mode:
Diffstat (limited to 'src/ec')
-rw-r--r--src/ec/kontron/kempld/early_kempld.c6
-rw-r--r--src/ec/kontron/kempld/kempld.c18
-rw-r--r--src/ec/kontron/kempld/kempld_i2c.c3
3 files changed, 11 insertions, 16 deletions
diff --git a/src/ec/kontron/kempld/early_kempld.c b/src/ec/kontron/kempld/early_kempld.c
index cb33a8baaf..3cafb1e762 100644
--- a/src/ec/kontron/kempld/early_kempld.c
+++ b/src/ec/kontron/kempld/early_kempld.c
@@ -43,13 +43,11 @@ void kempld_enable_uart_for_console(void)
switch (CONFIG_UART_FOR_CONSOLE) {
case 0:
kempld_write8(KEMPLD_UART_0,
- KEMPLD_UART_ENABLE |
- KEMPLD_UART_3F8 << KEMPLD_UART_IO_SHIFT);
+ KEMPLD_UART_ENABLE | KEMPLD_UART_3F8 << KEMPLD_UART_IO_SHIFT);
break;
case 1:
kempld_write8(KEMPLD_UART_1,
- KEMPLD_UART_ENABLE |
- KEMPLD_UART_2F8 << KEMPLD_UART_IO_SHIFT);
+ KEMPLD_UART_ENABLE | KEMPLD_UART_2F8 << KEMPLD_UART_IO_SHIFT);
break;
default:
break;
diff --git a/src/ec/kontron/kempld/kempld.c b/src/ec/kontron/kempld/kempld.c
index 19376c7961..f8371a8d82 100644
--- a/src/ec/kontron/kempld/kempld.c
+++ b/src/ec/kontron/kempld/kempld.c
@@ -16,21 +16,20 @@ static void kempld_uart_read_resources(struct device *dev)
struct resource *const res_io = new_resource(dev, 0);
struct resource *const res_irq = new_resource(dev, 1);
const unsigned int uart = dev->path.generic.subid;
+
if (!config || !res_io || !res_irq || uart >= KEMPLD_NUM_UARTS)
return;
const enum kempld_uart_io io = config->uart[uart].io;
if (io >= ARRAY_SIZE(io_addr)) {
- printk(BIOS_ERR, "KEMPLD: Bad io value '%d' for UART#%u\n.",
- io, uart);
+ printk(BIOS_ERR, "KEMPLD: Bad io value '%d' for UART#%u\n.", io, uart);
dev->enabled = false;
return;
}
const int irq = config->uart[uart].irq;
if (irq >= 16) {
- printk(BIOS_ERR, "KEMPLD: Bad irq value '%d' for UART#%u\n.",
- irq, uart);
+ printk(BIOS_ERR, "KEMPLD: Bad irq value '%d' for UART#%u\n.", irq, uart);
dev->enabled = false;
return;
}
@@ -49,9 +48,10 @@ static void kempld_uart_read_resources(struct device *dev)
const uint8_t reg = uart ? KEMPLD_UART_1 : KEMPLD_UART_0;
const uint8_t val = kempld_read8(reg);
- kempld_write8(reg, (val & ~(KEMPLD_UART_IO_MASK | KEMPLD_UART_IRQ_MASK))
- | io << KEMPLD_UART_IO_SHIFT
- | irq << KEMPLD_UART_IRQ_SHIFT);
+ kempld_write8(reg,
+ (val & ~(KEMPLD_UART_IO_MASK | KEMPLD_UART_IRQ_MASK)) |
+ io << KEMPLD_UART_IO_SHIFT |
+ irq << KEMPLD_UART_IRQ_SHIFT);
kempld_release_mutex();
}
@@ -90,9 +90,7 @@ static void kempld_enable_dev(struct device *const dev)
}
/* Fall through. */
default:
- printk(BIOS_WARNING,
- "KEMPLD: Spurious device %s.\n",
- dev_path(dev));
+ printk(BIOS_WARNING, "KEMPLD: Spurious device %s.\n", dev_path(dev));
break;
}
}
diff --git a/src/ec/kontron/kempld/kempld_i2c.c b/src/ec/kontron/kempld/kempld_i2c.c
index 8abbb4b856..b99c0e48b0 100644
--- a/src/ec/kontron/kempld/kempld_i2c.c
+++ b/src/ec/kontron/kempld/kempld_i2c.c
@@ -151,8 +151,7 @@ static int kempld_i2c_process(struct kempld_i2c_data *const i2c)
i2c->state = STATE_ADDR;
return 0;
}
- i2c->state = (msg->flags & I2C_M_RD)
- ? STATE_READ : STATE_WRITE;
+ i2c->state = (msg->flags & I2C_M_RD) ? STATE_READ : STATE_WRITE;
} else {
i2c->state = STATE_DONE;
kempld_write8(KEMPLD_I2C_CMD, I2C_CMD_STOP);