Skip to content

Commit a050bcb

Browse files
nordic-seglrlubos
nordic-segl
authored and
rlubos
committed
[nrf fromtree] drivers: mbox: nrf: Change VEVIFs and BELLBOARD nomenclature
Renaming 'LOCAL' to 'RX' and 'REMOTE' to 'TX'. This seems more descriptive and intuitive to use. Signed-off-by: Jakub Zymelka <[email protected]> (cherry picked from commit 8091e93) Signed-off-by: Sebastian Głąb <[email protected]>
1 parent edf474b commit a050bcb

17 files changed

+314
-281
lines changed

‎drivers/mbox/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ zephyr_library_sources_ifdef(CONFIG_MBOX_NXP_S32_MRU mbox_nxp_s32_mru.c)
1010
zephyr_library_sources_ifdef(CONFIG_MBOX_NXP_IMX_MU mbox_nxp_imx_mu.c)
1111
zephyr_library_sources_ifdef(CONFIG_MBOX_NXP_MAILBOX mbox_nxp_mailbox.c)
1212
zephyr_library_sources_ifdef(CONFIG_MBOX_ANDES_PLIC_SW mbox_andes_plic_sw.c)
13-
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_VEVIF_LOCAL mbox_nrf_vevif_local.c)
14-
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_VEVIF_REMOTE mbox_nrf_vevif_remote.c)
13+
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_VEVIF_TASK_RX mbox_nrf_vevif_task_rx.c)
14+
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_VEVIF_TASK_TX mbox_nrf_vevif_task_tx.c)
1515
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_VEVIF_EVENT_RX mbox_nrf_vevif_event_rx.c)
1616
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_VEVIF_EVENT_TX mbox_nrf_vevif_event_tx.c)
17-
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_BELLBOARD_LOCAL mbox_nrf_bellboard_local.c)
18-
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_BELLBOARD_REMOTE mbox_nrf_bellboard_remote.c)
17+
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_BELLBOARD_RX mbox_nrf_bellboard_rx.c)
18+
zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_BELLBOARD_TX mbox_nrf_bellboard_tx.c)

‎drivers/mbox/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source "drivers/mbox/Kconfig.nxp_s32"
1717
source "drivers/mbox/Kconfig.nxp_imx"
1818
source "drivers/mbox/Kconfig.nxp_mailbox"
1919
source "drivers/mbox/Kconfig.andes"
20-
source "drivers/mbox/Kconfig.nrf_vevif"
20+
source "drivers/mbox/Kconfig.nrf_vevif_task"
2121
source "drivers/mbox/Kconfig.nrf_vevif_event"
2222
source "drivers/mbox/Kconfig.nrf_bellboard"
2323

‎drivers/mbox/Kconfig.nrf_bellboard‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4-
config MBOX_NRF_BELLBOARD_LOCAL
5-
bool "nRF BELLBOARD local driver"
6-
depends on DT_HAS_NORDIC_NRF_BELLBOARD_LOCAL_ENABLED
4+
config MBOX_NRF_BELLBOARD_RX
5+
bool "nRF BELLBOARD RX driver"
6+
depends on DT_HAS_NORDIC_NRF_BELLBOARD_RX_ENABLED
77
default y
88
help
9-
Mailbox driver for local Nordic nRF BELLBOARD
9+
Mailbox driver for RX Nordic nRF BELLBOARD
1010

11-
config MBOX_NRF_BELLBOARD_REMOTE
12-
bool "nRF BELLBOARD remote driver"
13-
depends on DT_HAS_NORDIC_NRF_BELLBOARD_REMOTE_ENABLED
11+
config MBOX_NRF_BELLBOARD_TX
12+
bool "nRF BELLBOARD TX driver"
13+
depends on DT_HAS_NORDIC_NRF_BELLBOARD_TX_ENABLED
1414
default y
1515
help
16-
Mailbox driver for remote Nordic nRF BELLBOARD
16+
Mailbox driver for TX Nordic nRF BELLBOARD

