| Message ID | 1441980871-24475-3-git-send-email-peter.griffin@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Friday 11 September 2015 15:14:24 Peter Griffin wrote: > Signed-off-by: Ludovic Barre <ludovic.barre@st.com> > Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > --- > include/linux/platform_data/dma-st_fdma.h | 72 +++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > create mode 100644 include/linux/platform_data/dma-st_fdma.h > This clearly needs an explanation of which platforms require the header. On ARM, all new platforms use DT, so it's obviously not one of them. Also, it would make sense to split the portions that are needed for defining the platform device from the portions that are used by the slave device definitions. Arnd -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Arnd, On Fri, 11 Sep 2015, Arnd Bergmann wrote: > On Friday 11 September 2015 15:14:24 Peter Griffin wrote: > > Signed-off-by: Ludovic Barre <ludovic.barre@st.com> > > Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > > --- > > include/linux/platform_data/dma-st_fdma.h | 72 +++++++++++++++++++++++++++++++ > > 1 file changed, 72 insertions(+) > > create mode 100644 include/linux/platform_data/dma-st_fdma.h > > > > This clearly needs an explanation of which platforms require the header. > > On ARM, all new platforms use DT, so it's obviously not one of them. I will move the relevant parts into the st_fdma.h header file, as no other platforms will be upstreamed that are not DT based. regards, Peter. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday 29 September 2015 10:24:42 Peter Griffin wrote: > On Fri, 11 Sep 2015, Arnd Bergmann wrote: > > > On Friday 11 September 2015 15:14:24 Peter Griffin wrote: > > > Signed-off-by: Ludovic Barre <ludovic.barre@st.com> > > > Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > > > --- > > > include/linux/platform_data/dma-st_fdma.h | 72 +++++++++++++++++++++++++++++++ > > > 1 file changed, 72 insertions(+) > > > create mode 100644 include/linux/platform_data/dma-st_fdma.h > > > > > > > This clearly needs an explanation of which platforms require the header. > > > > On ARM, all new platforms use DT, so it's obviously not one of them. > > I will move the relevant parts into the st_fdma.h header file, as no other platforms > will be upstreamed that are not DT based. Ok, it's possible that you can simplify the code a bit after you do that, e.g. if you can fold the st_fdma_platform_data structure into the main per-device structure, and if you remove the filter function. Arnd -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/platform_data/dma-st_fdma.h b/include/linux/platform_data/dma-st_fdma.h new file mode 100644 index 0000000..ea2523b --- /dev/null +++ b/include/linux/platform_data/dma-st_fdma.h @@ -0,0 +1,72 @@ +/* + * dma-st-fdma.h + * + * Copyright (C) 2014 STMicroelectronics + * Author: Ludovic Barre <Ludovic.barre@st.com> + * License terms: GNU General Public License (GPL), version 2 + */ +#ifndef __PLAT_ST_FDMA_H +#define __PLAT_ST_FDMA_H + +#include <linux/dmaengine.h> + +/* + * Channel type + */ +enum st_fdma_type { + ST_FDMA_TYPE_FREE_RUN, + ST_FDMA_TYPE_PACED, +}; + +struct st_fdma_cfg { + struct device_node *of_node; + enum st_fdma_type type; + dma_addr_t dev_addr; + enum dma_transfer_direction dir; + int req_line; /* request line */ + u32 req_ctrl; /* Request control */ +}; + +#define FW_NAME_SIZE 30 + +/** + * struct st_fdma_platform_data - platform specific data for FDMA engine + * + * @nr_channels: Number of channels supported by hardware + * @fw_name: The firmware name + */ +struct st_fdma_platform_data { + u32 nr_channels; + u32 id; + char fw_name[FW_NAME_SIZE]; +}; + +/* + * request control bits + */ +#define REQ_CTRL_NUM_OPS_MASK GENMASK(31, 24) +#define REQ_CTRL_NUM_OPS(n) (REQ_CTRL_NUM_OPS_MASK & ((n) << 24)) +#define REQ_CTRL_INITIATOR_MASK BIT(22) +#define REQ_CTRL_INIT0 (0x0 << 22) +#define REQ_CTRL_INIT1 (0x1 << 22) +#define REQ_CTRL_INC_ADDR_ON BIT(21) +#define REQ_CTRL_DATA_SWAP_ON BIT(17) +#define REQ_CTRL_WNR BIT(14) +#define REQ_CTRL_OPCODE_MASK GENMASK(7, 4) +#define REQ_CTRL_OPCODE_LD_ST1 (0x0 << 4) +#define REQ_CTRL_OPCODE_LD_ST2 (0x1 << 4) +#define REQ_CTRL_OPCODE_LD_ST4 (0x2 << 4) +#define REQ_CTRL_OPCODE_LD_ST8 (0x3 << 4) +#define REQ_CTRL_OPCODE_LD_ST16 (0x4 << 4) +#define REQ_CTRL_OPCODE_LD_ST32 (0x5 << 4) +#define REQ_CTRL_OPCODE_LD_ST64 (0x6 << 4) +#define REQ_CTRL_HOLDOFF_MASK GENMASK(2, 0) +#define REQ_CTRL_HOLDOFF(n) ((n) & REQ_CTRL_HOLDOFF_MASK) + +/* bits used by client to configure request control */ +#define REQ_CTRL_CFG_MASK (REQ_CTRL_HOLDOFF_MASK | REQ_CTRL_DATA_SWAP_ON \ + | REQ_CTRL_INC_ADDR_ON | REQ_CTRL_INITIATOR_MASK) + +bool st_fdma_filter_fn(struct dma_chan *chan, void *param); + +#endif /* __PLAT_ST_FDMA_H */