From ad2e863f39de9f896ecbc045f818dfbf9537e989 Mon Sep 17 00:00:00 2001 From: Gerson Fernando Budke Date: Fri, 23 Feb 2024 09:53:00 +0100 Subject: [PATCH] soc: atmel: Use new family prefix The newer HWMv2 impose a different semantic in the family names. This update from SOC_FAMILY_SAMx to SOC_FAMILY_ATMEL_SAMx to comply with. Fixes #69046 Signed-off-by: Gerson Fernando Budke --- drivers/ethernet/eth_sam_gmac.c | 12 ++++++------ drivers/ethernet/eth_sam_gmac_priv.h | 2 +- drivers/hwinfo/Kconfig | 6 +++--- drivers/mdio/mdio_sam.c | 8 ++++---- drivers/sensor/qdec_sam/Kconfig | 2 +- .../zephyr/drivers/pinctrl/pinctrl_soc_sam_common.h | 4 ++-- modules/Kconfig.atmel | 2 +- samples/drivers/counter/alarm/src/main.c | 2 +- soc/atmel/sam/Kconfig | 6 +++--- soc/atmel/sam/Kconfig.defconfig | 4 ++-- soc/atmel/sam/Kconfig.soc | 4 ++-- soc/atmel/sam/common/Kconfig | 4 ++-- soc/atmel/sam/sam3x/Kconfig.soc | 2 +- soc/atmel/sam/sam4e/Kconfig.soc | 2 +- soc/atmel/sam/sam4l/Kconfig.soc | 2 +- soc/atmel/sam/sam4s/Kconfig.soc | 2 +- soc/atmel/sam/same70/Kconfig.soc | 2 +- soc/atmel/sam/samv71/Kconfig.soc | 2 +- soc/atmel/sam0/Kconfig | 6 +++--- soc/atmel/sam0/Kconfig.defconfig | 4 ++-- soc/atmel/sam0/Kconfig.soc | 8 ++++---- soc/atmel/sam0/samc20/Kconfig.soc | 2 +- soc/atmel/sam0/samc21/Kconfig.soc | 2 +- soc/atmel/sam0/samd20/Kconfig.soc | 2 +- soc/atmel/sam0/samd21/Kconfig.soc | 2 +- soc/atmel/sam0/samd51/Kconfig.soc | 2 +- soc/atmel/sam0/same51/Kconfig.soc | 2 +- soc/atmel/sam0/same53/Kconfig.soc | 2 +- soc/atmel/sam0/same54/Kconfig.soc | 2 +- soc/atmel/sam0/saml21/Kconfig.soc | 2 +- soc/atmel/sam0/samr21/Kconfig.soc | 2 +- soc/atmel/sam0/samr34/Kconfig.soc | 2 +- soc/atmel/sam0/samr35/Kconfig.soc | 2 +- tests/drivers/uart/uart_async_api/testcase.yaml | 2 +- 34 files changed, 56 insertions(+), 56 deletions(-) diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c index 80d43f3616c..1b559a9e0dc 100644 --- a/drivers/ethernet/eth_sam_gmac.c +++ b/drivers/ethernet/eth_sam_gmac.c @@ -19,7 +19,7 @@ * - no statistics collection */ -#if defined(CONFIG_SOC_FAMILY_SAM) +#if defined(CONFIG_SOC_FAMILY_ATMEL_SAM) #define DT_DRV_COMPAT atmel_sam_gmac #else #define DT_DRV_COMPAT atmel_sam0_gmac @@ -51,7 +51,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include "eth.h" -#ifdef CONFIG_SOC_FAMILY_SAM0 +#ifdef CONFIG_SOC_FAMILY_ATMEL_SAM0 #include "eth_sam0_gmac.h" #endif @@ -97,9 +97,9 @@ static inline void dcache_clean(uint32_t addr, uint32_t size) #define dcache_clean(addr, size) #endif -#ifdef CONFIG_SOC_FAMILY_SAM0 +#ifdef CONFIG_SOC_FAMILY_ATMEL_SAM0 #define MCK_FREQ_HZ SOC_ATMEL_SAM0_MCK_FREQ_HZ -#elif CONFIG_SOC_FAMILY_SAM +#elif CONFIG_SOC_FAMILY_ATMEL_SAM #define MCK_FREQ_HZ SOC_ATMEL_SAM_MCK_FREQ_HZ #else #error Unsupported SoC family @@ -1796,7 +1796,7 @@ static int eth_initialize(const struct device *dev) cfg->config_func(); -#ifdef CONFIG_SOC_FAMILY_SAM +#ifdef CONFIG_SOC_FAMILY_ATMEL_SAM /* Enable GMAC module's clock */ (void)clock_control_on(SAM_DT_PMC_CONTROLLER, (clock_control_subsys_t)&cfg->clock_cfg); @@ -2235,7 +2235,7 @@ PINCTRL_DT_INST_DEFINE(0); static const struct eth_sam_dev_cfg eth0_config = { .regs = (Gmac *)DT_INST_REG_ADDR(0), .pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(0), -#ifdef CONFIG_SOC_FAMILY_SAM +#ifdef CONFIG_SOC_FAMILY_ATMEL_SAM .clock_cfg = SAM_DT_INST_CLOCK_PMC_CFG(0), #endif .config_func = eth0_irq_config, diff --git a/drivers/ethernet/eth_sam_gmac_priv.h b/drivers/ethernet/eth_sam_gmac_priv.h index 21765d5c57f..8fd5a2b257b 100644 --- a/drivers/ethernet/eth_sam_gmac_priv.h +++ b/drivers/ethernet/eth_sam_gmac_priv.h @@ -261,7 +261,7 @@ struct gmac_queue { /* Device constant configuration parameters */ struct eth_sam_dev_cfg { Gmac *regs; -#ifdef CONFIG_SOC_FAMILY_SAM +#ifdef CONFIG_SOC_FAMILY_ATMEL_SAM const struct atmel_sam_pmc_config clock_cfg; #endif const struct pinctrl_dev_config *pcfg; diff --git a/drivers/hwinfo/Kconfig b/drivers/hwinfo/Kconfig index 4d0dcdec61f..4f05d0b9c9b 100644 --- a/drivers/hwinfo/Kconfig +++ b/drivers/hwinfo/Kconfig @@ -124,14 +124,14 @@ config HWINFO_RPI_PICO config HWINFO_SAM_RSTC bool "Atmel SAM reset cause" default y - depends on SOC_FAMILY_SAM && !SOC_SERIES_SAM4L + depends on SOC_FAMILY_ATMEL_SAM && !SOC_SERIES_SAM4L help Enable Atmel SAM reset cause hwinfo driver. config HWINFO_SAM bool "Atmel SAM device ID" default y - depends on SOC_FAMILY_SAM && !SOC_SERIES_SAM4L + depends on SOC_FAMILY_ATMEL_SAM && !SOC_SERIES_SAM4L help Enable Atmel SAM device ID hwinfo driver. @@ -145,7 +145,7 @@ config HWINFO_SAM4L config HWINFO_SAM0 bool "Atmel SAM0 device ID" default y - depends on SOC_FAMILY_SAM0 + depends on SOC_FAMILY_ATMEL_SAM0 help Enable Atmel SAM0 hwinfo driver. diff --git a/drivers/mdio/mdio_sam.c b/drivers/mdio/mdio_sam.c index 5665057f7c9..216e0dd80f4 100644 --- a/drivers/mdio/mdio_sam.c +++ b/drivers/mdio/mdio_sam.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(mdio_sam, CONFIG_MDIO_LOG_LEVEL); /* GMAC */ -#ifdef CONFIG_SOC_FAMILY_SAM0 +#ifdef CONFIG_SOC_FAMILY_ATMEL_SAM0 #define GMAC_MAN MAN.reg #define GMAC_NSR NSR.reg #define GMAC_NCR NCR.reg @@ -34,7 +34,7 @@ struct mdio_sam_dev_data { struct mdio_sam_dev_config { Gmac * const regs; const struct pinctrl_dev_config *pcfg; -#ifdef CONFIG_SOC_FAMILY_SAM +#ifdef CONFIG_SOC_FAMILY_ATMEL_SAM const struct atmel_sam_pmc_config clock_cfg; #endif }; @@ -144,7 +144,7 @@ static int mdio_sam_initialize(const struct device *dev) k_sem_init(&data->sem, 1, 1); -#ifdef CONFIG_SOC_FAMILY_SAM +#ifdef CONFIG_SOC_FAMILY_ATMEL_SAM /* Enable GMAC module's clock */ (void) clock_control_on(SAM_DT_PMC_CONTROLLER, (clock_control_subsys_t) &cfg->clock_cfg); #else @@ -168,7 +168,7 @@ static const struct mdio_driver_api mdio_sam_driver_api = { }; #define MDIO_SAM_CLOCK(n) \ - COND_CODE_1(CONFIG_SOC_FAMILY_SAM, \ + COND_CODE_1(CONFIG_SOC_FAMILY_ATMEL_SAM, \ (.clock_cfg = SAM_DT_INST_CLOCK_PMC_CFG(n),), () \ ) diff --git a/drivers/sensor/qdec_sam/Kconfig b/drivers/sensor/qdec_sam/Kconfig index 32f05769537..45daf9e56a5 100644 --- a/drivers/sensor/qdec_sam/Kconfig +++ b/drivers/sensor/qdec_sam/Kconfig @@ -8,6 +8,6 @@ config QDEC_SAM bool "Atmel SAM QDEC driver" default y depends on DT_HAS_ATMEL_SAM_TC_QDEC_ENABLED - depends on SOC_FAMILY_SAM + depends on SOC_FAMILY_ATMEL_SAM help Atmel SAM MCU family Quadrature Decoder (TC) driver. diff --git a/include/zephyr/drivers/pinctrl/pinctrl_soc_sam_common.h b/include/zephyr/drivers/pinctrl/pinctrl_soc_sam_common.h index 2dc7e53b13e..214b08b26f5 100644 --- a/include/zephyr/drivers/pinctrl/pinctrl_soc_sam_common.h +++ b/include/zephyr/drivers/pinctrl/pinctrl_soc_sam_common.h @@ -38,14 +38,14 @@ typedef uint32_t pinctrl_soc_pin_t; * @param prop Property name. * @param idx Property entry index. */ -#if defined(CONFIG_SOC_FAMILY_SAM) +#if defined(CONFIG_SOC_FAMILY_ATMEL_SAM) #define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx) \ ((DT_PROP_BY_IDX(node_id, prop, idx) << SAM_PINCTRL_PINMUX_POS) \ | (DT_PROP(node_id, bias_pull_up) << SAM_PINCTRL_PULLUP_POS) \ | (DT_PROP(node_id, bias_pull_down) << SAM_PINCTRL_PULLDOWN_POS) \ | (DT_PROP(node_id, drive_open_drain) << SAM_PINCTRL_OPENDRAIN_POS) \ ), -#else /* CONFIG_SOC_FAMILY_SAM0 */ +#else /* CONFIG_SOC_FAMILY_ATMEL_SAM0 */ #define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx) \ ((DT_PROP_BY_IDX(node_id, prop, idx) << SAM_PINCTRL_PINMUX_POS) \ | (DT_PROP(node_id, bias_pull_up) << SAM_PINCTRL_PULLUP_POS) \ diff --git a/modules/Kconfig.atmel b/modules/Kconfig.atmel index 980762585dd..a5605146ad9 100644 --- a/modules/Kconfig.atmel +++ b/modules/Kconfig.atmel @@ -6,7 +6,7 @@ config ASF bool select HAS_CMSIS_CORE - depends on SOC_FAMILY_SAM || SOC_FAMILY_SAM0 + depends on SOC_FAMILY_ATMEL_SAM || SOC_FAMILY_ATMEL_SAM0 config ATMEL_WINC1500 bool diff --git a/samples/drivers/counter/alarm/src/main.c b/samples/drivers/counter/alarm/src/main.c index af8bb600c55..2b009068ba9 100644 --- a/samples/drivers/counter/alarm/src/main.c +++ b/samples/drivers/counter/alarm/src/main.c @@ -17,7 +17,7 @@ struct counter_alarm_cfg alarm_cfg; #if defined(CONFIG_BOARD_SAMD20_XPRO) #define TIMER DT_NODELABEL(tc4) -#elif defined(CONFIG_SOC_FAMILY_SAM) +#elif defined(CONFIG_SOC_FAMILY_ATMEL_SAM) #define TIMER DT_NODELABEL(tc0) #elif defined(CONFIG_COUNTER_MICROCHIP_MCP7940N) #define TIMER DT_NODELABEL(extrtc0) diff --git a/soc/atmel/sam/Kconfig b/soc/atmel/sam/Kconfig index 1154f04961a..68228c4d3e7 100644 --- a/soc/atmel/sam/Kconfig +++ b/soc/atmel/sam/Kconfig @@ -1,12 +1,12 @@ # Copyright (c) 2024 Gerson Fernando Budke # SPDX-License-Identifier: Apache-2.0 -config SOC_FAMILY_SAM +config SOC_FAMILY_ATMEL_SAM select ASF select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE -if SOC_FAMILY_SAM +if SOC_FAMILY_ATMEL_SAM rsource "*/Kconfig" -endif # SOC_FAMILY_SAM +endif # SOC_FAMILY_ATMEL_SAM diff --git a/soc/atmel/sam/Kconfig.defconfig b/soc/atmel/sam/Kconfig.defconfig index 8cf4c2ba4d2..49ad6145223 100644 --- a/soc/atmel/sam/Kconfig.defconfig +++ b/soc/atmel/sam/Kconfig.defconfig @@ -4,7 +4,7 @@ # Copyright (c) 2024 Gerson Fernando Budke # SPDX-License-Identifier: Apache-2.0 -if SOC_FAMILY_SAM +if SOC_FAMILY_ATMEL_SAM rsource "*/Kconfig.defconfig" @@ -23,4 +23,4 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC config WATCHDOG default y -endif # SOC_FAMILY_SAM +endif # SOC_FAMILY_ATMEL_SAM diff --git a/soc/atmel/sam/Kconfig.soc b/soc/atmel/sam/Kconfig.soc index e52a46a1dc7..5f65786c86b 100644 --- a/soc/atmel/sam/Kconfig.soc +++ b/soc/atmel/sam/Kconfig.soc @@ -1,10 +1,10 @@ # Copyright (c) 2024 Gerson Fernando Budke # SPDX-License-Identifier: Apache-2.0 -config SOC_FAMILY_SAM +config SOC_FAMILY_ATMEL_SAM bool config SOC_FAMILY - default "atmel_sam" if SOC_FAMILY_SAM + default "atmel_sam" if SOC_FAMILY_ATMEL_SAM rsource "*/Kconfig.soc" diff --git a/soc/atmel/sam/common/Kconfig b/soc/atmel/sam/common/Kconfig index def4e019379..2642a40eda7 100644 --- a/soc/atmel/sam/common/Kconfig +++ b/soc/atmel/sam/common/Kconfig @@ -3,7 +3,7 @@ # Copyright (c) 2024 Gerson Fernando Budke # SPDX-License-Identifier: Apache-2.0 -if SOC_FAMILY_SAM && !SOC_SERIES_SAM4L +if SOC_FAMILY_ATMEL_SAM && !SOC_SERIES_SAM4L menu "Clocks" @@ -93,4 +93,4 @@ config SOC_ATMEL_SAM_DISABLE_ERASE_PIN option will switch the pin to general IO mode giving control of the pin to the GPIO module. -endif # SOC_FAMILY_SAM && !SOC_SERIES_SAM4L +endif # SOC_FAMILY_ATMEL_SAM && !SOC_SERIES_SAM4L diff --git a/soc/atmel/sam/sam3x/Kconfig.soc b/soc/atmel/sam/sam3x/Kconfig.soc index db700bd1a5b..7ab817c8891 100644 --- a/soc/atmel/sam/sam3x/Kconfig.soc +++ b/soc/atmel/sam/sam3x/Kconfig.soc @@ -8,7 +8,7 @@ config SOC_SERIES_SAM3X bool - select SOC_FAMILY_SAM + select SOC_FAMILY_ATMEL_SAM help Enable support for Atmel SAM3X MCU Series diff --git a/soc/atmel/sam/sam4e/Kconfig.soc b/soc/atmel/sam/sam4e/Kconfig.soc index 31acc8ccf28..5cbc0c8781c 100644 --- a/soc/atmel/sam/sam4e/Kconfig.soc +++ b/soc/atmel/sam/sam4e/Kconfig.soc @@ -7,7 +7,7 @@ config SOC_SERIES_SAM4E bool - select SOC_FAMILY_SAM + select SOC_FAMILY_ATMEL_SAM help Enable support for Atmel SAM4E MCU series diff --git a/soc/atmel/sam/sam4l/Kconfig.soc b/soc/atmel/sam/sam4l/Kconfig.soc index bccacba2eb6..e622f8a70d1 100644 --- a/soc/atmel/sam/sam4l/Kconfig.soc +++ b/soc/atmel/sam/sam4l/Kconfig.soc @@ -3,7 +3,7 @@ config SOC_SERIES_SAM4L bool - select SOC_FAMILY_SAM + select SOC_FAMILY_ATMEL_SAM help Enable support for Atmel SAM4L Cortex-M4 microcontrollers. Part No.: SAM4LS8C, SAM4LS8B, SAM4LS8A, SAM4LS4C, SAM4LS4B, diff --git a/soc/atmel/sam/sam4s/Kconfig.soc b/soc/atmel/sam/sam4s/Kconfig.soc index 32ac386a400..3e3cf5bb3b7 100644 --- a/soc/atmel/sam/sam4s/Kconfig.soc +++ b/soc/atmel/sam/sam4s/Kconfig.soc @@ -7,7 +7,7 @@ config SOC_SERIES_SAM4S bool - select SOC_FAMILY_SAM + select SOC_FAMILY_ATMEL_SAM help Enable support for Atmel SAM4S Cortex-M4 microcontrollers. Part No.: SAM4S16C, SAM4S16B, SAM4S8C, SAM4S8B, diff --git a/soc/atmel/sam/same70/Kconfig.soc b/soc/atmel/sam/same70/Kconfig.soc index 1ca424596a1..1cef18f21f1 100644 --- a/soc/atmel/sam/same70/Kconfig.soc +++ b/soc/atmel/sam/same70/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAME70 bool - select SOC_FAMILY_SAM + select SOC_FAMILY_ATMEL_SAM help Enable support for Atmel SAM E70 ARM Cortex-M7 Microcontrollers. Part No.: SAME70J19, SAME70J20, SAME70J21, SAME70N19, SAME70N20, diff --git a/soc/atmel/sam/samv71/Kconfig.soc b/soc/atmel/sam/samv71/Kconfig.soc index 664b0ef4f67..180ed60c49d 100644 --- a/soc/atmel/sam/samv71/Kconfig.soc +++ b/soc/atmel/sam/samv71/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAMV71 bool - select SOC_FAMILY_SAM + select SOC_FAMILY_ATMEL_SAM help Enable support for Atmel SAM V71 ARM Cortex-M7 Microcontrollers. Part No.: SAMV71J19, SAMV71J20, SAMV71J21, SAMV71N19, SAMV71N20, diff --git a/soc/atmel/sam0/Kconfig b/soc/atmel/sam0/Kconfig index cddcaf2d17a..f5d2f29b879 100644 --- a/soc/atmel/sam0/Kconfig +++ b/soc/atmel/sam0/Kconfig @@ -4,13 +4,13 @@ # Copyright (c) 2024 Gerson Fernando Budke # SPDX-License-Identifier: Apache-2.0 -config SOC_FAMILY_SAM0 +config SOC_FAMILY_ATMEL_SAM0 select ASF select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE -if SOC_FAMILY_SAM0 +if SOC_FAMILY_ATMEL_SAM0 rsource "common/Kconfig.sam*" rsource "*/Kconfig" -endif # SOC_FAMILY_SAM0 +endif # SOC_FAMILY_ATMEL_SAM0 diff --git a/soc/atmel/sam0/Kconfig.defconfig b/soc/atmel/sam0/Kconfig.defconfig index ec185a35907..2980bbe87c4 100644 --- a/soc/atmel/sam0/Kconfig.defconfig +++ b/soc/atmel/sam0/Kconfig.defconfig @@ -4,7 +4,7 @@ # Copyright (c) 2024 Gerson Fernando Budke # SPDX-License-Identifier: Apache-2.0 -if SOC_FAMILY_SAM0 +if SOC_FAMILY_ATMEL_SAM0 rsource "*/Kconfig.defconfig" @@ -27,4 +27,4 @@ config HEAP_MEM_POOL_ADD_SIZE_SOC endif # USB_DEVICE_DRIVER -endif # SOC_FAMILY_SAM0 +endif # SOC_FAMILY_ATMEL_SAM0 diff --git a/soc/atmel/sam0/Kconfig.soc b/soc/atmel/sam0/Kconfig.soc index 1fb7533c197..96697d51625 100644 --- a/soc/atmel/sam0/Kconfig.soc +++ b/soc/atmel/sam0/Kconfig.soc @@ -2,20 +2,20 @@ # Copyright (c) 2022-2024 Gerson Fernando Budke # SPDX-License-Identifier: Apache-2.0 -config SOC_FAMILY_SAM0 +config SOC_FAMILY_ATMEL_SAM0 bool config SOC_FAMILY - default "atmel_sam0" if SOC_FAMILY_SAM0 + default "atmel_sam0" if SOC_FAMILY_ATMEL_SAM0 config SOC_SERIES_REVISION_N bool - depends on SOC_FAMILY_SAM0 + depends on SOC_FAMILY_ATMEL_SAM0 config SOC_SERIES_REVISION string default "n" if SOC_SERIES_REVISION_N default "" - depends on SOC_FAMILY_SAM0 + depends on SOC_FAMILY_ATMEL_SAM0 rsource "*/Kconfig.soc" diff --git a/soc/atmel/sam0/samc20/Kconfig.soc b/soc/atmel/sam0/samc20/Kconfig.soc index 3bfe739dadf..b64c915745d 100644 --- a/soc/atmel/sam0/samc20/Kconfig.soc +++ b/soc/atmel/sam0/samc20/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAMC20 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAMC20 Cortex-M0+ microcontrollers. diff --git a/soc/atmel/sam0/samc21/Kconfig.soc b/soc/atmel/sam0/samc21/Kconfig.soc index 3e5b65c56b0..4ccf0e6bdde 100644 --- a/soc/atmel/sam0/samc21/Kconfig.soc +++ b/soc/atmel/sam0/samc21/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAMC21 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAMC21 Cortex-M0+ microcontrollers. diff --git a/soc/atmel/sam0/samd20/Kconfig.soc b/soc/atmel/sam0/samd20/Kconfig.soc index e2a74149d95..0c629653f0b 100644 --- a/soc/atmel/sam0/samd20/Kconfig.soc +++ b/soc/atmel/sam0/samd20/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAMD20 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAMD20 Cortex-M0+ microcontrollers. diff --git a/soc/atmel/sam0/samd21/Kconfig.soc b/soc/atmel/sam0/samd21/Kconfig.soc index 6ccedd0b73b..70d3df11ad3 100644 --- a/soc/atmel/sam0/samd21/Kconfig.soc +++ b/soc/atmel/sam0/samd21/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAMD21 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAMD21 Cortex-M0+ microcontrollers. diff --git a/soc/atmel/sam0/samd51/Kconfig.soc b/soc/atmel/sam0/samd51/Kconfig.soc index bf11d93c106..efb67a92851 100644 --- a/soc/atmel/sam0/samd51/Kconfig.soc +++ b/soc/atmel/sam0/samd51/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAMD51 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAMD51 Cortex-M4F microcontrollers. diff --git a/soc/atmel/sam0/same51/Kconfig.soc b/soc/atmel/sam0/same51/Kconfig.soc index b5851cb0d11..4d858515f36 100644 --- a/soc/atmel/sam0/same51/Kconfig.soc +++ b/soc/atmel/sam0/same51/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAME51 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAME51 Cortex-M4F microcontrollers. diff --git a/soc/atmel/sam0/same53/Kconfig.soc b/soc/atmel/sam0/same53/Kconfig.soc index d533a20ebf4..f52e7ced3ae 100644 --- a/soc/atmel/sam0/same53/Kconfig.soc +++ b/soc/atmel/sam0/same53/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAME53 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAME53 Cortex-M4F microcontrollers. diff --git a/soc/atmel/sam0/same54/Kconfig.soc b/soc/atmel/sam0/same54/Kconfig.soc index 35178f3ff7d..1c7621764fa 100644 --- a/soc/atmel/sam0/same54/Kconfig.soc +++ b/soc/atmel/sam0/same54/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAME54 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAME54 Cortex-M4F microcontrollers. diff --git a/soc/atmel/sam0/saml21/Kconfig.soc b/soc/atmel/sam0/saml21/Kconfig.soc index aa2dc0a2122..c833a172766 100644 --- a/soc/atmel/sam0/saml21/Kconfig.soc +++ b/soc/atmel/sam0/saml21/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAML21 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAML21 Cortex-M0+ microcontrollers. diff --git a/soc/atmel/sam0/samr21/Kconfig.soc b/soc/atmel/sam0/samr21/Kconfig.soc index c37d05b1a35..e0e08cb05a0 100644 --- a/soc/atmel/sam0/samr21/Kconfig.soc +++ b/soc/atmel/sam0/samr21/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAMR21 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAMR21 Cortex-M0+ microcontrollers. diff --git a/soc/atmel/sam0/samr34/Kconfig.soc b/soc/atmel/sam0/samr34/Kconfig.soc index 32edc194ebf..23ddaa16b67 100644 --- a/soc/atmel/sam0/samr34/Kconfig.soc +++ b/soc/atmel/sam0/samr34/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAMR34 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAMR34 Cortex-M0+ microcontrollers. diff --git a/soc/atmel/sam0/samr35/Kconfig.soc b/soc/atmel/sam0/samr35/Kconfig.soc index 40270d80530..13042dfeda6 100644 --- a/soc/atmel/sam0/samr35/Kconfig.soc +++ b/soc/atmel/sam0/samr35/Kconfig.soc @@ -6,7 +6,7 @@ config SOC_SERIES_SAMR35 bool - select SOC_FAMILY_SAM0 + select SOC_FAMILY_ATMEL_SAM0 help Enable support for Atmel SAMR35 Cortex-M0+ microcontrollers. diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml index 4a4225dc22a..84bbd9c439b 100644 --- a/tests/drivers/uart/uart_async_api/testcase.yaml +++ b/tests/drivers/uart/uart_async_api/testcase.yaml @@ -63,7 +63,7 @@ tests: harness: ztest depends_on: dma drivers.uart.async_api.sam0: - filter: CONFIG_SERIAL_SUPPORT_ASYNC and CONFIG_SOC_FAMILY_SAM0 + filter: CONFIG_SERIAL_SUPPORT_ASYNC and CONFIG_SOC_FAMILY_ATMEL_SAM0 platform_allow: - samc21n_xpro - samd21_xpro