Skip to content

Commit c0a81ac

Browse files
AlessandroLuoAlessandroLuo
committed
drivers: ambiq: Correct peripheral instance calculation
This commit corrected ambiq peripheral instance calculations Signed-off-by: Hao Luo <hluo@ambiq.com>
1 parent d19abff commit c0a81ac

File tree

5 files changed

+31
-23
lines changed

5 files changed

+31
-23
lines changed

‎drivers/i2c/i2c_ambiq.c

+9-10
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ struct i2c_ambiq_config {
5757
#endif /* CONFIG_I2C_AMBIQ_BUS_RECOVERY */
5858
uint32_t base;
5959
int size;
60+
int inst_idx;
6061
uint32_t bitrate;
6162
const struct pinctrl_dev_config *pcfg;
6263
ambiq_i2c_pwr_func_t pwr_func;
@@ -72,7 +73,6 @@ struct i2c_ambiq_data {
7273
struct k_sem transfer_sem;
7374
i2c_ambiq_callback_t callback;
7475
void *callback_data;
75-
int inst_idx;
7676
uint32_t transfer_status;
7777
bool pm_policy_state_on;
7878
};
@@ -251,6 +251,7 @@ static int i2c_ambiq_write(const struct device *dev, struct i2c_msg *msg, uint16
251251
static int i2c_ambiq_configure(const struct device *dev, uint32_t dev_config)
252252
{
253253
struct i2c_ambiq_data *data = dev->data;
254+
const struct i2c_ambiq_config *cfg = dev->config;
254255

255256
if (!(I2C_MODE_CONTROLLER & dev_config)) {
256257
return -EINVAL;
@@ -271,7 +272,7 @@ static int i2c_ambiq_configure(const struct device *dev, uint32_t dev_config)
271272
}
272273

273274
#ifdef CONFIG_I2C_AMBIQ_DMA
274-
data->iom_cfg.pNBTxnBuf = i2c_dma_tcb_buf[data->inst_idx].buf;
275+
data->iom_cfg.pNBTxnBuf = i2c_dma_tcb_buf[cfg->inst_idx].buf;
275276
data->iom_cfg.ui32NBTxnBufLength = CONFIG_I2C_DMA_TCB_BUFFER_SIZE;
276277
#endif
277278

@@ -414,8 +415,7 @@ static int i2c_ambiq_init(const struct device *dev)
414415

415416
data->iom_cfg.eInterfaceMode = AM_HAL_IOM_I2C_MODE;
416417

417-
if (AM_HAL_STATUS_SUCCESS !=
418-
am_hal_iom_initialize((config->base - IOM0_BASE) / config->size, &data->iom_handler)) {
418+
if (AM_HAL_STATUS_SUCCESS != am_hal_iom_initialize(config->inst_idx, &data->iom_handler)) {
419419
LOG_ERR("Fail to initialize I2C\n");
420420
return -ENXIO;
421421
}
@@ -508,19 +508,18 @@ static int i2c_ambiq_pm_action(const struct device *dev, enum pm_device_action a
508508
}; \
509509
static struct i2c_ambiq_data i2c_ambiq_data##n = { \
510510
.bus_sem = Z_SEM_INITIALIZER(i2c_ambiq_data##n.bus_sem, 1, 1), \
511-
.transfer_sem = Z_SEM_INITIALIZER(i2c_ambiq_data##n.transfer_sem, 0, 1), \
512-
.inst_idx = n, \
513-
}; \
511+
.transfer_sem = Z_SEM_INITIALIZER(i2c_ambiq_data##n.transfer_sem, 0, 1)}; \
514512
static const struct i2c_ambiq_config i2c_ambiq_config##n = { \
515513
.base = DT_INST_REG_ADDR(n), \
516514
.size = DT_INST_REG_SIZE(n), \
515+
.inst_idx = (DT_INST_REG_ADDR(n) - IOM0_BASE) / (IOM1_BASE - IOM0_BASE), \
517516
.bitrate = DT_INST_PROP(n, clock_frequency), \
518517
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
519518
.irq_config_func = i2c_irq_config_func_##n, \
520519
.pwr_func = pwr_on_ambiq_i2c_##n, \
521-
IF_ENABLED(CONFIG_I2C_AMBIQ_BUS_RECOVERY, \
522-
(.scl = GPIO_DT_SPEC_INST_GET_OR(n, scl_gpios, {0}),\
523-
.sda = GPIO_DT_SPEC_INST_GET_OR(n, sda_gpios, {0}),)) }; \
520+
IF_ENABLED(CONFIG_I2C_AMBIQ_BUS_RECOVERY, \
521+
(.scl = GPIO_DT_SPEC_INST_GET_OR(n, scl_gpios, {0}), \
522+
.sda = GPIO_DT_SPEC_INST_GET_OR(n, sda_gpios, {0}),)) }; \
524523
PM_DEVICE_DT_INST_DEFINE(n, i2c_ambiq_pm_action); \
525524
I2C_DEVICE_DT_INST_DEFINE(n, i2c_ambiq_init, PM_DEVICE_DT_INST_GET(n), &i2c_ambiq_data##n, \
526525
&i2c_ambiq_config##n, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, \

‎drivers/mspi/mspi_ambiq_ap3.c

+10-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ LOG_MODULE_REGISTER(mspi_ambiq_ap3);
2626
#define PWRCTRL_MAX_WAIT_US 5
2727
#define MSPI_BUSY BIT(2)
2828

29+
#if defined(CONFIG_SOC_APOLLO3_BLUE)
30+
#define MSPI_BASE_ADDR MSPI_BASE
31+
#define MSPI_ADDR_INTERVAL 1
32+
#else
33+
#define MSPI_BASE_ADDR MSPI0_BASE
34+
#define MSPI_ADDR_INTERVAL (MSPI1_BASE - MSPI0_BASE)
35+
#endif
36+
2937
typedef int (*mspi_ambiq_pwr_func_t)(void);
3038
typedef void (*irq_config_func_t)(void);
3139

@@ -1356,8 +1364,8 @@ static DEVICE_API(mspi, mspi_ambiq_driver_api) = {
13561364

13571365
#define MSPI_CONFIG(n) \
13581366
{ \
1359-
.channel_num = (DT_INST_REG_ADDR(n) - MSPI0_BASE) / \
1360-
(DT_INST_REG_SIZE(n) * 4), \
1367+
.channel_num = (DT_INST_REG_ADDR(n) - MSPI_BASE_ADDR) / \
1368+
MSPI_ADDR_INTERVAL, \
13611369
.op_mode = MSPI_OP_MODE_CONTROLLER, \
13621370
.duplex = MSPI_HALF_DUPLEX, \
13631371
.max_freq = MSPI_MAX_FREQ, \

‎drivers/spi/spi_ambiq_bleif.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static int spi_ambiq_init(const struct device *dev)
180180
}
181181
#endif /* CONFIG_SPI_AMBIQ_BLEIF_TIMING_TRACE */
182182

183-
ret = am_hal_ble_initialize((cfg->base - BLEIF_BASE) / cfg->size, &data->BLEhandle);
183+
ret = am_hal_ble_initialize(0, &data->BLEhandle);
184184
if (ret) {
185185
return ret;
186186
}

‎drivers/spi/spi_ambiq_spic.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ typedef int (*ambiq_spi_pwr_func_t)(void);
4848
struct spi_ambiq_config {
4949
uint32_t base;
5050
int size;
51+
int inst_idx;
5152
uint32_t clock_freq;
5253
const struct pinctrl_dev_config *pcfg;
5354
ambiq_spi_pwr_func_t pwr_func;
@@ -58,7 +59,6 @@ struct spi_ambiq_data {
5859
struct spi_context ctx;
5960
am_hal_iom_config_t iom_cfg;
6061
void *iom_handler;
61-
int inst_idx;
6262
bool cont;
6363
bool pm_policy_state_on;
6464
};
@@ -249,7 +249,7 @@ static int spi_config(const struct device *dev, const struct spi_config *config)
249249
ctx->config = config;
250250

251251
#ifdef CONFIG_SPI_AMBIQ_DMA
252-
data->iom_cfg.pNBTxnBuf = spi_dma_tcb_buf[data->inst_idx].buf;
252+
data->iom_cfg.pNBTxnBuf = spi_dma_tcb_buf[cfg->inst_idx].buf;
253253
data->iom_cfg.ui32NBTxnBufLength = CONFIG_SPI_DMA_TCB_BUFFER_SIZE;
254254
#endif
255255

@@ -511,8 +511,7 @@ static int spi_ambiq_init(const struct device *dev)
511511
const struct spi_ambiq_config *cfg = dev->config;
512512
int ret = 0;
513513

514-
if (AM_HAL_STATUS_SUCCESS !=
515-
am_hal_iom_initialize((cfg->base - IOM0_BASE) / cfg->size, &data->iom_handler)) {
514+
if (AM_HAL_STATUS_SUCCESS != am_hal_iom_initialize(cfg->inst_idx, &data->iom_handler)) {
516515
LOG_ERR("Fail to initialize SPI\n");
517516
return -ENXIO;
518517
}
@@ -588,10 +587,11 @@ static int spi_ambiq_pm_action(const struct device *dev, enum pm_device_action a
588587
static struct spi_ambiq_data spi_ambiq_data##n = { \
589588
SPI_CONTEXT_INIT_LOCK(spi_ambiq_data##n, ctx), \
590589
SPI_CONTEXT_INIT_SYNC(spi_ambiq_data##n, ctx), \
591-
SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx).inst_idx = n}; \
590+
SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx)}; \
592591
static const struct spi_ambiq_config spi_ambiq_config##n = { \
593592
.base = DT_INST_REG_ADDR(n), \
594593
.size = DT_INST_REG_SIZE(n), \
594+
.inst_idx = (DT_INST_REG_ADDR(n) - IOM0_BASE) / (IOM1_BASE - IOM0_BASE), \
595595
.clock_freq = DT_INST_PROP(n, clock_frequency), \
596596
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
597597
.irq_config_func = spi_irq_config_func_##n, \

‎drivers/spi/spi_ambiq_spid.c

+6-5
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@ LOG_MODULE_REGISTER(spi_ambiq_spid);
2424

2525
#define AMBIQ_SPID_PWRCTRL_MAX_WAIT_US 5
2626

27+
#define SPID_ADDR_INTERVAL 1
28+
2729
typedef int (*ambiq_spi_pwr_func_t)(void);
2830

2931
struct spi_ambiq_config {
3032
const struct gpio_dt_spec int_gpios;
3133
uint32_t base;
3234
int size;
35+
int inst_idx;
3336
const struct pinctrl_dev_config *pcfg;
3437
ambiq_spi_pwr_func_t pwr_func;
3538
void (*irq_config_func)(void);
@@ -39,7 +42,6 @@ struct spi_ambiq_data {
3942
struct spi_context ctx;
4043
am_hal_ios_config_t ios_cfg;
4144
void *ios_handler;
42-
int inst_idx;
4345
struct k_sem spim_wrcmp_sem;
4446
};
4547

@@ -336,8 +338,7 @@ static int spi_ambiq_init(const struct device *dev)
336338
const struct spi_ambiq_config *cfg = dev->config;
337339
int ret = 0;
338340

339-
if (AM_HAL_STATUS_SUCCESS !=
340-
am_hal_ios_initialize((cfg->base - IOSLAVE_BASE) / cfg->size, &data->ios_handler)) {
341+
if (AM_HAL_STATUS_SUCCESS != am_hal_ios_initialize(cfg->inst_idx, &data->ios_handler)) {
341342
LOG_ERR("Fail to initialize SPID\n");
342343
return -ENXIO;
343344
}
@@ -413,12 +414,12 @@ static int spi_ambiq_pm_action(const struct device *dev, enum pm_device_action a
413414
static struct spi_ambiq_data spi_ambiq_data##n = { \
414415
SPI_CONTEXT_INIT_LOCK(spi_ambiq_data##n, ctx), \
415416
SPI_CONTEXT_INIT_SYNC(spi_ambiq_data##n, ctx), \
416-
.spim_wrcmp_sem = Z_SEM_INITIALIZER(spi_ambiq_data##n.spim_wrcmp_sem, 0, 1), \
417-
.inst_idx = n}; \
417+
.spim_wrcmp_sem = Z_SEM_INITIALIZER(spi_ambiq_data##n.spim_wrcmp_sem, 0, 1)}; \
418418
static const struct spi_ambiq_config spi_ambiq_config##n = { \
419419
.int_gpios = GPIO_DT_SPEC_INST_GET(n, int_gpios), \
420420
.base = DT_INST_REG_ADDR(n), \
421421
.size = DT_INST_REG_SIZE(n), \
422+
.inst_idx = (DT_INST_REG_ADDR(n) - IOSLAVE_BASE) / SPID_ADDR_INTERVAL, \
422423
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
423424
.irq_config_func = spi_irq_config_func_##n, \
424425
.pwr_func = pwr_on_ambiq_spi_##n}; \

0 commit comments

Comments
 (0)