Message ID | 1424364350-32239-1-git-send-email-svarbanov@mm-sol.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 02/19/2015 10:15 PM, Stanimir Varbanov wrote: > The commit fb93f520e (dmaengine: qcom_bam_dma: Generalize BAM > register offset calculations) wrongly populated base offsets > for event registers for bam v1.4. > > Signed-off-by: Stanimir Varbanov <svarbanov@mm-sol.com> > --- > drivers/dma/qcom_bam_dma.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/dma/qcom_bam_dma.c b/drivers/dma/qcom_bam_dma.c > index debe106..95b7668 100644 > --- a/drivers/dma/qcom_bam_dma.c > +++ b/drivers/dma/qcom_bam_dma.c > @@ -162,9 +162,9 @@ static const struct reg_offset_data bam_v1_4_reg_info[] = { > [BAM_P_IRQ_STTS] = { 0x1010, 0x1000, 0x00, 0x00 }, > [BAM_P_IRQ_CLR] = { 0x1014, 0x1000, 0x00, 0x00 }, > [BAM_P_IRQ_EN] = { 0x1018, 0x1000, 0x00, 0x00 }, > - [BAM_P_EVNT_DEST_ADDR] = { 0x102C, 0x00, 0x1000, 0x00 }, > - [BAM_P_EVNT_REG] = { 0x1018, 0x00, 0x1000, 0x00 }, > - [BAM_P_SW_OFSTS] = { 0x1000, 0x00, 0x1000, 0x00 }, > + [BAM_P_EVNT_DEST_ADDR] = { 0x182C, 0x00, 0x1000, 0x00 }, > + [BAM_P_EVNT_REG] = { 0x1818, 0x00, 0x1000, 0x00 }, > + [BAM_P_SW_OFSTS] = { 0x1800, 0x00, 0x1000, 0x00 }, > [BAM_P_DATA_FIFO_ADDR] = { 0x1824, 0x00, 0x1000, 0x00 }, > [BAM_P_DESC_FIFO_ADDR] = { 0x181C, 0x00, 0x1000, 0x00 }, > [BAM_P_EVNT_GEN_TRSHLD] = { 0x1828, 0x00, 0x1000, 0x00 }, > Didn't know how this crept in. Apologies for the inconvenience! Reviewed-by: Archit Taneja <architt@codeaurora.org>
On Thu, Feb 19, 2015 at 06:45:50PM +0200, Stanimir Varbanov wrote: > The commit fb93f520e (dmaengine: qcom_bam_dma: Generalize BAM > register offset calculations) wrongly populated base offsets > for event registers for bam v1.4. > > Signed-off-by: Stanimir Varbanov <svarbanov@mm-sol.com> Reviewed-by: Andy Gross <agross@codeaurora.org>
On Thu, Feb 19, 2015 at 06:45:50PM +0200, Stanimir Varbanov wrote: > The commit fb93f520e (dmaengine: qcom_bam_dma: Generalize BAM > register offset calculations) wrongly populated base offsets > for event registers for bam v1.4. > Applied, thanks
diff --git a/drivers/dma/qcom_bam_dma.c b/drivers/dma/qcom_bam_dma.c index debe106..95b7668 100644 --- a/drivers/dma/qcom_bam_dma.c +++ b/drivers/dma/qcom_bam_dma.c @@ -162,9 +162,9 @@ static const struct reg_offset_data bam_v1_4_reg_info[] = { [BAM_P_IRQ_STTS] = { 0x1010, 0x1000, 0x00, 0x00 }, [BAM_P_IRQ_CLR] = { 0x1014, 0x1000, 0x00, 0x00 }, [BAM_P_IRQ_EN] = { 0x1018, 0x1000, 0x00, 0x00 }, - [BAM_P_EVNT_DEST_ADDR] = { 0x102C, 0x00, 0x1000, 0x00 }, - [BAM_P_EVNT_REG] = { 0x1018, 0x00, 0x1000, 0x00 }, - [BAM_P_SW_OFSTS] = { 0x1000, 0x00, 0x1000, 0x00 }, + [BAM_P_EVNT_DEST_ADDR] = { 0x182C, 0x00, 0x1000, 0x00 }, + [BAM_P_EVNT_REG] = { 0x1818, 0x00, 0x1000, 0x00 }, + [BAM_P_SW_OFSTS] = { 0x1800, 0x00, 0x1000, 0x00 }, [BAM_P_DATA_FIFO_ADDR] = { 0x1824, 0x00, 0x1000, 0x00 }, [BAM_P_DESC_FIFO_ADDR] = { 0x181C, 0x00, 0x1000, 0x00 }, [BAM_P_EVNT_GEN_TRSHLD] = { 0x1828, 0x00, 0x1000, 0x00 },
The commit fb93f520e (dmaengine: qcom_bam_dma: Generalize BAM register offset calculations) wrongly populated base offsets for event registers for bam v1.4. Signed-off-by: Stanimir Varbanov <svarbanov@mm-sol.com> --- drivers/dma/qcom_bam_dma.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)