diff options
-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 @@ | |||
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 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) | |||
1633 | #endif | 1633 | #endif |
1634 | 1634 | ||
1635 | static struct of_device_id fsl_diu_match[] = { | 1635 | static 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 | }, |