Skip to content

Commit 08bf54f

Browse files
andy-shevvinodkoul
authored andcommitted
dmaengine: dw: Convert members to u32 in platform data
u32 is a type that is used for properties retrieval from DT. With the type change it allows to clean up properties reading routine. While at it, order the fields in way how they are parsed. Signed-off-by: Andy Shevchenko <[email protected]> Reviewed-by: Serge Semin <[email protected]> Tested-by: Serge Semin <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent dfa6a2f commit 08bf54f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

include/linux/platform_data/dma-dw.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ struct dw_dma_slave {
4141

4242
/**
4343
* struct dw_dma_platform_data - Controller configuration parameters
44+
* @nr_masters: Number of AHB masters supported by the controller
4445
* @nr_channels: Number of channels supported by hardware (max 8)
4546
* @chan_allocation_order: Allocate channels starting from 0 or 7
4647
* @chan_priority: Set channel priority increasing from 0 to 7 or 7 to 0.
4748
* @block_size: Maximum block size supported by the controller
48-
* @nr_masters: Number of AHB masters supported by the controller
4949
* @data_width: Maximum data width supported by hardware per AHB master
5050
* (in bytes, power of 2)
5151
* @multi_block: Multi block transfers supported by hardware per channel.
@@ -55,25 +55,25 @@ struct dw_dma_slave {
5555
* @quirks: Optional platform quirks.
5656
*/
5757
struct dw_dma_platform_data {
58-
unsigned int nr_channels;
58+
u32 nr_masters;
59+
u32 nr_channels;
5960
#define CHAN_ALLOCATION_ASCENDING 0 /* zero to seven */
6061
#define CHAN_ALLOCATION_DESCENDING 1 /* seven to zero */
61-
unsigned char chan_allocation_order;
62+
u32 chan_allocation_order;
6263
#define CHAN_PRIORITY_ASCENDING 0 /* chan0 highest */
6364
#define CHAN_PRIORITY_DESCENDING 1 /* chan7 highest */
64-
unsigned char chan_priority;
65-
unsigned int block_size;
66-
unsigned char nr_masters;
67-
unsigned char data_width[DW_DMA_MAX_NR_MASTERS];
68-
unsigned char multi_block[DW_DMA_MAX_NR_CHANNELS];
65+
u32 chan_priority;
66+
u32 block_size;
67+
u32 data_width[DW_DMA_MAX_NR_MASTERS];
68+
u32 multi_block[DW_DMA_MAX_NR_CHANNELS];
6969
u32 max_burst[DW_DMA_MAX_NR_CHANNELS];
7070
#define CHAN_PROTCTL_PRIVILEGED BIT(0)
7171
#define CHAN_PROTCTL_BUFFERABLE BIT(1)
7272
#define CHAN_PROTCTL_CACHEABLE BIT(2)
7373
#define CHAN_PROTCTL_MASK GENMASK(2, 0)
74-
unsigned char protctl;
74+
u32 protctl;
7575
#define DW_DMA_QUIRK_XBAR_PRESENT BIT(0)
76-
unsigned int quirks;
76+
u32 quirks;
7777
};
7878

7979
#endif /* _PLATFORM_DATA_DMA_DW_H */

0 commit comments

Comments
 (0)