Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.

1 files changed, 24 insertions, 41 deletions

diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index e3406ab31305..727a5149d818 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -245,6 +245,7 @@ struct mx3fb_data {
 
         uint32_t                h_start_width;
         uint32_t                v_start_width;
+        enum disp_data_mapping  disp_data_fmt;
 };
 
 struct dma_chan_request {
@@ -287,11 +288,14 @@ static void mx3fb_write_reg(struct mx3fb_data *mx3fb, u32 value, unsigned long r
         __raw_writel(value, mx3fb->reg_base + reg);
 }
 
-static const uint32_t di_mappings[] = {
-        0x1600AAAA, 0x00E05555, 0x00070000, 3,  /* RGB888 */
-        0x0005000F, 0x000B000F, 0x0011000F, 1,  /* RGB666 */
-        0x0011000F, 0x000B000F, 0x0005000F, 1,  /* BGR666 */
-        0x0004003F, 0x000A000F, 0x000F003F, 1   /* RGB565 */
+struct di_mapping {
+        uint32_t b0, b1, b2;
+};
+
+static const struct di_mapping di_mappings[] = {
+        [IPU_DISP_DATA_MAPPING_RGB666] = { 0x0005000f, 0x000b000f, 0x0011000f },
+        [IPU_DISP_DATA_MAPPING_RGB565] = { 0x0004003f, 0x000a000f, 0x000f003f },
+        [IPU_DISP_DATA_MAPPING_RGB888] = { 0x00070000, 0x000f0000, 0x00170000 },
 };
 
 static void sdc_fb_init(struct mx3fb_info *fbi)
@@ -334,7 +338,7 @@ static void sdc_enable_channel(struct mx3fb_info *mx3_fbi)
         /* This enables the channel */
         if (mx3_fbi->cookie < 0) {
                 mx3_fbi->txd = dma_chan->device->device_prep_slave_sg(dma_chan,
-                      &mx3_fbi->sg[0], 1, DMA_TO_DEVICE, DMA_PREP_INTERRUPT);
+                      &mx3_fbi->sg[0], 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT);
                 if (!mx3_fbi->txd) {
                         dev_err(mx3fb->dev, "Cannot allocate descriptor on %d\n",
                                 dma_chan->chan_id);
@@ -425,7 +429,6 @@ static int sdc_set_window_pos(struct mx3fb_data *mx3fb, enum ipu_channel channel
  * @pixel_clk:          desired pixel clock frequency in Hz.
  * @width:              width of panel in pixels.
  * @height:             height of panel in pixels.
- * @pixel_fmt:          pixel format of buffer as FOURCC ASCII code.
  * @h_start_width:      number of pixel clocks between the HSYNC signal pulse
  *                      and the start of valid data.
  * @h_sync_width:       width of the HSYNC signal in units of pixel clocks.
@@ -442,7 +445,6 @@ static int sdc_set_window_pos(struct mx3fb_data *mx3fb, enum ipu_channel channel
 static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,
                           uint32_t pixel_clk,
                           uint16_t width, uint16_t height,
-                          enum pixel_fmt pixel_fmt,
                           uint16_t h_start_width, uint16_t h_sync_width,
                           uint16_t h_end_width, uint16_t v_start_width,
                           uint16_t v_sync_width, uint16_t v_end_width,
@@ -453,6 +455,7 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,
         uint32_t old_conf;
         uint32_t div;
         struct clk *ipu_clk;
+        const struct di_mapping *map;
 
         dev_dbg(mx3fb->dev, "panel size = %d x %d", width, height);
 
@@ -540,36 +543,10 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,
                 sig.Vsync_pol << DI_D3_VSYNC_POL_SHIFT;
         mx3fb_write_reg(mx3fb, old_conf, DI_DISP_SIG_POL);
 
-        switch (pixel_fmt) {
-        case IPU_PIX_FMT_RGB24:
-                mx3fb_write_reg(mx3fb, di_mappings[0], DI_DISP3_B0_MAP);
-                mx3fb_write_reg(mx3fb, di_mappings[1], DI_DISP3_B1_MAP);
-                mx3fb_write_reg(mx3fb, di_mappings[2], DI_DISP3_B2_MAP);
-                mx3fb_write_reg(mx3fb, mx3fb_read_reg(mx3fb, DI_DISP_ACC_CC) |
-                             ((di_mappings[3] - 1) << 12), DI_DISP_ACC_CC);
-                break;
-        case IPU_PIX_FMT_RGB666:
-                mx3fb_write_reg(mx3fb, di_mappings[4], DI_DISP3_B0_MAP);
-                mx3fb_write_reg(mx3fb, di_mappings[5], DI_DISP3_B1_MAP);
-                mx3fb_write_reg(mx3fb, di_mappings[6], DI_DISP3_B2_MAP);
-                mx3fb_write_reg(mx3fb, mx3fb_read_reg(mx3fb, DI_DISP_ACC_CC) |
-                             ((di_mappings[7] - 1) << 12), DI_DISP_ACC_CC);
-                break;
-        case IPU_PIX_FMT_BGR666:
-                mx3fb_write_reg(mx3fb, di_mappings[8], DI_DISP3_B0_MAP);
-                mx3fb_write_reg(mx3fb, di_mappings[9], DI_DISP3_B1_MAP);
-                mx3fb_write_reg(mx3fb, di_mappings[10], DI_DISP3_B2_MAP);
-                mx3fb_write_reg(mx3fb, mx3fb_read_reg(mx3fb, DI_DISP_ACC_CC) |
-                             ((di_mappings[11] - 1) << 12), DI_DISP_ACC_CC);
-                break;
-        default:
-                mx3fb_write_reg(mx3fb, di_mappings[12], DI_DISP3_B0_MAP);
-                mx3fb_write_reg(mx3fb, di_mappings[13], DI_DISP3_B1_MAP);
-                mx3fb_write_reg(mx3fb, di_mappings[14], DI_DISP3_B2_MAP);
-                mx3fb_write_reg(mx3fb, mx3fb_read_reg(mx3fb, DI_DISP_ACC_CC) |
-                             ((di_mappings[15] - 1) << 12), DI_DISP_ACC_CC);
-                break;
-        }
+        map = &di_mappings[mx3fb->disp_data_fmt];
+        mx3fb_write_reg(mx3fb, map->b0, DI_DISP3_B0_MAP);
+        mx3fb_write_reg(mx3fb, map->b1, DI_DISP3_B1_MAP);
+        mx3fb_write_reg(mx3fb, map->b2, DI_DISP3_B2_MAP);
 
         spin_unlock_irqrestore(&mx3fb->lock, lock_flags);
 
@@ -780,8 +757,6 @@ static int __set_par(struct fb_info *fbi, bool lock)
                 if (sdc_init_panel(mx3fb, mode,
                                    (PICOS2KHZ(fbi->var.pixclock)) * 1000UL,
                                    fbi->var.xres, fbi->var.yres,
-                                   (fbi->var.sync & FB_SYNC_SWAP_RGB) ?
-                                   IPU_PIX_FMT_BGR666 : IPU_PIX_FMT_RGB666,
                                    fbi->var.left_margin,
                                    fbi->var.hsync_len,
                                    fbi->var.right_margin +
@@ -1117,7 +1092,7 @@ static int mx3fb_pan_display(struct fb_var_screeninfo *var,
                 async_tx_ack(mx3_fbi->txd);
 
         txd = dma_chan->device->device_prep_slave_sg(dma_chan, sg +
-                mx3_fbi->cur_ipu_buf, 1, DMA_TO_DEVICE, DMA_PREP_INTERRUPT);
+                mx3_fbi->cur_ipu_buf, 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT);
         if (!txd) {
                 dev_err(fbi->device,
                         "Error preparing a DMA transaction descriptor.\n");
@@ -1349,6 +1324,12 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan)
         const struct fb_videomode *mode;
         int ret, num_modes;
 
+        if (mx3fb_pdata->disp_data_fmt >= ARRAY_SIZE(di_mappings)) {
+                dev_err(dev, "Illegal display data format %d\n",
+                                mx3fb_pdata->disp_data_fmt);
+                return -EINVAL;
+        }
+
         ichan->client = mx3fb;
         irq = ichan->eof_irq;
 
@@ -1402,6 +1383,8 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan)
         mx3fbi->mx3fb           = mx3fb;
         mx3fbi->blank           = FB_BLANK_NORMAL;
 
+        mx3fb->disp_data_fmt    = mx3fb_pdata->disp_data_fmt;
+
         init_completion(&mx3fbi->flip_cmpl);
         disable_irq(ichan->eof_irq);
         dev_dbg(mx3fb->dev, "disabling irq %d\n", ichan->eof_irq);