From 845ca1ce4346e9dc34aa8d2b88ab71a0d7bf104b Mon Sep 17 00:00:00 2001 From: Reto Schneider Date: Tue, 26 Nov 2024 10:22:06 +0100 Subject: [PATCH] drivers: spi: Sort CMake and Kconfig files alphabetically By sorting the lines alphabetically, merge conflicts can be reduced. Signed-off-by: Reto Schneider --- drivers/spi/CMakeLists.txt | 117 +++++++++++++++++++------------------ drivers/spi/Kconfig | 109 +++++++++++----------------------- 2 files changed, 93 insertions(+), 133 deletions(-) diff --git a/drivers/spi/CMakeLists.txt b/drivers/spi/CMakeLists.txt index f6adb64ecd366..e7746e17edb26 100644 --- a/drivers/spi/CMakeLists.txt +++ b/drivers/spi/CMakeLists.txt @@ -4,61 +4,64 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/spi.h) zephyr_library() -zephyr_library_sources_ifdef(CONFIG_SPI_SHELL spi_shell.c) -zephyr_library_sources_ifdef(CONFIG_SPI_TELINK_B91 spi_b91.c) -zephyr_library_sources_ifdef(CONFIG_SPI_CC13XX_CC26XX spi_cc13xx_cc26xx.c) -zephyr_library_sources_ifdef(CONFIG_SPI_DW spi_dw.c) -zephyr_library_sources_ifdef(CONFIG_SPI_EMUL spi_emul.c) -zephyr_library_sources_ifdef(CONFIG_SPI_STM32 spi_ll_stm32.c) -zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_DSPI spi_mcux_dspi.c) -zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_ECSPI spi_mcux_ecspi.c) -zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_FLEXCOMM spi_mcux_flexcomm.c) -zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_FLEXIO spi_mcux_flexio.c) -zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI spi_mcux_lpspi.c) -zephyr_library_sources_ifdef(CONFIG_SPI_SAM spi_sam.c) -zephyr_library_sources_ifdef(CONFIG_SPI_SAM0 spi_sam0.c) -zephyr_library_sources_ifdef(CONFIG_SPI_SIFIVE spi_sifive.c) -zephyr_library_sources_ifdef(CONFIG_SPI_RV32M1_LPSPI spi_rv32m1_lpspi.c) -zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPI spi_nrfx_spi.c - spi_nrfx_common.c) -zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPIM spi_nrfx_spim.c - spi_nrfx_common.c) -zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPIS spi_nrfx_spis.c) -zephyr_library_sources_ifdef(CONFIG_SPI_LITEX spi_litex.c) -zephyr_library_sources_ifdef(CONFIG_SPI_LITEX_LITESPI spi_litex_litespi.c) -zephyr_library_sources_ifdef(CONFIG_SPI_OC_SIMPLE spi_oc_simple.c) -zephyr_library_sources_ifdef(CONFIG_SPI_XEC_QMSPI spi_xec_qmspi.c) -zephyr_library_sources_ifdef(CONFIG_SPI_GECKO_USART spi_gecko_usart.c) -zephyr_library_sources_ifdef(CONFIG_SPI_GECKO_EUSART spi_gecko_eusart.c) -zephyr_library_sources_ifdef(CONFIG_SPI_XLNX_AXI_QUADSPI spi_xlnx_axi_quadspi.c) -zephyr_library_sources_ifdef(CONFIG_ESP32_SPIM spi_esp32_spim.c) -zephyr_library_sources_ifdef(CONFIG_SPI_TEST spi_test.c) -zephyr_library_sources_ifdef(CONFIG_SPI_PSOC6 spi_psoc6.c) -zephyr_library_sources_ifdef(CONFIG_SPI_BITBANG spi_bitbang.c) -zephyr_library_sources_ifdef(CONFIG_SPI_XEC_QMSPI_LDMA spi_xec_qmspi_ldma.c) -zephyr_library_sources_ifdef(CONFIG_SPI_GD32 spi_gd32.c) -zephyr_library_sources_ifdef(CONFIG_SPI_MCHP_QSPI spi_mchp_mss_qspi.c) -zephyr_library_sources_ifdef(CONFIG_SPI_PL022 spi_pl022.c) -zephyr_library_sources_ifdef(CONFIG_SPI_ANDES_ATCSPI200 spi_andes_atcspi200.c) -zephyr_library_sources_ifdef(CONFIG_NXP_S32_SPI spi_nxp_s32.c) -zephyr_library_sources_ifdef(CONFIG_SPI_XMC4XXX spi_xmc4xxx.c) -zephyr_library_sources_ifdef(CONFIG_SPI_PW spi_pw.c) -zephyr_library_sources_ifdef(CONFIG_SPI_SMARTBOND spi_smartbond.c) -zephyr_library_sources_ifdef(CONFIG_SPI_OPENTITAN spi_opentitan.c) -zephyr_library_sources_ifdef(CONFIG_SPI_NUMAKER spi_numaker.c) -zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_SPIC spi_ambiq_spic.c) -zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_SPID spi_ambiq_spid.c) -zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_BLEIF spi_ambiq_bleif.c) -zephyr_library_sources_ifdef(CONFIG_SPI_RPI_PICO_PIO spi_rpi_pico_pio.c) -zephyr_library_sources_ifdef(CONFIG_SPI_MCHP_MSS spi_mchp_mss.c) -zephyr_library_sources_ifdef(CONFIG_SPI_RENESAS_RA8 spi_b_renesas_ra8.c) -zephyr_library_sources_ifdef(CONFIG_SPI_RENESAS_RA spi_renesas_ra.c) -zephyr_library_sources_ifdef(CONFIG_SPI_RTIO spi_rtio.c) +# zephyr-keep-sorted-start zephyr_library_sources_ifdef(CONFIG_SPI_ASYNC spi_signal.c) -zephyr_library_sources_ifdef(CONFIG_SPI_ITE_IT8XXX2 spi_it8xxx2.c) -zephyr_library_sources_ifdef(CONFIG_USERSPACE spi_handlers.c) -zephyr_library_sources_ifdef(CONFIG_SPI_INFINEON_CAT1 spi_ifx_cat1.c) -zephyr_library_sources_ifdef(CONFIG_SPI_SEDI spi_sedi.c) -zephyr_library_sources_ifdef(CONFIG_SPI_NPCX_SPIP spi_npcx_spip.c) -zephyr_library_sources_ifdef(CONFIG_SPI_GRLIB_SPIMCTRL spi_grlib_spimctrl.c) -zephyr_library_sources_ifdef(CONFIG_SPI_MAX32 spi_max32.c) +zephyr_library_sources_ifdef(CONFIG_SPI_RTIO spi_rtio.c) +zephyr_library_sources_ifdef(CONFIG_SPI_SHELL spi_shell.c) +zephyr_library_sources_ifdef(CONFIG_USERSPACE spi_handlers.c) +# zephyr-keep-sorted-stop + +# zephyr-keep-sorted-start +zephyr_library_sources_ifdef(CONFIG_ESP32_SPIM spi_esp32_spim.c) +zephyr_library_sources_ifdef(CONFIG_NXP_S32_SPI spi_nxp_s32.c) +zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_BLEIF spi_ambiq_bleif.c) +zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_SPIC spi_ambiq_spic.c) +zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_SPID spi_ambiq_spid.c) +zephyr_library_sources_ifdef(CONFIG_SPI_ANDES_ATCSPI200 spi_andes_atcspi200.c) +zephyr_library_sources_ifdef(CONFIG_SPI_BITBANG spi_bitbang.c) +zephyr_library_sources_ifdef(CONFIG_SPI_CC13XX_CC26XX spi_cc13xx_cc26xx.c) +zephyr_library_sources_ifdef(CONFIG_SPI_DW spi_dw.c) +zephyr_library_sources_ifdef(CONFIG_SPI_EMUL spi_emul.c) +zephyr_library_sources_ifdef(CONFIG_SPI_GD32 spi_gd32.c) +zephyr_library_sources_ifdef(CONFIG_SPI_GECKO_EUSART spi_gecko_eusart.c) +zephyr_library_sources_ifdef(CONFIG_SPI_GECKO_USART spi_gecko_usart.c) +zephyr_library_sources_ifdef(CONFIG_SPI_GRLIB_SPIMCTRL spi_grlib_spimctrl.c) +zephyr_library_sources_ifdef(CONFIG_SPI_INFINEON_CAT1 spi_ifx_cat1.c) +zephyr_library_sources_ifdef(CONFIG_SPI_ITE_IT8XXX2 spi_it8xxx2.c) +zephyr_library_sources_ifdef(CONFIG_SPI_LITEX spi_litex.c) +zephyr_library_sources_ifdef(CONFIG_SPI_LITEX_LITESPI spi_litex_litespi.c) +zephyr_library_sources_ifdef(CONFIG_SPI_MAX32 spi_max32.c) +zephyr_library_sources_ifdef(CONFIG_SPI_MCHP_MSS spi_mchp_mss.c) +zephyr_library_sources_ifdef(CONFIG_SPI_MCHP_QSPI spi_mchp_mss_qspi.c) +zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_DSPI spi_mcux_dspi.c) +zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_ECSPI spi_mcux_ecspi.c) +zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_FLEXCOMM spi_mcux_flexcomm.c) +zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_FLEXIO spi_mcux_flexio.c) +zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI spi_mcux_lpspi.c) +zephyr_library_sources_ifdef(CONFIG_SPI_NPCX_SPIP spi_npcx_spip.c) +zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPI spi_nrfx_spi.c spi_nrfx_common.c) +zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPIM spi_nrfx_spim.c spi_nrfx_common.c) +zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPIS spi_nrfx_spis.c) +zephyr_library_sources_ifdef(CONFIG_SPI_NUMAKER spi_numaker.c) +zephyr_library_sources_ifdef(CONFIG_SPI_OC_SIMPLE spi_oc_simple.c) +zephyr_library_sources_ifdef(CONFIG_SPI_OPENTITAN spi_opentitan.c) +zephyr_library_sources_ifdef(CONFIG_SPI_PL022 spi_pl022.c) +zephyr_library_sources_ifdef(CONFIG_SPI_PSOC6 spi_psoc6.c) +zephyr_library_sources_ifdef(CONFIG_SPI_PW spi_pw.c) +zephyr_library_sources_ifdef(CONFIG_SPI_RENESAS_RA spi_renesas_ra.c) +zephyr_library_sources_ifdef(CONFIG_SPI_RENESAS_RA8 spi_b_renesas_ra8.c) +zephyr_library_sources_ifdef(CONFIG_SPI_RPI_PICO_PIO spi_rpi_pico_pio.c) +zephyr_library_sources_ifdef(CONFIG_SPI_RV32M1_LPSPI spi_rv32m1_lpspi.c) +zephyr_library_sources_ifdef(CONFIG_SPI_SAM spi_sam.c) +zephyr_library_sources_ifdef(CONFIG_SPI_SAM0 spi_sam0.c) +zephyr_library_sources_ifdef(CONFIG_SPI_SEDI spi_sedi.c) +zephyr_library_sources_ifdef(CONFIG_SPI_SIFIVE spi_sifive.c) +zephyr_library_sources_ifdef(CONFIG_SPI_SMARTBOND spi_smartbond.c) +zephyr_library_sources_ifdef(CONFIG_SPI_STM32 spi_ll_stm32.c) +zephyr_library_sources_ifdef(CONFIG_SPI_TELINK_B91 spi_b91.c) +zephyr_library_sources_ifdef(CONFIG_SPI_TEST spi_test.c) +zephyr_library_sources_ifdef(CONFIG_SPI_XEC_QMSPI spi_xec_qmspi.c) +zephyr_library_sources_ifdef(CONFIG_SPI_XEC_QMSPI_LDMA spi_xec_qmspi_ldma.c) +zephyr_library_sources_ifdef(CONFIG_SPI_XLNX_AXI_QUADSPI spi_xlnx_axi_quadspi.c) +zephyr_library_sources_ifdef(CONFIG_SPI_XMC4XXX spi_xmc4xxx.c) +# zephyr-keep-sorted-stop diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index e718e93f6534e..136a1fcca5615 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -75,96 +75,53 @@ module = SPI module-str = spi source "subsys/logging/Kconfig.template.log_config" +# zephyr-keep-sorted-start +source "drivers/spi/Kconfig.ambiq" +source "drivers/spi/Kconfig.andes_atcspi200" source "drivers/spi/Kconfig.b91" - -source "drivers/spi/Kconfig.stm32" - +source "drivers/spi/Kconfig.bitbang" +source "drivers/spi/Kconfig.cc13xx_cc26xx" source "drivers/spi/Kconfig.dw" - +source "drivers/spi/Kconfig.esp32" +source "drivers/spi/Kconfig.gd32" +source "drivers/spi/Kconfig.gecko_eusart" +source "drivers/spi/Kconfig.gecko_usart" +source "drivers/spi/Kconfig.grlib_spimctrl" +source "drivers/spi/Kconfig.ifx_cat1" +source "drivers/spi/Kconfig.it8xxx2" +source "drivers/spi/Kconfig.litex" +source "drivers/spi/Kconfig.max32" +source "drivers/spi/Kconfig.mchp_mss" +source "drivers/spi/Kconfig.mchp_mss_qspi" source "drivers/spi/Kconfig.mcux_dspi" - source "drivers/spi/Kconfig.mcux_ecspi" - source "drivers/spi/Kconfig.mcux_flexcomm" - source "drivers/spi/Kconfig.mcux_flexio" - source "drivers/spi/Kconfig.mcux_lpspi" - +source "drivers/spi/Kconfig.npcx" +source "drivers/spi/Kconfig.nrfx" +source "drivers/spi/Kconfig.numaker" +source "drivers/spi/Kconfig.nxp_s32" +source "drivers/spi/Kconfig.oc_simple" +source "drivers/spi/Kconfig.opentitan" +source "drivers/spi/Kconfig.pl022" +source "drivers/spi/Kconfig.psoc6" +source "drivers/spi/Kconfig.pw" +source "drivers/spi/Kconfig.renesas_ra" +source "drivers/spi/Kconfig.renesas_ra8" +source "drivers/spi/Kconfig.rpi_pico" source "drivers/spi/Kconfig.rv32m1_lpspi" - source "drivers/spi/Kconfig.sam" - source "drivers/spi/Kconfig.sam0" - +source "drivers/spi/Kconfig.sedi" source "drivers/spi/Kconfig.sifive" - +source "drivers/spi/Kconfig.smartbond" source "drivers/spi/Kconfig.spi_emul" - -source "drivers/spi/Kconfig.nrfx" - -source "drivers/spi/Kconfig.cc13xx_cc26xx" - -source "drivers/spi/Kconfig.litex" - -source "drivers/spi/Kconfig.oc_simple" - +source "drivers/spi/Kconfig.stm32" +source "drivers/spi/Kconfig.test" source "drivers/spi/Kconfig.xec_qmspi" - -source "drivers/spi/Kconfig.gecko_usart" - -source "drivers/spi/Kconfig.gecko_eusart" - source "drivers/spi/Kconfig.xlnx" - -source "drivers/spi/Kconfig.esp32" - -source "drivers/spi/Kconfig.test" - -source "drivers/spi/Kconfig.psoc6" - -source "drivers/spi/Kconfig.bitbang" - -source "drivers/spi/Kconfig.gd32" - -source "drivers/spi/Kconfig.mchp_mss_qspi" - -source "drivers/spi/Kconfig.pl022" - -source "drivers/spi/Kconfig.andes_atcspi200" - -source "drivers/spi/Kconfig.nxp_s32" - source "drivers/spi/Kconfig.xmc4xxx" - -source "drivers/spi/Kconfig.pw" - -source "drivers/spi/Kconfig.smartbond" - -source "drivers/spi/Kconfig.opentitan" - -source "drivers/spi/Kconfig.numaker" - -source "drivers/spi/Kconfig.ambiq" - -source "drivers/spi/Kconfig.rpi_pico" - -source "drivers/spi/Kconfig.ifx_cat1" - -source "drivers/spi/Kconfig.sedi" - -source "drivers/spi/Kconfig.npcx" - -source "drivers/spi/Kconfig.mchp_mss" - -source "drivers/spi/Kconfig.grlib_spimctrl" - -source "drivers/spi/Kconfig.max32" - -source "drivers/spi/Kconfig.renesas_ra8" - -source "drivers/spi/Kconfig.it8xxx2" - -source "drivers/spi/Kconfig.renesas_ra" +# zephyr-keep-sorted-stop endif # SPI