From 7a605b52ec7f4b6ec880f301528c4509f5397be7 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Thu, 9 Jan 2025 14:58:47 +0000 Subject: [PATCH] dts: arm: atmel: samx7x: move SAM E70/V71 DMA header to dt-bindings Move the Atmel SAM E70/V71 DMA PERIDs header file to include/zephyr/dt-bindings/dma and unify it for use with the entire product family (SAM E70/S70/V70/V71). Signed-off-by: Henrik Brix Andersen --- dts/arm/atmel/dma_atmel_samv71.h | 66 ------------------- dts/arm/atmel/same70.dtsi | 1 - dts/arm/atmel/same70b.dtsi | 1 - dts/arm/atmel/samv71.dtsi | 1 - dts/arm/atmel/samv71b.dtsi | 1 - dts/arm/atmel/samx7x.dtsi | 1 + .../zephyr/dt-bindings/dma/atmel_samx7x_dma.h | 6 +- 7 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 dts/arm/atmel/dma_atmel_samv71.h rename dts/arm/atmel/dma_atmel_same70.h => include/zephyr/dt-bindings/dma/atmel_samx7x_dma.h (91%) diff --git a/dts/arm/atmel/dma_atmel_samv71.h b/dts/arm/atmel/dma_atmel_samv71.h deleted file mode 100644 index ae1e6ab4181ff61..000000000000000 --- a/dts/arm/atmel/dma_atmel_samv71.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2020 Linaro Limited - * SPDX-License-Identifier: Apache-2.0 - */ - -#ifndef DMA_ATMEL_SAMV71_H_ -#define DMA_ATMEL_SAMV71_H_ - -/** - * SAMx7x Peripheral Hardware Request HW Interface Number (XDMAC_CC.PERID). - * - * See table Table 35-1. Peripheral Hardware Requests in the SAM E70/S70/V70/V71 datasheet. - */ -#define DMA_PERID_HSMCI_TX_RX 0 -#define DMA_PERID_SPI0_TX 1 -#define DMA_PERID_SPI0_RX 2 -#define DMA_PERID_SPI1_TX 3 -#define DMA_PERID_SPI1_RX 4 -#define DMA_PERID_QSPI_TX 5 -#define DMA_PERID_QSPI_RX 6 -#define DMA_PERID_USART0_TX 7 -#define DMA_PERID_USART0_RX 8 -#define DMA_PERID_USART1_TX 9 -#define DMA_PERID_USART1_RX 10 -#define DMA_PERID_USART2_TX 11 -#define DMA_PERID_USART2_RX 12 -#define DMA_PERID_PWM0_TX 13 -#define DMA_PERID_TWIHS0_TX 14 -#define DMA_PERID_TWIHS0_RX 15 -#define DMA_PERID_TWIHS1_TX 16 -#define DMA_PERID_TWIHS1_RX 17 -#define DMA_PERID_TWIHS2_TX 18 -#define DMA_PERID_TWIHS2_RX 19 -#define DMA_PERID_UART0_TX 20 -#define DMA_PERID_UART0_RX 21 -#define DMA_PERID_UART1_TX 22 -#define DMA_PERID_UART1_RX 23 -#define DMA_PERID_UART2_TX 24 -#define DMA_PERID_UART2_RX 25 -#define DMA_PERID_UART3_TX 26 -#define DMA_PERID_UART3_RX 27 -#define DMA_PERID_UART4_TX 28 -#define DMA_PERID_UART4_RX 29 -#define DMA_PERID_DACC_TX 30 -#define DMA_PERID_SSC_TX 32 -#define DMA_PERID_SSC_RX 33 -#define DMA_PERID_PIOA_RX 34 -#define DMA_PERID_AFEC0_RX 35 -#define DMA_PERID_AFEC1_RX 36 -#define DMA_PERID_AES_TX 37 -#define DMA_PERID_AES_RX 38 -#define DMA_PERID_PWM1_TX 39 -#define DMA_PERID_TC0_RX 40 -#define DMA_PERID_TC1_RX 41 -#define DMA_PERID_TC2_RX 42 -#define DMA_PERID_TC3_RX 43 -#define DMA_PERID_I2SC0_TX_L 44 -#define DMA_PERID_I2SC0_RX_L 45 -#define DMA_PERID_I2SC1_TX_L 46 -#define DMA_PERID_I2SC1_RX_L 47 -#define DMA_PERID_I2SC0_TX_R 48 -#define DMA_PERID_I2SC0_RX_R 49 -#define DMA_PERID_I2SC1_TX_R 50 -#define DMA_PERID_I2SC1_RX_R 51 - -#endif /* DMA_ATMEL_SAMV71_H_ */ diff --git a/dts/arm/atmel/same70.dtsi b/dts/arm/atmel/same70.dtsi index cf6a2e0a0038528..3896a1cacba584c 100644 --- a/dts/arm/atmel/same70.dtsi +++ b/dts/arm/atmel/same70.dtsi @@ -6,4 +6,3 @@ */ #include -#include "dma_atmel_same70.h" diff --git a/dts/arm/atmel/same70b.dtsi b/dts/arm/atmel/same70b.dtsi index 43bef4ee89bc04e..7e250e2c250c2d9 100644 --- a/dts/arm/atmel/same70b.dtsi +++ b/dts/arm/atmel/same70b.dtsi @@ -5,4 +5,3 @@ */ #include -#include "dma_atmel_same70.h" diff --git a/dts/arm/atmel/samv71.dtsi b/dts/arm/atmel/samv71.dtsi index 29d52abcca36331..a1a20fd8e07fb95 100644 --- a/dts/arm/atmel/samv71.dtsi +++ b/dts/arm/atmel/samv71.dtsi @@ -5,4 +5,3 @@ */ #include -#include "dma_atmel_samv71.h" diff --git a/dts/arm/atmel/samv71b.dtsi b/dts/arm/atmel/samv71b.dtsi index cca7ebb336884c5..7e250e2c250c2d9 100644 --- a/dts/arm/atmel/samv71b.dtsi +++ b/dts/arm/atmel/samv71b.dtsi @@ -5,4 +5,3 @@ */ #include -#include "dma_atmel_samv71.h" diff --git a/dts/arm/atmel/samx7x.dtsi b/dts/arm/atmel/samx7x.dtsi index 65ffc3cff78ec7a..0d1056d991a51f2 100644 --- a/dts/arm/atmel/samx7x.dtsi +++ b/dts/arm/atmel/samx7x.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include / { aliases { diff --git a/dts/arm/atmel/dma_atmel_same70.h b/include/zephyr/dt-bindings/dma/atmel_samx7x_dma.h similarity index 91% rename from dts/arm/atmel/dma_atmel_same70.h rename to include/zephyr/dt-bindings/dma/atmel_samx7x_dma.h index 63b1ed4e92c0b62..15990498fc0fe6a 100644 --- a/dts/arm/atmel/dma_atmel_same70.h +++ b/include/zephyr/dt-bindings/dma/atmel_samx7x_dma.h @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef DMA_ATMEL_SAME70_H_ -#define DMA_ATMEL_SAME70_H_ +#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ATMEL_SAMX7X_DMA_H_ +#define ZEPHYR_INCLUDE_DT_BINDINGS_ATMEL_SAMX7X_DMA_H_ /** * SAMx7x Peripheral Hardware Request HW Interface Number (XDMAC_CC.PERID). @@ -63,4 +63,4 @@ #define DMA_PERID_I2SC1_TX_R 50 #define DMA_PERID_I2SC1_RX_R 51 -#endif /* DMA_ATMEL_SAME70_H_ */ +#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ATMEL_SAMX7X_DMA_H_ */