michaelh/zephyr
1
0
Fork 0
Code Releases Activity

canbus: rename zephyr,can-primary chosen property to zephyr,canbus

Browse source 
Rename the Zephyr chosen property for specifying the default CAN bus
controller from "zephyr,can-primary" to "zephyr,canbus".

The "zephyr,can-primary" property name was selected in antipation of
adding support for redundant CAN networks, which we have yet to
add. Meanwhile, the "primary" term causes confusion for non-redundant
CAN bus configurations (and the "can" term doesn't match the name of the
Zephyr CAN bus subsystem).

The CAN in Automation (CiA) 302-6, which deals with CANopen network
redundancy, uses the terms "default interface" and "redundant
interface". If/when we add support for redundant CAN networks, the
"zephyr,canbus" chosen property can be supplemented with a
"zephyr,canbus-redundant" chosen property.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2021-11-02 16:49:04 +01:00 • committed by Anas Nashif
commit c817a09b0a
41 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/can/can_net.c
View file

@ -380,7 +380,7 @@ static int net_can_init(const struct device *dev)
const struct device *can_dev;
struct net_can_context *ctx = dev->data;
can_dev = device_get_binding(DT_CHOSEN_ZEPHYR_CAN_PRIMARY_LABEL);
can_dev = device_get_binding(DT_CHOSEN_ZEPHYR_CANBUS_LABEL);
ctx->recv_filter_id = CAN_NET_FILTER_NOT_SET;
#ifdef CONFIG_NET_L2_CANBUS_ETH_TRANSLATOR
@ -390,7 +390,7 @@ static int net_can_init(const struct device *dev)
if (!can_dev) {
NET_ERR("Can't get binding to CAN device %s",
DT_CHOSEN_ZEPHYR_CAN_PRIMARY_LABEL);
DT_CHOSEN_ZEPHYR_CANBUS_LABEL);
return -EIO;
}