Commit b7d41d6d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: mx1-camera: compile fix

This fixes a regression of

	7d58289f

 (mx1: prefix SOC specific defines with MX1_ and deprecate old names)
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6f550dc0
...@@ -31,7 +31,13 @@ ...@@ -31,7 +31,13 @@
#define DMA_MODE_WRITE 1 #define DMA_MODE_WRITE 1
#define DMA_MODE_MASK 1 #define DMA_MODE_MASK 1
#define DMA_BASE IO_ADDRESS(DMA_BASE_ADDR) #define MX1_DMA_REG(offset) MX1_IO_ADDRESS(MX1_DMA_BASE_ADDR + (offset))
/* DMA Interrupt Mask Register */
#define MX1_DMA_DIMR MX1_DMA_REG(0x08)
/* Channel Control Register */
#define MX1_DMA_CCR(x) MX1_DMA_REG(0x8c + ((x) << 6))
#define IMX_DMA_MEMSIZE_32 (0 << 4) #define IMX_DMA_MEMSIZE_32 (0 << 4)
#define IMX_DMA_MEMSIZE_8 (1 << 4) #define IMX_DMA_MEMSIZE_8 (1 << 4)
......
...@@ -49,8 +49,6 @@ ...@@ -49,8 +49,6 @@
/* /*
* CSI registers * CSI registers
*/ */
#define DMA_CCR(x) (0x8c + ((x) << 6)) /* Control Registers */
#define DMA_DIMR 0x08 /* Interrupt mask Register */
#define CSICR1 0x00 /* CSI Control Register 1 */ #define CSICR1 0x00 /* CSI Control Register 1 */
#define CSISR 0x08 /* CSI Status Register */ #define CSISR 0x08 /* CSI Status Register */
#define CSIRXR 0x10 /* CSI RxFIFO Register */ #define CSIRXR 0x10 /* CSI RxFIFO Register */
...@@ -784,7 +782,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev) ...@@ -784,7 +782,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev)
pcdev); pcdev);
imx_dma_config_channel(pcdev->dma_chan, IMX_DMA_TYPE_FIFO, imx_dma_config_channel(pcdev->dma_chan, IMX_DMA_TYPE_FIFO,
IMX_DMA_MEMSIZE_32, DMA_REQ_CSI_R, 0); IMX_DMA_MEMSIZE_32, MX1_DMA_REQ_CSI_R, 0);
/* burst length : 16 words = 64 bytes */ /* burst length : 16 words = 64 bytes */
imx_dma_config_burstlen(pcdev->dma_chan, 0); imx_dma_config_burstlen(pcdev->dma_chan, 0);
...@@ -798,8 +796,8 @@ static int __init mx1_camera_probe(struct platform_device *pdev) ...@@ -798,8 +796,8 @@ static int __init mx1_camera_probe(struct platform_device *pdev)
set_fiq_handler(&mx1_camera_sof_fiq_start, &mx1_camera_sof_fiq_end - set_fiq_handler(&mx1_camera_sof_fiq_start, &mx1_camera_sof_fiq_end -
&mx1_camera_sof_fiq_start); &mx1_camera_sof_fiq_start);
regs.ARM_r8 = DMA_BASE + DMA_DIMR; regs.ARM_r8 = (long)MX1_DMA_DIMR;
regs.ARM_r9 = DMA_BASE + DMA_CCR(pcdev->dma_chan); regs.ARM_r9 = (long)MX1_DMA_CCR(pcdev->dma_chan);
regs.ARM_r10 = (long)pcdev->base + CSICR1; regs.ARM_r10 = (long)pcdev->base + CSICR1;
regs.ARM_fp = (long)pcdev->base + CSISR; regs.ARM_fp = (long)pcdev->base + CSISR;
regs.ARM_sp = 1 << pcdev->dma_chan; regs.ARM_sp = 1 << pcdev->dma_chan;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment