On Mon, Apr 07, 2014 at 02:44:42PM +0200, Denis Carikli wrote:
arch/arm/boot/dts/imx51-apf51dev.dts | 2 +- arch/arm/boot/dts/imx53-m53evk.dts | 2 +- drivers/staging/imx-drm/imx-ldb.c | 4 ++-- drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts index c5a9a24..7b3851d 100644 --- a/arch/arm/boot/dts/imx51-apf51dev.dts +++ b/arch/arm/boot/dts/imx51-apf51dev.dts @@ -18,7 +18,7 @@
display@di1 { compatible = "fsl,imx-parallel-display";
interface-pix-fmt = "bgr666";
interface-pix-fmt = "rgb666";
...
/* bgr666 */ ipu_dc_map_clear(priv, IPU_DC_MAP_BGR666);
- ipu_dc_map_config(priv, IPU_DC_MAP_BGR666, 0, 5, 0xfc); /* blue */
- ipu_dc_map_config(priv, IPU_DC_MAP_BGR666, 0, 17, 0xfc); /* blue */ ipu_dc_map_config(priv, IPU_DC_MAP_BGR666, 1, 11, 0xfc); /* green */
- ipu_dc_map_config(priv, IPU_DC_MAP_BGR666, 2, 17, 0xfc); /* red */
- ipu_dc_map_config(priv, IPU_DC_MAP_BGR666, 2, 5, 0xfc); /* red */
arm-soc people have become very obtuse with respect to changes to any patches to arch/arm/boot/dts, and complain loudly if any changes to that directory do not go through them as separate patches.
What this means is that your patch is unacceptable and needs to be split up.
The choices seem to be to either break imx-drm by splitting the patch in two, thereby ending up with the two dependent changes being merged entirely separate, resulting in breakage while one or other is merged, or to add the RGB666 support, wait for that to hit mainline, then update the DT files, wait for that to hit mainline, then fix the BGR666 support. That'll take around six to nine months (two to three months per release cycle.)
Or arm-soc could come to their senses and realise that they do not have sole ownership over arch/arm/boot/dts.