dmaengine: at_hdmac: remove platform data header
Alexandre Belloni
maintainerPATCH 1/1 dmaengine: at_hdmac: remove platform data header
linux/platform_data/dma-atmel.h is only used by the at_hdmac driver. Move the CFG bits definitions back in at_hdmac_regs.h and the remaining definitions in the driver.
--- MAINTAINERS | 1 - drivers/dma/at_hdmac.c | 19 ++++++++ drivers/dma/at_hdmac_regs.h | 28 ++++++++++-- include/linux/platform_data/dma-atmel.h | 61 ------------------------- 4 files changed, 44 insertions(+), 65 deletions(-) delete mode 100644 include/linux/platform_data/dma-atmel.h
MAINTAINERS +0 -1
@@ -11604,7 +11604,6 @@ F: drivers/dma/at_hdmac.c F: drivers/dma/at_hdmac_regs.h F: drivers/dma/at_xdmac.c F: include/dt-bindings/dma/at91.h -F: include/linux/platform_data/dma-atmel.h MICROCHIP AT91 SERIAL DRIVER M: Richard Genoud <[email protected]>
drivers/dma/at_hdmac.c +19 -0
@@ -54,6 +54,25 @@ module_param(init_nr_desc_per_channel, uint, 0644);MODULE_PARM_DESC (init_nr_desc_per_channel,"initial descriptors per channel (default: 64)" ); +/** +* struct at_dma_platform_data - Controller configuration parameters +* @nr_channels: Number of channels supported by hardware (max 8) +* @cap_mask: dma_capability flags supported by the platform +*/ +struct at_dma_platform_data { +unsigned int nr_channels; +dma_cap_mask_t cap_mask; +}; + +/** +* struct at_dma_slave - Controller-specific information about a slave +* @dma_dev: required DMA master device +* @cfg: Platform-specific initializer for the CFG register +*/ +struct at_dma_slave { +struct device *dma_dev; +u32 cfg; +};/* prototypes */ static dma_cookie_t atc_tx_submit (struct dma_async_tx_descriptor *tx);
drivers/dma/at_hdmac_regs.h +25 -3
@@ -7,8 +7,6 @@#ifndef AT_HDMAC_REGS_H #define AT_HDMAC_REGS_H -#include <linux/platform_data/dma-atmel.h> -#define AT_DMA_MAX_NR_CHANNELS 8
@@ -148,7 +146,31 @@#define ATC_AUTO (0x1 << 31)/* Auto multiple buffer tx enable */ /* Bitfields in CFG */ -/* are in at_hdmac.h */ +#define ATC_PER_MSB (h) ((0x30U & (h)) >> 4)/* Extract most significant bits of a handshaking identifier */ + +#define ATC_SRC_PER (h) (0xFU & (h))/* Channel src rq associated with periph handshaking ifc h */ +#define ATC_DST_PER (h) ((0xFU & (h)) << 4)/* Channel dst rq associated with periph handshaking ifc h */ +#define ATC_SRC_REP (0x1 << 8)/* Source Replay Mod */ +#define ATC_SRC_H2SEL (0x1 << 9)/* Source Handshaking Mod */ +#define ATC_SRC_H2SEL_SW (0x0 << 9) +#define ATC_SRC_H2SEL_HW (0x1 << 9) +#define ATC_SRC_PER_MSB (h) (ATC_PER_MSB(h) << 10)/* Channel src rq (most significant bits) */ +#define ATC_DST_REP (0x1 << 12)/* Destination Replay Mod */ +#define ATC_DST_H2SEL (0x1 << 13)/* Destination Handshaking Mod */ +#define ATC_DST_H2SEL_SW (0x0 << 13) +#define ATC_DST_H2SEL_HW (0x1 << 13) +#define ATC_DST_PER_MSB (h) (ATC_PER_MSB(h) << 14)/* Channel dst rq (most significant bits) */ +#define ATC_SOD (0x1 << 16)/* Stop On Done */ +#define ATC_LOCK_IF (0x1 << 20)/* Interface Lock */ +#define ATC_LOCK_B (0x1 << 21)/* AHB Bus Lock */ +#define ATC_LOCK_IF_L (0x1 << 22)/* Master Interface Arbiter Lock */ +#define ATC_LOCK_IF_L_CHUNK (0x0 << 22) +#define ATC_LOCK_IF_L_BUFFER (0x1 << 22) +#define ATC_AHB_PROT_MASK (0x7 << 24)/* AHB Protection */ +#define ATC_FIFOCFG_MASK (0x3 << 28)/* FIFO Request Configuration */ +#define ATC_FIFOCFG_LARGESTBURST (0x0 << 28) +#define ATC_FIFOCFG_HALFFIFO (0x1 << 28) +#define ATC_FIFOCFG_ENOUGHSPACE (0x2 << 28)/* Bitfields in SPIP */ #define ATC_SPIP_HOLE (x) (0xFFFFU & (x))
include/linux/platform_data/dma-atmel.h deleted +0 -61
61 lines not on this page · raw message
Signature · 7 lines
2.29.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 3 lines · Alexandre Belloni
linux/platform_data/dma-atmel.his only used by theat_hdmacdriver. Move the CFG bits definitions back inat_hdmac_regs.hand the remaining definitions in the driver.
Applied, thanks...
Quoted 17 lines
/* Bitfields in CFG */
drivers/dma/at_hdmac_regs.h +15
-1-/* are in at_hdmac.h */ +#define ATC_PER_MSB (h) ((0x30U & (h)) >> 4)/* Extract most significant bits of a handshaking identifier */ + +#define ATC_SRC_PER (h) (0xFU & (h))/* Channel src rq associated with periph handshaking ifc h */ +#define ATC_DST_PER (h) ((0xFU & (h)) << 4)/* Channel dst rq associated with periph handshaking ifc h */ +#define ATC_SRC_REP (0x1 << 8)/* Source Replay Mod */ +#define ATC_SRC_H2SEL (0x1 << 9)/* Source Handshaking Mod */ +#define ATC_SRC_H2SEL_SW (0x0 << 9) +#define ATC_SRC_H2SEL_HW (0x1 << 9) +#define ATC_SRC_PER_MSB (h) (ATC_PER_MSB(h) << 10)/* Channel src rq (most significant bits) */ +#define ATC_DST_REP (0x1 << 12)/* Destination Replay Mod */ +#define ATC_DST_H2SEL (0x1 << 13)/* Destination Handshaking Mod */ +#define ATC_DST_H2SEL_SW (0x0 << 13) +#define ATC_DST_H2SEL_HW (0x1 << 13) +#define ATC_DST_PER_MSB (h) (ATC_PER_MSB(h) << 14)/* Channel dst rq (most significant bits) */ +#define ATC_SOD (0x1 << 16)/* Stop On Done */
drivers/dma/at_hdmac_regs.h line 173
Quoted 10 lines
drivers/dma/at_hdmac_regs.h +10
-0+#define ATC_LOCK_IF (0x1 << 20)/* Interface Lock */ +#define ATC_LOCK_B (0x1 << 21)/* AHB Bus Lock */ +#define ATC_LOCK_IF_L (0x1 << 22)/* Master Interface Arbiter Lock */ +#define ATC_LOCK_IF_L_CHUNK (0x0 << 22) +#define ATC_LOCK_IF_L_BUFFER (0x1 << 22) +#define ATC_AHB_PROT_MASK (0x7 << 24)/* AHB Protection */ +#define ATC_FIFOCFG_MASK (0x3 << 28)/* FIFO Request Configuration */ +#define ATC_FIFOCFG_LARGESTBURST (0x0 << 28) +#define ATC_FIFOCFG_HALFFIFO (0x1 << 28) +#define ATC_FIFOCFG_ENOUGHSPACE (0x2 << 28)
Make these use BIT() or GENMASK() later..?
Signature · 1 line
~Vinod
Alexandre Belloni
maintainerQuoted 28 lines · Vinod Koul
Quoted 3 lines · Alexandre Belloni
linux/platform_data/dma-atmel.his only used by theat_hdmacdriver. Move the CFG bits definitions back inat_hdmac_regs.hand the remaining definitions in the driver.Applied, thanks...
Quoted 21 lines
/* Bitfields in CFG */
drivers/dma/at_hdmac_regs.h +19
-1-/* are in at_hdmac.h */ +#define ATC_PER_MSB (h) ((0x30U & (h)) >> 4)/* Extract most significant bits of a handshaking identifier */ + +#define ATC_SRC_PER (h) (0xFU & (h))/* Channel src rq associated with periph handshaking ifc h */ +#define ATC_DST_PER (h) ((0xFU & (h)) << 4)/* Channel dst rq associated with periph handshaking ifc h */ +#define ATC_SRC_REP (0x1 << 8)/* Source Replay Mod */ +#define ATC_SRC_H2SEL (0x1 << 9)/* Source Handshaking Mod */ +#define ATC_SRC_H2SEL_SW (0x0 << 9) +#define ATC_SRC_H2SEL_HW (0x1 << 9) +#define ATC_SRC_PER_MSB (h) (ATC_PER_MSB(h) << 10)/* Channel src rq (most significant bits) */ +#define ATC_DST_REP (0x1 << 12)/* Destination Replay Mod */ +#define ATC_DST_H2SEL (0x1 << 13)/* Destination Handshaking Mod */ +#define ATC_DST_H2SEL_SW (0x0 << 13) +#define ATC_DST_H2SEL_HW (0x1 << 13) +#define ATC_DST_PER_MSB (h) (ATC_PER_MSB(h) << 14)/* Channel dst rq (most significant bits) */ +#define ATC_SOD (0x1 << 16)/* Stop On Done */ +#define ATC_LOCK_IF (0x1 << 20)/* Interface Lock */ +#define ATC_LOCK_B (0x1 << 21)/* AHB Bus Lock */ +#define ATC_LOCK_IF_L (0x1 << 22)/* Master Interface Arbiter Lock */ +#define ATC_LOCK_IF_L_CHUNK (0x0 << 22)
Quoted 9 lines
drivers/dma/at_hdmac_regs.h line 173
Quoted 6 lines
drivers/dma/at_hdmac_regs.h +6
-0+#define ATC_LOCK_IF_L_BUFFER (0x1 << 22) +#define ATC_AHB_PROT_MASK (0x7 << 24)/* AHB Protection */ +#define ATC_FIFOCFG_MASK (0x3 << 28)/* FIFO Request Configuration */ +#define ATC_FIFOCFG_LARGESTBURST (0x0 << 28) +#define ATC_FIFOCFG_HALFFIFO (0x1 << 28) +#define ATC_FIFOCFG_ENOUGHSPACE (0x2 << 28)Make these use
BIT()orGENMASK()later..?
Sure but for this patch, I wanted to make it clear that this was just moving code around.
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com