michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: i2c: nios2: const driver config

Browse source 
Moves the nios2 msgdma driver device config struct to the device data
struct for mutable data. The config struct is expected to be const.

Signed-off-by: Tom Burdick <thomas.burdick@intel.com>
This commit is contained in:
Tom Burdick 2022-02-22 16:05:14 -06:00 • committed by Anas Nashif
commit 82449f6749
1 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

60
drivers/i2c/i2c_nios2.c
View file

@ -19,18 +19,20 @@ LOG_MODULE_REGISTER(i2c_nios2);
#define NIOS2_I2C_TIMEOUT_USEC 1000 #define NIOS2_I2C_TIMEOUT_USEC 1000
struct i2c_nios2_config { struct i2c_nios2_data {
ALT_AVALON_I2C_DEV_t i2c_dev; ALT_AVALON_I2C_DEV_t i2c_dev;
IRQ_DATA_t irq_data; IRQ_DATA_t irq_data;
struct k_sem sem_lock; struct k_sem sem_lock;
}; };
static int i2c_nios2_configure(const struct device *dev, uint32_t dev_config) static int
i2c_nios2_configure(const struct device *dev, uint32_t dev_config)
{ {
struct i2c_nios2_config *config = (struct i2c_nios2_config *)dev->config; struct i2c_nios2_data *data = (struct i2c_nios2_data *)dev->data;
int32_t rc = 0; int32_t rc = 0;
k_sem_take(&config->sem_lock, K_FOREVER); k_sem_take(&data->sem_lock, K_FOREVER);
if (!(I2C_MODE_MASTER & dev_config)) { if (!(I2C_MODE_MASTER & dev_config)) {
LOG_ERR("i2c config mode error\n"); LOG_ERR("i2c config mode error\n");
rc = -EINVAL; rc = -EINVAL;
@ -49,25 +51,25 @@ static int i2c_nios2_configure(const struct device *dev, uint32_t dev_config)
goto i2c_cfg_err; goto i2c_cfg_err;
} }
alt_avalon_i2c_init(&config->i2c_dev); alt_avalon_i2c_init(&data->i2c_dev);
i2c_cfg_err: i2c_cfg_err:
k_sem_give(&config->sem_lock); k_sem_give(&data->sem_lock);
return rc; return rc;
} }
static int i2c_nios2_transfer(const struct device *dev, struct i2c_msg *msgs, static int i2c_nios2_transfer(const struct device *dev, struct i2c_msg *msgs,
uint8_t num_msgs, uint16_t addr) uint8_t num_msgs, uint16_t addr)
{ {
struct i2c_nios2_config *config = (struct i2c_nios2_config *)dev->config; struct i2c_nios2_data *data = (struct i2c_nios2_data *)dev->data;
ALT_AVALON_I2C_STATUS_CODE status; ALT_AVALON_I2C_STATUS_CODE status;
uint32_t restart, stop; uint32_t restart, stop;
int32_t i, timeout, rc = 0; int32_t i, timeout, rc = 0;
k_sem_take(&config->sem_lock, K_FOREVER); k_sem_take(&data->sem_lock, K_FOREVER);
/* register the optional interrupt callback */ /* register the optional interrupt callback */
alt_avalon_i2c_register_optional_irq_handler( alt_avalon_i2c_register_optional_irq_handler(
&config->i2c_dev, &config->irq_data); &data->i2c_dev, &data->irq_data);
/* Iterate over all the messages */ /* Iterate over all the messages */
for (i = 0; i < num_msgs; i++) { for (i = 0; i < num_msgs; i++) {
@ -87,17 +89,17 @@ static int i2c_nios2_transfer(const struct device *dev, struct i2c_msg *msgs,
} }
/* Set the slave device address */ /* Set the slave device address */
alt_avalon_i2c_master_target_set(&config->i2c_dev, addr); alt_avalon_i2c_master_target_set(&data->i2c_dev, addr);
/* Start the transfer */ /* Start the transfer */
if (msgs->flags & I2C_MSG_READ) { if (msgs->flags & I2C_MSG_READ) {
status = alt_avalon_i2c_master_receive_using_interrupts( status = alt_avalon_i2c_master_receive_using_interrupts(
&config->i2c_dev, &data->i2c_dev,
msgs->buf, msgs->len, msgs->buf, msgs->len,
restart, stop); restart, stop);
} else { } else {
status = alt_avalon_i2c_master_transmit_using_interrupts status = alt_avalon_i2c_master_transmit_using_interrupts
(&config->i2c_dev, (&data->i2c_dev,
msgs->buf, msgs->len, msgs->buf, msgs->len,
restart, stop); restart, stop);
} }
@ -115,7 +117,7 @@ static int i2c_nios2_transfer(const struct device *dev, struct i2c_msg *msgs,
while (timeout) { while (timeout) {
k_busy_wait(1); k_busy_wait(1);
status = alt_avalon_i2c_interrupt_transaction_status( status = alt_avalon_i2c_interrupt_transaction_status(
&config->i2c_dev); &data->i2c_dev);
if (status == ALT_AVALON_I2C_SUCCESS) { if (status == ALT_AVALON_I2C_SUCCESS) {
break; break;
} }
@ -133,17 +135,17 @@ static int i2c_nios2_transfer(const struct device *dev, struct i2c_msg *msgs,
} }
i2c_transfer_err: i2c_transfer_err:
alt_avalon_i2c_disable(&config->i2c_dev); alt_avalon_i2c_disable(&data->i2c_dev);
k_sem_give(&config->sem_lock); k_sem_give(&data->sem_lock);
return rc; return rc;
} }
static void i2c_nios2_isr(const struct device *dev) static void i2c_nios2_isr(const struct device *dev)
{ {
struct i2c_nios2_config *config = (struct i2c_nios2_config *)dev->config; struct i2c_nios2_data *data = (struct i2c_nios2_data *)dev->data;
/* Call Altera HAL driver ISR */ /* Call Altera HAL driver ISR */
alt_handle_irq(&config->i2c_dev, DT_INST_IRQN(0)); alt_handle_irq(&data->i2c_dev, DT_INST_IRQN(0));
} }
static int i2c_nios2_init(const struct device *dev); static int i2c_nios2_init(const struct device *dev);
@ -153,7 +155,7 @@ static struct i2c_driver_api i2c_nios2_driver_api = {
.transfer = i2c_nios2_transfer, .transfer = i2c_nios2_transfer,
}; };
static struct i2c_nios2_config i2c_nios2_cfg = { static struct i2c_nios2_data i2c_nios2_dev_data = {
.i2c_dev = { .i2c_dev = {
.i2c_base = (alt_u32 *)DT_INST_REG_ADDR(0), .i2c_base = (alt_u32 *)DT_INST_REG_ADDR(0),
.irq_controller_ID = I2C_0_IRQ_INTERRUPT_CONTROLLER_ID, .irq_controller_ID = I2C_0_IRQ_INTERRUPT_CONTROLLER_ID,
@ -162,18 +164,13 @@ static struct i2c_nios2_config i2c_nios2_cfg = {
}, },
}; };
I2C_DEVICE_DT_INST_DEFINE(0, i2c_nios2_init, NULL,
NULL, &i2c_nios2_cfg,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&i2c_nios2_driver_api);
static int i2c_nios2_init(const struct device *dev) static int i2c_nios2_init(const struct device *dev)
{ {
struct i2c_nios2_config *config = (struct i2c_nios2_config *)dev->config; struct i2c_nios2_data *data = (struct i2c_nios2_data *)dev->data;
int rc; int rc;
/* initialize semaphore */ /* initialize semaphore */
k_sem_init(&config->sem_lock, 1, 1); k_sem_init(&data->sem_lock, 1, 1);
rc = i2c_nios2_configure(dev, rc = i2c_nios2_configure(dev,
I2C_MODE_MASTER | I2C_MODE_MASTER |
@ -184,10 +181,15 @@ static int i2c_nios2_init(const struct device *dev)
} }
/* clear ISR register content */ /* clear ISR register content */
alt_avalon_i2c_int_clear(&config->i2c_dev, alt_avalon_i2c_int_clear(&data->i2c_dev,
ALT_AVALON_I2C_ISR_ALL_CLEARABLE_INTS_MSK); ALT_AVALON_I2C_ISR_ALL_CLEARABLE_INTS_MSK);
IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
i2c_nios2_isr, DEVICE_DT_INST_GET(0), 0); i2c_nios2_isr, DEVICE_DT_INST_GET(0), 0);
irq_enable(DT_INST_IRQN(0)); irq_enable(DT_INST_IRQN(0));
return 0; return 0;
} }
I2C_DEVICE_DT_INST_DEFINE(0, i2c_nios2_init, NULL,
&i2c_nios2_dev_data, NULL,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&i2c_nios2_driver_api);