Skip to content

Commit a460479

Browse files
AlessandroLuokartben
AlessandroLuo
authored and
kartben
committed
drivers: ambiq: Correct peripheral instance calculation
This commit corrected ambiq peripheral instance calculations Signed-off-by: Hao Luo <[email protected]>
1 parent 660035d commit a460479

File tree

5 files changed

+30
-23
lines changed

5 files changed

+30
-23
lines changed

‎drivers/i2c/i2c_ambiq.c‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ struct i2c_ambiq_config {
5454
#endif /* CONFIG_I2C_AMBIQ_BUS_RECOVERY */
5555
uint32_t base;
5656
int size;
57+
int inst_idx;
5758
uint32_t bitrate;
5859
const struct pinctrl_dev_config *pcfg;
5960
void (*irq_config_func)(void);
@@ -68,7 +69,6 @@ struct i2c_ambiq_data {
6869
struct k_sem transfer_sem;
6970
i2c_ambiq_callback_t callback;
7071
void *callback_data;
71-
int inst_idx;
7272
uint32_t transfer_status;
7373
bool pm_policy_state_on;
7474
};
@@ -247,6 +247,7 @@ static int i2c_ambiq_write(const struct device *dev, struct i2c_msg *msg, uint16
247247
static int i2c_ambiq_configure(const struct device *dev, uint32_t dev_config)
248248
{
249249
struct i2c_ambiq_data *data = dev->data;
250+
const struct i2c_ambiq_config *cfg = dev->config;
250251

251252
if (!(I2C_MODE_CONTROLLER & dev_config)) {
252253
return -EINVAL;
@@ -267,7 +268,7 @@ static int i2c_ambiq_configure(const struct device *dev, uint32_t dev_config)
267268
}
268269

269270
#ifdef CONFIG_I2C_AMBIQ_DMA
270-
data->iom_cfg.pNBTxnBuf = i2c_dma_tcb_buf[data->inst_idx].buf;
271+
data->iom_cfg.pNBTxnBuf = i2c_dma_tcb_buf[cfg->inst_idx].buf;
271272
data->iom_cfg.ui32NBTxnBufLength = CONFIG_I2C_DMA_TCB_BUFFER_SIZE;
272273
#endif
273274

@@ -410,8 +411,7 @@ static int i2c_ambiq_init(const struct device *dev)
410411

411412
data->iom_cfg.eInterfaceMode = AM_HAL_IOM_I2C_MODE;
412413

413-
if (AM_HAL_STATUS_SUCCESS !=
414-
am_hal_iom_initialize((config->base - IOM0_BASE) / config->size, &data->iom_handler)) {
414+
if (AM_HAL_STATUS_SUCCESS != am_hal_iom_initialize(config->inst_idx, &data->iom_handler)) {
415415
LOG_ERR("Fail to initialize I2C\n");
416416
return -ENXIO;
417417
}
@@ -496,18 +496,17 @@ static int i2c_ambiq_pm_action(const struct device *dev, enum pm_device_action a
496496
}; \
497497
static struct i2c_ambiq_data i2c_ambiq_data##n = { \
498498
.bus_sem = Z_SEM_INITIALIZER(i2c_ambiq_data##n.bus_sem, 1, 1), \
499-
.transfer_sem = Z_SEM_INITIALIZER(i2c_ambiq_data##n.transfer_sem, 0, 1), \
500-
.inst_idx = n, \
501-
}; \
499+
.transfer_sem = Z_SEM_INITIALIZER(i2c_ambiq_data##n.transfer_sem, 0, 1)}; \
502500
static const struct i2c_ambiq_config i2c_ambiq_config##n = { \
503501
.base = DT_INST_REG_ADDR(n), \
504502
.size = DT_INST_REG_SIZE(n), \
503+
.inst_idx = (DT_INST_REG_ADDR(n) - IOM0_BASE) / (IOM1_BASE - IOM0_BASE), \
505504
.bitrate = DT_INST_PROP(n, clock_frequency), \
506505
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
507506
.irq_config_func = i2c_irq_config_func_##n, \
508-
IF_ENABLED(CONFIG_I2C_AMBIQ_BUS_RECOVERY, \
509-
(.scl = GPIO_DT_SPEC_INST_GET_OR(n, scl_gpios, {0}),\
510-
.sda = GPIO_DT_SPEC_INST_GET_OR(n, sda_gpios, {0}),)) }; \
507+
IF_ENABLED(CONFIG_I2C_AMBIQ_BUS_RECOVERY, \
508+
(.scl = GPIO_DT_SPEC_INST_GET_OR(n, scl_gpios, {0}), \
509+
.sda = GPIO_DT_SPEC_INST_GET_OR(n, sda_gpios, {0}),)) }; \
511510
PM_DEVICE_DT_INST_DEFINE(n, i2c_ambiq_pm_action); \
512511
I2C_DEVICE_DT_INST_DEFINE(n, i2c_ambiq_init, PM_DEVICE_DT_INST_GET(n), &i2c_ambiq_data##n, \
513512
&i2c_ambiq_config##n, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, \

‎drivers/mspi/mspi_ambiq_ap3.c‎

Lines changed: 10 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static int spi_ambiq_init(const struct device *dev)
175175
}
176176
#endif /* CONFIG_SPI_AMBIQ_BLEIF_TIMING_TRACE */
177177

178-
ret = am_hal_ble_initialize((cfg->base - BLEIF_BASE) / cfg->size, &data->BLEhandle);
178+
ret = am_hal_ble_initialize(0, &data->BLEhandle);
179179
if (ret) {
180180
return ret;
181181
}

‎drivers/spi/spi_ambiq_spic.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ LOG_MODULE_REGISTER(spi_ambiq);
4444
struct spi_ambiq_config {
4545
uint32_t base;
4646
int size;
47+
int inst_idx;
4748
uint32_t clock_freq;
4849
const struct pinctrl_dev_config *pcfg;
4950
void (*irq_config_func)(void);
@@ -53,7 +54,6 @@ struct spi_ambiq_data {
5354
struct spi_context ctx;
5455
am_hal_iom_config_t iom_cfg;
5556
void *iom_handler;
56-
int inst_idx;
5757
bool cont;
5858
bool pm_policy_state_on;
5959
};
@@ -244,7 +244,7 @@ static int spi_config(const struct device *dev, const struct spi_config *config)
244244
ctx->config = config;
245245

246246
#ifdef CONFIG_SPI_AMBIQ_DMA
247-
data->iom_cfg.pNBTxnBuf = spi_dma_tcb_buf[data->inst_idx].buf;
247+
data->iom_cfg.pNBTxnBuf = spi_dma_tcb_buf[cfg->inst_idx].buf;
248248
data->iom_cfg.ui32NBTxnBufLength = CONFIG_SPI_DMA_TCB_BUFFER_SIZE;
249249
#endif
250250

@@ -506,8 +506,7 @@ static int spi_ambiq_init(const struct device *dev)
506506
const struct spi_ambiq_config *cfg = dev->config;
507507
int ret = 0;
508508

509-
if (AM_HAL_STATUS_SUCCESS !=
510-
am_hal_iom_initialize((cfg->base - IOM0_BASE) / cfg->size, &data->iom_handler)) {
509+
if (AM_HAL_STATUS_SUCCESS != am_hal_iom_initialize(cfg->inst_idx, &data->iom_handler)) {
511510
LOG_ERR("Fail to initialize SPI\n");
512511
return -ENXIO;
513512
}
@@ -575,10 +574,11 @@ static int spi_ambiq_pm_action(const struct device *dev, enum pm_device_action a
575574
static struct spi_ambiq_data spi_ambiq_data##n = { \
576575
SPI_CONTEXT_INIT_LOCK(spi_ambiq_data##n, ctx), \
577576
SPI_CONTEXT_INIT_SYNC(spi_ambiq_data##n, ctx), \
578-
SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx).inst_idx = n}; \
577+
SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx)}; \
579578
static const struct spi_ambiq_config spi_ambiq_config##n = { \
580579
.base = DT_INST_REG_ADDR(n), \
581580
.size = DT_INST_REG_SIZE(n), \
581+
.inst_idx = (DT_INST_REG_ADDR(n) - IOM0_BASE) / (IOM1_BASE - IOM0_BASE), \
582582
.clock_freq = DT_INST_PROP(n, clock_frequency), \
583583
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
584584
.irq_config_func = spi_irq_config_func_##n}; \

‎drivers/spi/spi_ambiq_spid.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ LOG_MODULE_REGISTER(spi_ambiq_spid);
2222
#include "spi_context.h"
2323
#include <am_mcu_apollo.h>
2424

25+
#define SPID_ADDR_INTERVAL 1
2526
struct spi_ambiq_config {
2627
const struct gpio_dt_spec int_gpios;
2728
uint32_t base;
2829
int size;
30+
int inst_idx;
2931
const struct pinctrl_dev_config *pcfg;
3032
void (*irq_config_func)(void);
3133
};
@@ -34,7 +36,6 @@ struct spi_ambiq_data {
3436
struct spi_context ctx;
3537
am_hal_ios_config_t ios_cfg;
3638
void *ios_handler;
37-
int inst_idx;
3839
struct k_sem spim_wrcmp_sem;
3940
};
4041

@@ -331,8 +332,7 @@ static int spi_ambiq_init(const struct device *dev)
331332
const struct spi_ambiq_config *cfg = dev->config;
332333
int ret = 0;
333334

334-
if (AM_HAL_STATUS_SUCCESS !=
335-
am_hal_ios_initialize((cfg->base - IOSLAVE_BASE) / cfg->size, &data->ios_handler)) {
335+
if (AM_HAL_STATUS_SUCCESS != am_hal_ios_initialize(cfg->inst_idx, &data->ios_handler)) {
336336
LOG_ERR("Fail to initialize SPID\n");
337337
return -ENXIO;
338338
}
@@ -400,12 +400,12 @@ static int spi_ambiq_pm_action(const struct device *dev, enum pm_device_action a
400400
static struct spi_ambiq_data spi_ambiq_data##n = { \
401401
SPI_CONTEXT_INIT_LOCK(spi_ambiq_data##n, ctx), \
402402
SPI_CONTEXT_INIT_SYNC(spi_ambiq_data##n, ctx), \
403-
.spim_wrcmp_sem = Z_SEM_INITIALIZER(spi_ambiq_data##n.spim_wrcmp_sem, 0, 1), \
404-
.inst_idx = n}; \
403+
.spim_wrcmp_sem = Z_SEM_INITIALIZER(spi_ambiq_data##n.spim_wrcmp_sem, 0, 1)}; \
405404
static const struct spi_ambiq_config spi_ambiq_config##n = { \
406405
.int_gpios = GPIO_DT_SPEC_INST_GET(n, int_gpios), \
407406
.base = DT_INST_REG_ADDR(n), \
408407
.size = DT_INST_REG_SIZE(n), \
408+
.inst_idx = (DT_INST_REG_ADDR(n) - IOSLAVE_BASE) / SPID_ADDR_INTERVAL, \
409409
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
410410
.irq_config_func = spi_irq_config_func_##n}; \
411411
PM_DEVICE_DT_INST_DEFINE(n, spi_ambiq_pm_action); \

0 commit comments

Comments
 (0)