diff options
Diffstat (limited to 'zephyr/shim/src/i2c.c')
| -rw-r--r-- | zephyr/shim/src/i2c.c | 80 |
1 files changed, 14 insertions, 66 deletions
diff --git a/zephyr/shim/src/i2c.c b/zephyr/shim/src/i2c.c index 8d55876629..0074327826 100644 --- a/zephyr/shim/src/i2c.c +++ b/zephyr/shim/src/i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,11 +21,10 @@ * Initialize device bindings in i2c_devices. * This macro should be called from within DT_FOREACH_CHILD. */ -#define INIT_DEV_BINDING(id) \ - [I2C_PORT(id)] = DEVICE_DT_GET(DT_PHANDLE(id, i2c_port)), +#define INIT_DEV_BINDING(i2c_port_id) \ + [I2C_PORT_BUS(i2c_port_id)] = DEVICE_DT_GET(i2c_port_id), -#define INIT_REMOTE_PORTS(id) \ - [I2C_PORT(id)] = DT_PROP_OR(id, remote_port, -1), +#define INIT_REMOTE_PORTS(id) [I2C_PORT(id)] = DT_PROP_OR(id, remote_port, -1), #define I2C_PORT_FLAGS(id) \ COND_CODE_1(DT_PROP(id, dynamic_speed), (I2C_PORT_FLAG_DYNAMIC_SPEED), \ @@ -44,49 +43,14 @@ * Since all the ports will eventually be handled by device tree. This will * be removed at that point. */ -const struct i2c_port_t i2c_ports[] = { - DT_FOREACH_CHILD(DT_PATH(named_i2c_ports), I2C_PORT_INIT) -}; +const struct i2c_port_t i2c_ports[] = { DT_FOREACH_CHILD( + DT_PATH(named_i2c_ports), I2C_PORT_INIT) }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); -static const int i2c_remote_ports[I2C_PORT_COUNT] = { - DT_FOREACH_CHILD(DT_PATH(named_i2c_ports), INIT_REMOTE_PORTS) -}; -static int i2c_physical_ports[I2C_PORT_COUNT]; +static const int i2c_remote_ports[I2C_PORT_COUNT] = { DT_FOREACH_CHILD( + DT_PATH(named_i2c_ports), INIT_REMOTE_PORTS) }; -static const struct device *i2c_devices[I2C_PORT_COUNT] = { - DT_FOREACH_CHILD(DT_PATH(named_i2c_ports), INIT_DEV_BINDING) -}; - -static int init_device_bindings(const struct device *device) -{ - ARG_UNUSED(device); - - /* - * The EC application may lock the I2C bus for more than a single - * I2C transaction. Initialize the i2c_physical_ports[] array to map - * each named-i2c-ports child to the physical bus assignment. - */ - int i; - int physical_port = 0; - - i2c_physical_ports[0] = physical_port; - for (int child = 1; child < I2C_PORT_COUNT; child++) { - for (i = 0; i < child; i++) { - if (i2c_devices[child] == i2c_devices[i]) { - i2c_physical_ports[child] = - i2c_physical_ports[i]; - break; - } - } - if (i == child) - i2c_physical_ports[child] = ++physical_port; - } - __ASSERT(I2C_DEVICE_COUNT == 0 || - physical_port == (I2C_DEVICE_COUNT - 1), - "I2C_DEVICE_COUNT is invalid"); - return 0; -} -SYS_INIT(init_device_bindings, POST_KERNEL, 51); +static const struct device *i2c_devices[I2C_PORT_COUNT] = { I2C_FOREACH_PORT( + INIT_DEV_BINDING) }; const struct device *i2c_get_device_for_port(const int port) { @@ -110,31 +74,15 @@ int i2c_get_port_from_remote_port(int remote_port) return remote_port; } -int i2c_get_physical_port(int enum_port) -{ - int i2c_port; - - if (enum_port < 0 || enum_port >= I2C_PORT_COUNT) - return -1; - - i2c_port = i2c_physical_ports[enum_port]; - /* - * Return -1 for caller if physical port is not defined or the - * port number is out of port_mutex space. - * Please ensure the caller won't change anything if -1 received. - */ - return (i2c_port < I2C_DEVICE_COUNT) ? i2c_port : -1; -} - #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_I2C_PORTMAP -static int command_i2c_portmap(int argc, char **argv) +static int command_i2c_portmap(int argc, const char **argv) { int i; - ccprintf("Zephyr physical I2C ports (%d):\n", I2C_PORT_COUNT); - for (i = 0; i < I2C_PORT_COUNT; i++) { - ccprintf(" %d : %d\n", i, i2c_physical_ports[i]); + if (argc > 1) { + return EC_ERROR_PARAM_COUNT; } + ccprintf("Zephyr remote I2C ports (%d):\n", I2C_PORT_COUNT); for (i = 0; i < I2C_PORT_COUNT; i++) { ccprintf(" %d : %d\n", i, i2c_remote_ports[i]); |