redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

fbdev: riva: remove the dependency on PPC_OF 

The OF functionality has moved to a common place and be used by many
archs. So we don't need to include the ppc arch specific header files
and depend on PPC_OF option any more. This is a preparation for
killing PPC_OF.

Signed-off-by: Kevin Hao <haokexin@gmail.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
wifi-calibration
Kevin Hao 2015-03-12 20:32:47 +08:00 committed by Michael Ellerman
parent 5299b62097
commit d14c374c2e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/video/fbdev/riva/fbdev.c
View File

@ -44,10 +44,6 @@
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
#include <asm/mtrr.h> #include <asm/mtrr.h>
#endif #endif
#ifdef CONFIG_PPC_OF
#include <asm/prom.h>
#include <asm/pci-bridge.h>
#endif
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/backlight.h> #include <asm/backlight.h>
@ -1735,7 +1731,6 @@ static int riva_set_fbinfo(struct fb_info *info)
return (rivafb_check_var(&info->var, info)); return (rivafb_check_var(&info->var, info));
} }
#ifdef CONFIG_PPC_OF
static int riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd) static int riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
{ {
struct riva_par *par = info->par; struct riva_par *par = info->par;
@ -1766,9 +1761,8 @@ static int riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
NVTRACE_LEAVE(); NVTRACE_LEAVE();
return 0; return 0;
} }
#endif /* CONFIG_PPC_OF */
#if defined(CONFIG_FB_RIVA_I2C) && !defined(CONFIG_PPC_OF) #if defined(CONFIG_FB_RIVA_I2C)
static int riva_get_EDID_i2c(struct fb_info *info) static int riva_get_EDID_i2c(struct fb_info *info)
{ {
struct riva_par *par = info->par; struct riva_par *par = info->par;
@ -1828,10 +1822,13 @@ static void riva_update_default_var(struct fb_var_screeninfo *var,
static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev) static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev)
{ {
NVTRACE_ENTER(); NVTRACE_ENTER();
#ifdef CONFIG_PPC_OF if (riva_get_EDID_OF(info, pdev)) {
if (!riva_get_EDID_OF(info, pdev)) NVTRACE_LEAVE();
return;
}
if (IS_ENABLED(CONFIG_OF))
printk(PFX "could not retrieve EDID from OF\n"); printk(PFX "could not retrieve EDID from OF\n");
#elif defined(CONFIG_FB_RIVA_I2C) #if defined(CONFIG_FB_RIVA_I2C)
if (!riva_get_EDID_i2c(info)) if (!riva_get_EDID_i2c(info))
printk(PFX "could not retrieve EDID from DDC/I2C\n"); printk(PFX "could not retrieve EDID from DDC/I2C\n");
#endif #endif