‎drivers/mbox/Kconfig.nrf_vevif‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎drivers/mbox/Kconfig.nrf_vevif_task‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Copyright (c) 2024 Nordic Semiconductor ASA
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
config MBOX_NRF_VEVIF_TASK_RX
5+
bool "nRF VEVIF task RX driver"
6+
depends on DT_HAS_NORDIC_NRF_VEVIF_TASK_RX_ENABLED
7+
default y
8+
help
9+
Mailbox driver for receiving VEVIF tasks on VPR as CLIC interrupts
10+
11+
config MBOX_NRF_VEVIF_TASK_TX
12+
bool "nRF VEVIF task TX driver"
13+
depends on DT_HAS_NORDIC_NRF_VEVIF_TASK_TX_ENABLED
14+
default y
15+
help
16+
Mailbox driver for transmitting VEVIF tasks to VPR as CLIC interrupts

‎drivers/mbox/mbox_nrf_bellboard_local.c‎ renamed to ‎drivers/mbox/mbox_nrf_bellboard_rx.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
#define DT_DRV_COMPAT nordic_nrf_bellboard_local
6+
#define DT_DRV_COMPAT nordic_nrf_bellboard_rx
77

88
#include <zephyr/devicetree.h>
99
#include <zephyr/drivers/mbox.h>
@@ -37,7 +37,7 @@ static mbox_callback_t cbs[NRF_BELLBOARD_EVENTS_TRIGGERED_COUNT];
3737
static void *cbs_ctx[NRF_BELLBOARD_EVENTS_TRIGGERED_COUNT];
3838
static uint32_t evt_enabled_masks[BELLBOARD_NUM_IRQS];
3939

40-
static void bellboard_local_isr(const void *parameter)
40+
static void bellboard_rx_isr(const void *parameter)
4141
{
4242
uint8_t irq_idx = (uint8_t)(uintptr_t)parameter;
4343
uint32_t int_pend;
@@ -59,15 +59,15 @@ static void bellboard_local_isr(const void *parameter)
5959
}
6060
}
6161

62-
static uint32_t bellboard_local_max_channels_get(const struct device *dev)
62+
static uint32_t bellboard_rx_max_channels_get(const struct device *dev)
6363
{
6464
ARG_UNUSED(dev);
6565

6666
return NRF_BELLBOARD_EVENTS_TRIGGERED_COUNT;
6767
}
6868

