Hi Steve, On Sat, Jun 07, 2014 at 02:56:06PM -0700, Steve Longerbeam wrote: > Signed-off-by: Jiada Wang <jiada_wang@xxxxxxxxxx> > --- > drivers/staging/imx-drm/ipu-v3/ipu-common.c | 18 ++++++++++++++++++ > include/linux/platform_data/imx-ipu-v3.h | 1 + > 2 files changed, 19 insertions(+) > > diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c > index f8e8c56..2d95a7c 100644 > --- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c > +++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c > @@ -829,10 +829,28 @@ static struct ipu_devtype ipu_type_imx6q = { > .type = IPUV3H, > }; > > +static struct ipu_devtype ipu_type_imx6dl = { > + .name = "IPUv3HDL", > + .cm_ofs = 0x00200000, > + .cpmem_ofs = 0x00300000, > + .srm_ofs = 0x00340000, > + .tpm_ofs = 0x00360000, > + .csi0_ofs = 0x00230000, > + .csi1_ofs = 0x00238000, > + .disp0_ofs = 0x00240000, > + .disp1_ofs = 0x00248000, > + .smfc_ofs = 0x00250000, > + .ic_ofs = 0x00220000, > + .vdi_ofs = 0x00268000, > + .dc_tmpl_ofs = 0x00380000, > + .type = IPUV3HDL, > +}; This breaks bisectibility. This patch must come after [PATCH 08/43] imx-drm: ipu-v3: Add units required for video capture Besides, is there any difference between IPUv3HDL and IPUv3H? Can't you reuse it? Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html