[PATCH v2] video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE

[eric@eukrea.com (Eric Bénard)]

Signed-off-by: Eric B?nard <eric@eukrea.com>
---
v2:	handle CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE

 drivers/video/imxfb.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 43f0639..a6f0d3f 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -175,7 +175,10 @@ struct imxfb_info {
 
 	struct imx_fb_videomode *mode;
 	int			num_modes;
+#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
+	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
 	struct backlight_device *bl;
+#endif
 
 	void (*lcd_power)(int);
 	void (*backlight_power)(int);
@@ -450,8 +453,8 @@ static int imxfb_set_par(struct fb_info *info)
 	return 0;
 }
 
-
-
+#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
+	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
 static int imxfb_bl_get_brightness(struct backlight_device *bl)
 {
 	struct imxfb_info *fbi = bl_get_data(bl);
@@ -516,6 +519,7 @@ static void imxfb_exit_backlight(struct imxfb_info *fbi)
 	if (fbi->bl)
 		backlight_device_unregister(fbi->bl);
 }
+#endif
 
 static void imxfb_enable_controller(struct imxfb_info *fbi)
 {
@@ -647,6 +651,10 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 			fbi->regs + LCDC_SIZE);
 
 	writel(fbi->pcr, fbi->regs + LCDC_PCR);
+#if ! defined(CONFIG_BACKLIGHT_CLASS_DEVICE) && \
+	! defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
+	writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
+#endif
 	writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
 	writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
 
@@ -847,7 +855,10 @@ static int __init imxfb_probe(struct platform_device *pdev)
 
 	imxfb_enable_controller(fbi);
 	fbi->pdev = pdev;
+#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
+	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
 	imxfb_init_backlight(fbi);
+#endif
 
 	return 0;
 
@@ -885,7 +896,10 @@ static int __devexit imxfb_remove(struct platform_device *pdev)
 
 	imxfb_disable_controller(fbi);
 
+#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
+	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
 	imxfb_exit_backlight(fbi);
+#endif
 	unregister_framebuffer(info);
 
 	pdata = pdev->dev.platform_data;
-- 
1.6.3.3