aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2010-02-17 09:33:22 -0500
committerGrant Likely <grant.likely@secretlab.ca>2010-02-17 09:33:22 -0500
commitd24720a45ad2928f687c6371482cdfba19b74fc5 (patch)
treed7adfe21ae927ce5a81bc41e15fe8c6f146a2190
parent85cd7467f3a66800c20815d3fca45d33038b9279 (diff)
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>
-rw-r--r--arch/powerpc/boot/dts/mpc5121ads.dts2
-rw-r--r--drivers/video/fsl-diu-fb.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index d2b2db7cb4a2..c9ef6bbe26cf 100644
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -255,7 +255,7 @@
255 }; 255 };
256 256
257 display@2100 { 257 display@2100 {
258 compatible = "fsl,mpc5121-diu", "fsl,diu"; 258 compatible = "fsl,mpc5121-diu";
259 reg = <0x2100 0x100>; 259 reg = <0x2100 0x100>;
260 interrupts = <64 0x8>; 260 interrupts = <64 0x8>;
261 interrupt-parent = < &ipic >; 261 interrupt-parent = < &ipic >;
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 72d68b3dc478..4637bcbe03a4 100644
--- 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)
1633#endif 1633#endif
1634 1634
1635static struct of_device_id fsl_diu_match[] = { 1635static struct of_device_id fsl_diu_match[] = {
1636#ifdef CONFIG_PPC_MPC512x
1637 {
1638 .compatible = "fsl,mpc5121-diu",
1639 },
1640#endif
1636 { 1641 {
1637 .compatible = "fsl,diu", 1642 .compatible = "fsl,diu",
1638 }, 1643 },