69-
static int bellboard_local_register_callback(const struct device *dev, uint32_t id,
70-
mbox_callback_t cb, void *user_data)
69+
static int bellboard_rx_register_callback(const struct device *dev, uint32_t id, mbox_callback_t cb,
70+
void *user_data)
7171
{
7272
ARG_UNUSED(dev);
7373

@@ -81,7 +81,7 @@ static int bellboard_local_register_callback(const struct device *dev, uint32_t
8181
return 0;
8282
}
8383

84-
static int bellboard_local_set_enabled(const struct device *dev, uint32_t id, bool enable)
84+
static int bellboard_rx_set_enabled(const struct device *dev, uint32_t id, bool enable)
8585
{
8686
bool valid_found = false;
8787

@@ -125,21 +125,21 @@ static int bellboard_local_set_enabled(const struct device *dev, uint32_t id, bo
125125
return 0;
126126
}
127127

128-
static const struct mbox_driver_api bellboard_local_driver_api = {
129-
.max_channels_get = bellboard_local_max_channels_get,
130-
.register_callback = bellboard_local_register_callback,
131-
.set_enabled = bellboard_local_set_enabled,
128+
static const struct mbox_driver_api bellboard_rx_driver_api = {
129+
.max_channels_get = bellboard_rx_max_channels_get,
130+
.register_callback = bellboard_rx_register_callback,
131+
.set_enabled = bellboard_rx_set_enabled,
132132
};
133133

134134
#define BELLBOARD_IRQ_CONFIGURE(name, idx) \
135135
COND_CODE_1(DT_INST_IRQ_HAS_NAME(0, name), \
136136
(IRQ_CONNECT(DT_INST_IRQ_BY_NAME(0, name, irq), \
137-
DT_INST_IRQ_BY_NAME(0, name, priority), bellboard_local_isr, \
137+
DT_INST_IRQ_BY_NAME(0, name, priority), bellboard_rx_isr, \
138138
(const void *)idx, 0); \
139139
irq_enable(DT_INST_IRQ_BY_NAME(0, name, irq));), \
140140
())
141141

142-
static int bellboard_local_init(const struct device *dev)
142+
static int bellboard_rx_init(const struct device *dev)
143143
{
144144
uint32_t evt_all_mappings =
145145
evt_mappings[0] | evt_mappings[1] | evt_mappings[2] | evt_mappings[3];
@@ -165,5 +165,5 @@ static int bellboard_local_init(const struct device *dev)
165165
return 0;
166166
}
167167

168-
DEVICE_DT_INST_DEFINE(0, bellboard_local_init, NULL, NULL, NULL, POST_KERNEL,
169-
CONFIG_MBOX_INIT_PRIORITY, &bellboard_local_driver_api);
168+
DEVICE_DT_INST_DEFINE(0, bellboard_rx_init, NULL, NULL, NULL, POST_KERNEL,
169+
CONFIG_MBOX_INIT_PRIORITY, &bellboard_rx_driver_api);

‎drivers/mbox/mbox_nrf_bellboard_remote.c‎ renamed to ‎drivers/mbox/mbox_nrf_bellboard_tx.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
#define DT_DRV_COMPAT nordic_nrf_bellboard_remote
6+
#define DT_DRV_COMPAT nordic_nrf_bellboard_tx
77

88
#include <zephyr/devicetree.h>
99
#include <zephyr/drivers/mbox.h>
1010

1111
#include <haly/nrfy_bellboard.h>
1212

13-
struct mbox_bellboard_remote_conf {
13+
struct mbox_bellboard_tx_conf {
1414
NRF_BELLBOARD_Type *bellboard;
1515
};
1616

17-
static int bellboard_remote_send(const struct device *dev, uint32_t id, const struct mbox_msg *msg)
17+
static int bellboard_tx_send(const struct device *dev, uint32_t id, const struct mbox_msg *msg)
1818
{
19-
const struct mbox_bellboard_remote_conf *config = dev->config;
19+
const struct mbox_bellboard_tx_conf *config = dev->config;
2020

2121
if (id >= BELLBOARD_TASKS_TRIGGER_MaxCount) {
2222
return -EINVAL;
@@ -31,32 +31,32 @@ static int bellboard_remote_send(const struct device *dev, uint32_t id, const st
3131
return 0;
3232
}
3333

34-
static int bellboard_remote_mtu_get(const struct device *dev)
34+
static int bellboard_tx_mtu_get(const struct device *dev)
3535
{
3636
ARG_UNUSED(dev);
3737

3838
return 0;
3939
}
4040

41-
static uint32_t bellboard_remote_max_channels_get(const struct device *dev)
41+
static uint32_t bellboard_tx_max_channels_get(const struct device *dev)
4242
{
4343
ARG_UNUSED(dev);
4444

4545
return BELLBOARD_TASKS_TRIGGER_MaxCount;
4646
}
4747

48-
static const struct mbox_driver_api bellboard_remote_driver_api = {
49-
.send = bellboard_remote_send,
50-
.mtu_get = bellboard_remote_mtu_get,
51-
.max_channels_get = bellboard_remote_max_channels_get,
48+
static const struct mbox_driver_api bellboard_tx_driver_api = {
49+
.send = bellboard_tx_send,
50+
.mtu_get = bellboard_tx_mtu_get,
51+
.max_channels_get = bellboard_tx_max_channels_get,
5252
};
5353

5454
#define BELLBOARD_REMOTE_DEFINE(inst) \
55-
static const struct mbox_bellboard_remote_conf conf##inst = { \
55+
static const struct mbox_bellboard_tx_conf conf##inst = { \
5656
.bellboard = (NRF_BELLBOARD_Type *)DT_INST_REG_ADDR(inst), \
5757
}; \
5858
\
5959
DEVICE_DT_INST_DEFINE(inst, NULL, NULL, NULL, &conf##inst, POST_KERNEL, \
60-
CONFIG_MBOX_INIT_PRIORITY, &bellboard_remote_driver_api);
60+
CONFIG_MBOX_INIT_PRIORITY, &bellboard_tx_driver_api);
6161

6262
DT_INST_FOREACH_STATUS_OKAY(BELLBOARD_REMOTE_DEFINE)

‎drivers/mbox/mbox_nrf_vevif_local.c‎

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)