diff options
| author | Anatolij Gustschin <agust@denx.de> | 2010-02-17 07:33:22 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-17 07:33:22 -0700 |
| commit | d24720a45ad2928f687c6371482cdfba19b74fc5 (patch) | |
| tree | d7adfe21ae927ce5a81bc41e15fe8c6f146a2190 | |
| parent | 85cd7467f3a66800c20815d3fca45d33038b9279 (diff) | |
| download | linux-3.10-d24720a45ad2928f687c6371482cdfba19b74fc5.tar.gz linux-3.10-d24720a45ad2928f687c6371482cdfba19b74fc5.tar.bz2 linux-3.10-d24720a45ad2928f687c6371482cdfba19b74fc5.zip | |
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.dts | 2 | ||||
| -rw-r--r-- | drivers/video/fsl-diu-fb.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts index d2b2db7cb4a..c9ef6bbe26c 100644 --- 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 72d68b3dc47..4637bcbe03a 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) #endif static struct of_device_id fsl_diu_match[] = { +#ifdef CONFIG_PPC_MPC512x + { + .compatible = "fsl,mpc5121-diu", + }, +#endif { .compatible = "fsl,diu", }, |