powerpc/mpc5121: correct DIU compatible property

The DIU driver should bind against "fsl,mpc5121-diu"
directly. Add this compatible property to the match
table and fix DTS and platform code accordingly.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index d2b2db7cb4a29b47ec9ffdf8224d3e40d9add92b..c9ef6bbe26cf7a43a9d240a790f466dc77ed77fb 100644 (file)
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -255,7 +255,7 @@
                };
 
                display@2100 {
-                       compatible = "fsl,mpc5121-diu", "fsl,diu";
+                       compatible = "fsl,mpc5121-diu";
                        reg = <0x2100 0x100>;
                        interrupts = <64 0x8>;
                        interrupt-parent = < &ipic >;

diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 72d68b3dc478ec4292b6eef69025de3d25a43a52..4637bcbe03a4bcd462a86c52c34338e26f003e46 100644 (file)
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1633,6 +1633,11 @@ static int __init fsl_diu_setup(char *options)
 #endif
 
 static struct of_device_id fsl_diu_match[] = {
+#ifdef CONFIG_PPC_MPC512x
+       {
+               .compatible = "fsl,mpc5121-diu",
+       },
+#endif
        {
                .compatible = "fsl,diu",
        },