diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
commit | 2e00fde5c6ed8535244332ebb55e881baa54ae46 (patch) | |
tree | f578e02ef1dc6e59630f09404bb2f58500876811 /drivers/video/fbdev/amba-clcd.c | |
parent | 39f0ccde3624e7cf882faccf7f72a47b7a763bfb (diff) | |
parent | 3231e2053eaeee70bdfb216a78a30f11e88e2243 (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/video/fbdev/amba-clcd.c')
-rw-r--r-- | drivers/video/fbdev/amba-clcd.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c index fe274b5851c7..93e66a9148b9 100644 --- a/drivers/video/fbdev/amba-clcd.c +++ b/drivers/video/fbdev/amba-clcd.c @@ -440,13 +440,14 @@ static int clcdfb_register(struct clcd_fb *fb) fb->off_ienb = CLCD_PL111_IENB; fb->off_cntl = CLCD_PL111_CNTL; } else { -#ifdef CONFIG_ARCH_VERSATILE - fb->off_ienb = CLCD_PL111_IENB; - fb->off_cntl = CLCD_PL111_CNTL; -#else - fb->off_ienb = CLCD_PL110_IENB; - fb->off_cntl = CLCD_PL110_CNTL; -#endif + if (of_machine_is_compatible("arm,versatile-ab") || + of_machine_is_compatible("arm,versatile-pb")) { + fb->off_ienb = CLCD_PL111_IENB; + fb->off_cntl = CLCD_PL111_CNTL; + } else { + fb->off_ienb = CLCD_PL110_IENB; + fb->off_cntl = CLCD_PL110_CNTL; + } } fb->clk = clk_get(&fb->dev->dev, NULL); |