* [PATCH] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0
@ 2015-01-22 7:04 Archit Taneja
2015-01-22 21:48 ` Andy Gross
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Archit Taneja @ 2015-01-22 7:04 UTC (permalink / raw)
To: vinod.koul
Cc: agross, dmaengine, linux-arm-msm, svarbanov, linux-kernel, Archit Taneja
Add register offset table entry for the newer (v1.7.0) version of the BAM IP
found on MSM8916. Update the DT bindings documentation.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
.../devicetree/bindings/dma/qcom_bam_dma.txt | 1 +
drivers/dma/qcom_bam_dma.c | 30 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
index f8c3311..1c9d48e 100644
--- a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
+++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
@@ -4,6 +4,7 @@ Required properties:
- compatible: must be one of the following:
* "qcom,bam-v1.4.0" for MSM8974, APQ8074 and APQ8084
* "qcom,bam-v1.3.0" for APQ8064, IPQ8064 and MSM8960
+ * "qcom,bam-v1.7.0" for MSM8916
- reg: Address range for DMA registers
- interrupts: Should contain the one interrupt shared by all channels
- #dma-cells: must be <1>, the cell in the dmas property of the client device
diff --git a/drivers/dma/qcom_bam_dma.c b/drivers/dma/qcom_bam_dma.c
index 3122a99..447ad12 100644
--- a/drivers/dma/qcom_bam_dma.c
+++ b/drivers/dma/qcom_bam_dma.c
@@ -171,6 +171,35 @@ static const struct reg_offset_data bam_v1_4_reg_info[] = {
[BAM_P_FIFO_SIZES] = { 0x1820, 0x00, 0x1000, 0x00 },
};
+static const struct reg_offset_data bam_v1_7_reg_info[] = {
+ [BAM_CTRL] = { 0x00000, 0x00, 0x00, 0x00 },
+ [BAM_REVISION] = { 0x01000, 0x00, 0x00, 0x00 },
+ [BAM_NUM_PIPES] = { 0x01008, 0x00, 0x00, 0x00 },
+ [BAM_DESC_CNT_TRSHLD] = { 0x00008, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_SRCS] = { 0x03010, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_SRCS_MSK] = { 0x03014, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_SRCS_UNMASKED] = { 0x03018, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_STTS] = { 0x00014, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_CLR] = { 0x00018, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_EN] = { 0x0001C, 0x00, 0x00, 0x00 },
+ [BAM_CNFG_BITS] = { 0x0007C, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_SRCS_EE] = { 0x03000, 0x00, 0x00, 0x80 },
+ [BAM_IRQ_SRCS_MSK_EE] = { 0x03004, 0x00, 0x00, 0x80 },
+ [BAM_P_CTRL] = { 0x13000, 0x1000, 0x00, 0x00 },
+ [BAM_P_RST] = { 0x13004, 0x1000, 0x00, 0x00 },
+ [BAM_P_HALT] = { 0x13008, 0x1000, 0x00, 0x00 },
+ [BAM_P_IRQ_STTS] = { 0x13010, 0x1000, 0x00, 0x00 },
+ [BAM_P_IRQ_CLR] = { 0x13014, 0x1000, 0x00, 0x00 },
+ [BAM_P_IRQ_EN] = { 0x13018, 0x1000, 0x00, 0x00 },
+ [BAM_P_EVNT_DEST_ADDR] = { 0x1382C, 0x00, 0x1000, 0x00 },
+ [BAM_P_EVNT_REG] = { 0x13818, 0x00, 0x1000, 0x00 },
+ [BAM_P_SW_OFSTS] = { 0x13800, 0x00, 0x1000, 0x00 },
+ [BAM_P_DATA_FIFO_ADDR] = { 0x13824, 0x00, 0x1000, 0x00 },
+ [BAM_P_DESC_FIFO_ADDR] = { 0x1381C, 0x00, 0x1000, 0x00 },
+ [BAM_P_EVNT_GEN_TRSHLD] = { 0x13828, 0x00, 0x1000, 0x00 },
+ [BAM_P_FIFO_SIZES] = { 0x13820, 0x00, 0x1000, 0x00 },
+};
+
/* BAM CTRL */
#define BAM_SW_RST BIT(0)
#define BAM_EN BIT(1)
@@ -1053,6 +1082,7 @@ static void bam_channel_init(struct bam_device *bdev, struct bam_chan *bchan,
static const struct of_device_id bam_of_match[] = {
{ .compatible = "qcom,bam-v1.3.0", .data = &bam_v1_3_reg_info },
{ .compatible = "qcom,bam-v1.4.0", .data = &bam_v1_4_reg_info },
+ { .compatible = "qcom,bam-v1.7.0", .data = &bam_v1_7_reg_info },
{}
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0
2015-01-22 7:04 [PATCH] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0 Archit Taneja
@ 2015-01-22 21:48 ` Andy Gross
2015-02-10 5:50 ` Stanimir Varbanov
2015-02-20 11:57 ` Stanimir Varbanov
2015-02-23 4:10 ` [PATCH v2] " Archit Taneja
2 siblings, 1 reply; 8+ messages in thread
From: Andy Gross @ 2015-01-22 21:48 UTC (permalink / raw)
To: Archit Taneja
Cc: vinod.koul, dmaengine, linux-arm-msm, svarbanov, linux-kernel
On Thu, Jan 22, 2015 at 12:34:26PM +0530, Archit Taneja wrote:
> Add register offset table entry for the newer (v1.7.0) version of the BAM IP
> found on MSM8916. Update the DT bindings documentation.
>
> Signed-off-by: Archit Taneja <architt@codeaurora.org>
> ---
Looks good.
Reviewed-by: Andy Gross <agross@codeaurora.org>
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0
2015-01-22 21:48 ` Andy Gross
@ 2015-02-10 5:50 ` Stanimir Varbanov
0 siblings, 0 replies; 8+ messages in thread
From: Stanimir Varbanov @ 2015-02-10 5:50 UTC (permalink / raw)
To: vinod.koul
Cc: Andy Gross, Archit Taneja, dmaengine, linux-arm-msm, linux-kernel
On 01/22/2015 11:48 PM, Andy Gross wrote:
> On Thu, Jan 22, 2015 at 12:34:26PM +0530, Archit Taneja wrote:
>> Add register offset table entry for the newer (v1.7.0) version of the BAM IP
>> found on MSM8916. Update the DT bindings documentation.
>>
>> Signed-off-by: Archit Taneja <architt@codeaurora.org>
>> ---
>
> Looks good.
>
> Reviewed-by: Andy Gross <agross@codeaurora.org>
>
Reviewed-by: Stanimir Varbanov <svarbanov@mm-sol.com>
Vinod, is that one OK with you? If so could you merge it in your tree.
regards,
Stan
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0
2015-01-22 7:04 [PATCH] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0 Archit Taneja
2015-01-22 21:48 ` Andy Gross
@ 2015-02-20 11:57 ` Stanimir Varbanov
2015-02-20 22:28 ` Andy Gross
2015-02-23 4:10 ` [PATCH v2] " Archit Taneja
2 siblings, 1 reply; 8+ messages in thread
From: Stanimir Varbanov @ 2015-02-20 11:57 UTC (permalink / raw)
To: Archit Taneja; +Cc: vinod.koul, agross, dmaengine, linux-arm-msm, linux-kernel
On 01/22/2015 09:04 AM, Archit Taneja wrote:
> Add register offset table entry for the newer (v1.7.0) version of the BAM IP
> found on MSM8916. Update the DT bindings documentation.
>
> Signed-off-by: Archit Taneja <architt@codeaurora.org>
> ---
> .../devicetree/bindings/dma/qcom_bam_dma.txt | 1 +
> drivers/dma/qcom_bam_dma.c | 30 ++++++++++++++++++++++
> 2 files changed, 31 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
> index f8c3311..1c9d48e 100644
> --- a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
> +++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
> @@ -4,6 +4,7 @@ Required properties:
> - compatible: must be one of the following:
> * "qcom,bam-v1.4.0" for MSM8974, APQ8074 and APQ8084
> * "qcom,bam-v1.3.0" for APQ8064, IPQ8064 and MSM8960
> + * "qcom,bam-v1.7.0" for MSM8916
> - reg: Address range for DMA registers
> - interrupts: Should contain the one interrupt shared by all channels
> - #dma-cells: must be <1>, the cell in the dmas property of the client device
> diff --git a/drivers/dma/qcom_bam_dma.c b/drivers/dma/qcom_bam_dma.c
> index 3122a99..447ad12 100644
> --- a/drivers/dma/qcom_bam_dma.c
> +++ b/drivers/dma/qcom_bam_dma.c
> @@ -171,6 +171,35 @@ static const struct reg_offset_data bam_v1_4_reg_info[] = {
> [BAM_P_FIFO_SIZES] = { 0x1820, 0x00, 0x1000, 0x00 },
> };
>
> +static const struct reg_offset_data bam_v1_7_reg_info[] = {
> + [BAM_CTRL] = { 0x00000, 0x00, 0x00, 0x00 },
> + [BAM_REVISION] = { 0x01000, 0x00, 0x00, 0x00 },
> + [BAM_NUM_PIPES] = { 0x01008, 0x00, 0x00, 0x00 },
> + [BAM_DESC_CNT_TRSHLD] = { 0x00008, 0x00, 0x00, 0x00 },
> + [BAM_IRQ_SRCS] = { 0x03010, 0x00, 0x00, 0x00 },
> + [BAM_IRQ_SRCS_MSK] = { 0x03014, 0x00, 0x00, 0x00 },
> + [BAM_IRQ_SRCS_UNMASKED] = { 0x03018, 0x00, 0x00, 0x00 },
> + [BAM_IRQ_STTS] = { 0x00014, 0x00, 0x00, 0x00 },
> + [BAM_IRQ_CLR] = { 0x00018, 0x00, 0x00, 0x00 },
> + [BAM_IRQ_EN] = { 0x0001C, 0x00, 0x00, 0x00 },
> + [BAM_CNFG_BITS] = { 0x0007C, 0x00, 0x00, 0x00 },
> + [BAM_IRQ_SRCS_EE] = { 0x03000, 0x00, 0x00, 0x80 },
> + [BAM_IRQ_SRCS_MSK_EE] = { 0x03004, 0x00, 0x00, 0x80 },
huh, 0x80 should be 0x1000 ?
> + [BAM_P_CTRL] = { 0x13000, 0x1000, 0x00, 0x00 },
> + [BAM_P_RST] = { 0x13004, 0x1000, 0x00, 0x00 },
> + [BAM_P_HALT] = { 0x13008, 0x1000, 0x00, 0x00 },
> + [BAM_P_IRQ_STTS] = { 0x13010, 0x1000, 0x00, 0x00 },
> + [BAM_P_IRQ_CLR] = { 0x13014, 0x1000, 0x00, 0x00 },
> + [BAM_P_IRQ_EN] = { 0x13018, 0x1000, 0x00, 0x00 },
> + [BAM_P_EVNT_DEST_ADDR] = { 0x1382C, 0x00, 0x1000, 0x00 },
> + [BAM_P_EVNT_REG] = { 0x13818, 0x00, 0x1000, 0x00 },
> + [BAM_P_SW_OFSTS] = { 0x13800, 0x00, 0x1000, 0x00 },
> + [BAM_P_DATA_FIFO_ADDR] = { 0x13824, 0x00, 0x1000, 0x00 },
> + [BAM_P_DESC_FIFO_ADDR] = { 0x1381C, 0x00, 0x1000, 0x00 },
> + [BAM_P_EVNT_GEN_TRSHLD] = { 0x13828, 0x00, 0x1000, 0x00 },
> + [BAM_P_FIFO_SIZES] = { 0x13820, 0x00, 0x1000, 0x00 },
> +};
<snip>
--
regards,
Stan
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0
2015-02-20 11:57 ` Stanimir Varbanov
@ 2015-02-20 22:28 ` Andy Gross
0 siblings, 0 replies; 8+ messages in thread
From: Andy Gross @ 2015-02-20 22:28 UTC (permalink / raw)
To: Stanimir Varbanov
Cc: Archit Taneja, vinod.koul, dmaengine, linux-arm-msm, linux-kernel
On Fri, Feb 20, 2015 at 01:57:29PM +0200, Stanimir Varbanov wrote:
<snip>
> > + [BAM_IRQ_EN] = { 0x0001C, 0x00, 0x00, 0x00 },
> > + [BAM_CNFG_BITS] = { 0x0007C, 0x00, 0x00, 0x00 },
> > + [BAM_IRQ_SRCS_EE] = { 0x03000, 0x00, 0x00, 0x80 },
> > + [BAM_IRQ_SRCS_MSK_EE] = { 0x03004, 0x00, 0x00, 0x80 },
>
> huh, 0x80 should be 0x1000 ?
yeah the SRCS_EE and SRCS_MSK_EE should be 0x1000. good catch
<snip>
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0
2015-01-22 7:04 [PATCH] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0 Archit Taneja
2015-01-22 21:48 ` Andy Gross
2015-02-20 11:57 ` Stanimir Varbanov
@ 2015-02-23 4:10 ` Archit Taneja
2015-03-06 14:33 ` Ivan T. Ivanov
2015-03-16 16:52 ` Vinod Koul
2 siblings, 2 replies; 8+ messages in thread
From: Archit Taneja @ 2015-02-23 4:10 UTC (permalink / raw)
To: svarbanov, agross, vinod.koul
Cc: dmaengine, linux-arm-msm, linux-kernel, Archit Taneja
Add register offset table entry for the newer (v1.7.0) version of the BAM IP
found on MSM8916. Update the DT bindings documentation.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
Change in v2: Fix wrong execution environment multiplier for BAM_IRQ_SRCS_EE and
BAM_IRQ_SRCS_MSK_EE
.../devicetree/bindings/dma/qcom_bam_dma.txt | 1 +
drivers/dma/qcom_bam_dma.c | 30 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
index f8c3311..1c9d48e 100644
--- a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
+++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
@@ -4,6 +4,7 @@ Required properties:
- compatible: must be one of the following:
* "qcom,bam-v1.4.0" for MSM8974, APQ8074 and APQ8084
* "qcom,bam-v1.3.0" for APQ8064, IPQ8064 and MSM8960
+ * "qcom,bam-v1.7.0" for MSM8916
- reg: Address range for DMA registers
- interrupts: Should contain the one interrupt shared by all channels
- #dma-cells: must be <1>, the cell in the dmas property of the client device
diff --git a/drivers/dma/qcom_bam_dma.c b/drivers/dma/qcom_bam_dma.c
index d7a33b3..c737e6d 100644
--- a/drivers/dma/qcom_bam_dma.c
+++ b/drivers/dma/qcom_bam_dma.c
@@ -171,6 +171,35 @@ static const struct reg_offset_data bam_v1_4_reg_info[] = {
[BAM_P_FIFO_SIZES] = { 0x1820, 0x00, 0x1000, 0x00 },
};
+static const struct reg_offset_data bam_v1_7_reg_info[] = {
+ [BAM_CTRL] = { 0x00000, 0x00, 0x00, 0x00 },
+ [BAM_REVISION] = { 0x01000, 0x00, 0x00, 0x00 },
+ [BAM_NUM_PIPES] = { 0x01008, 0x00, 0x00, 0x00 },
+ [BAM_DESC_CNT_TRSHLD] = { 0x00008, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_SRCS] = { 0x03010, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_SRCS_MSK] = { 0x03014, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_SRCS_UNMASKED] = { 0x03018, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_STTS] = { 0x00014, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_CLR] = { 0x00018, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_EN] = { 0x0001C, 0x00, 0x00, 0x00 },
+ [BAM_CNFG_BITS] = { 0x0007C, 0x00, 0x00, 0x00 },
+ [BAM_IRQ_SRCS_EE] = { 0x03000, 0x00, 0x00, 0x1000 },
+ [BAM_IRQ_SRCS_MSK_EE] = { 0x03004, 0x00, 0x00, 0x1000 },
+ [BAM_P_CTRL] = { 0x13000, 0x1000, 0x00, 0x00 },
+ [BAM_P_RST] = { 0x13004, 0x1000, 0x00, 0x00 },
+ [BAM_P_HALT] = { 0x13008, 0x1000, 0x00, 0x00 },
+ [BAM_P_IRQ_STTS] = { 0x13010, 0x1000, 0x00, 0x00 },
+ [BAM_P_IRQ_CLR] = { 0x13014, 0x1000, 0x00, 0x00 },
+ [BAM_P_IRQ_EN] = { 0x13018, 0x1000, 0x00, 0x00 },
+ [BAM_P_EVNT_DEST_ADDR] = { 0x1382C, 0x00, 0x1000, 0x00 },
+ [BAM_P_EVNT_REG] = { 0x13818, 0x00, 0x1000, 0x00 },
+ [BAM_P_SW_OFSTS] = { 0x13800, 0x00, 0x1000, 0x00 },
+ [BAM_P_DATA_FIFO_ADDR] = { 0x13824, 0x00, 0x1000, 0x00 },
+ [BAM_P_DESC_FIFO_ADDR] = { 0x1381C, 0x00, 0x1000, 0x00 },
+ [BAM_P_EVNT_GEN_TRSHLD] = { 0x13828, 0x00, 0x1000, 0x00 },
+ [BAM_P_FIFO_SIZES] = { 0x13820, 0x00, 0x1000, 0x00 },
+};
+
/* BAM CTRL */
#define BAM_SW_RST BIT(0)
#define BAM_EN BIT(1)
@@ -1051,6 +1080,7 @@ static void bam_channel_init(struct bam_device *bdev, struct bam_chan *bchan,
static const struct of_device_id bam_of_match[] = {
{ .compatible = "qcom,bam-v1.3.0", .data = &bam_v1_3_reg_info },
{ .compatible = "qcom,bam-v1.4.0", .data = &bam_v1_4_reg_info },
+ { .compatible = "qcom,bam-v1.7.0", .data = &bam_v1_7_reg_info },
{}
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0
2015-02-23 4:10 ` [PATCH v2] " Archit Taneja
@ 2015-03-06 14:33 ` Ivan T. Ivanov
2015-03-16 16:52 ` Vinod Koul
1 sibling, 0 replies; 8+ messages in thread
From: Ivan T. Ivanov @ 2015-03-06 14:33 UTC (permalink / raw)
To: Archit Taneja
Cc: svarbanov, agross, vinod.koul, dmaengine, linux-arm-msm, linux-kernel
On Mon, 2015-02-23 at 09:40 +0530, Archit Taneja wrote:
> Add register offset table entry for the newer (v1.7.0) version of the BAM IP
> found on MSM8916. Update the DT bindings documentation.
>
> Signed-off-by: Archit Taneja <architt@codeaurora.org>
> ---
> Change in v2: Fix wrong execution environment multiplier for BAM_IRQ_SRCS_EE and
> BAM_IRQ_SRCS_MSK_EE
>
> .../devicetree/bindings/dma/qcom_bam_dma.txt | 1 +
> drivers/dma/qcom_bam_dma.c | 30 ++++++++++++++++++++++
> 2 files changed, 31 insertions(+)
Tested-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Using Stan's SPI DMA patches[1].
Thanks,
Ivan
[1] https://lkml.org/lkml/2015/3/4/621
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0
2015-02-23 4:10 ` [PATCH v2] " Archit Taneja
2015-03-06 14:33 ` Ivan T. Ivanov
@ 2015-03-16 16:52 ` Vinod Koul
1 sibling, 0 replies; 8+ messages in thread
From: Vinod Koul @ 2015-03-16 16:52 UTC (permalink / raw)
To: Archit Taneja; +Cc: svarbanov, agross, dmaengine, linux-arm-msm, linux-kernel
On Mon, Feb 23, 2015 at 09:40:33AM +0530, Archit Taneja wrote:
> Add register offset table entry for the newer (v1.7.0) version of the BAM IP
> found on MSM8916. Update the DT bindings documentation.
>
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-03-16 16:56 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-22 7:04 [PATCH] dmaengine: qcom_bam_dma: Add support for BAM v1.7.0 Archit Taneja
2015-01-22 21:48 ` Andy Gross
2015-02-10 5:50 ` Stanimir Varbanov
2015-02-20 11:57 ` Stanimir Varbanov
2015-02-20 22:28 ` Andy Gross
2015-02-23 4:10 ` [PATCH v2] " Archit Taneja
2015-03-06 14:33 ` Ivan T. Ivanov
2015-03-16 16:52 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).