Commit c4e5a023 authored by Timur Tabi's avatar Timur Tabi Committed by Florian Tobias Schandinat

drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported

The Freescale DIU video controller supports five video "modes", but only
the first two are used by the driver.  The other three are special modes
that don't make sense for a framebuffer driver.  Therefore, there's no
point in keeping a global variable that indicates which mode we're
supposed to use.
Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 7e47c211
...@@ -253,7 +253,7 @@ void __init mpc512x_init_diu(void) ...@@ -253,7 +253,7 @@ void __init mpc512x_init_diu(void)
} }
mode = in_be32(&diu_reg->diu_mode); mode = in_be32(&diu_reg->diu_mode);
if (mode != MFB_MODE1) { if (mode == MFB_MODE0) {
pr_info("%s: DIU OFF\n", __func__); pr_info("%s: DIU OFF\n", __func__);
goto out; goto out;
} }
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
struct diu_hw { struct diu_hw {
struct diu __iomem *diu_reg; struct diu __iomem *diu_reg;
spinlock_t reg_lock; spinlock_t reg_lock;
unsigned int mode; /* DIU operation mode */
}; };
struct diu_addr { struct diu_addr {
...@@ -426,7 +425,6 @@ static struct mfb_info mfb_template[] = { ...@@ -426,7 +425,6 @@ static struct mfb_info mfb_template[] = {
}; };
static struct diu_hw dr = { static struct diu_hw dr = {
.mode = MFB_MODE1,
.reg_lock = __SPIN_LOCK_UNLOCKED(diu_hw.reg_lock), .reg_lock = __SPIN_LOCK_UNLOCKED(diu_hw.reg_lock),
}; };
...@@ -620,7 +618,7 @@ static void enable_lcdc(struct fb_info *info) ...@@ -620,7 +618,7 @@ static void enable_lcdc(struct fb_info *info)
struct fsl_diu_data *machine_data = mfbi->parent; struct fsl_diu_data *machine_data = mfbi->parent;
if (!machine_data->fb_enabled) { if (!machine_data->fb_enabled) {
out_be32(&hw->diu_mode, dr.mode); out_be32(&hw->diu_mode, MFB_MODE1);
machine_data->fb_enabled++; machine_data->fb_enabled++;
} }
} }
...@@ -1390,9 +1388,6 @@ static int request_irq_local(int irq) ...@@ -1390,9 +1388,6 @@ static int request_irq_local(int irq)
ints |= INT_VSYNC; ints |= INT_VSYNC;
#endif #endif
if (dr.mode == MFB_MODE2 || dr.mode == MFB_MODE3)
ints |= INT_VSYNC_WB;
/* Read to clear the status */ /* Read to clear the status */
in_be32(&hw->int_status); in_be32(&hw->int_status);
out_be32(&hw->int_mask, ints); out_be32(&hw->int_mask, ints);
...@@ -1558,7 +1553,7 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev) ...@@ -1558,7 +1553,7 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev)
} }
diu_mode = in_be32(&dr.diu_reg->diu_mode); diu_mode = in_be32(&dr.diu_reg->diu_mode);
if (diu_mode != MFB_MODE1) if (diu_mode == MFB_MODE0)
out_be32(&dr.diu_reg->diu_mode, 0); /* disable DIU */ out_be32(&dr.diu_reg->diu_mode, 0); /* disable DIU */
/* Get the IRQ of the DIU */ /* Get the IRQ of the DIU */
...@@ -1611,7 +1606,7 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev) ...@@ -1611,7 +1606,7 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev)
* Let DIU display splash screen if it was pre-initialized * Let DIU display splash screen if it was pre-initialized
* by the bootloader, set dummy area descriptor otherwise. * by the bootloader, set dummy area descriptor otherwise.
*/ */
if (diu_mode != MFB_MODE1) if (diu_mode == MFB_MODE0)
out_be32(&dr.diu_reg->desc[0], machine_data->dummy_ad->paddr); out_be32(&dr.diu_reg->desc[0], machine_data->dummy_ad->paddr);
out_be32(&dr.diu_reg->desc[1], machine_data->dummy_ad->paddr); out_be32(&dr.diu_reg->desc[1], machine_data->dummy_ad->paddr);
......
...@@ -153,12 +153,12 @@ struct diu { ...@@ -153,12 +153,12 @@ struct diu {
__be32 plut; __be32 plut;
} __attribute__ ((packed)); } __attribute__ ((packed));
/* Modes of operation of DIU */ /*
* Modes of operation of DIU. The DIU supports five different modes, but
* the driver only supports modes 0 and 1.
*/
#define MFB_MODE0 0 /* DIU off */ #define MFB_MODE0 0 /* DIU off */
#define MFB_MODE1 1 /* All three planes output to display */ #define MFB_MODE1 1 /* All three planes output to display */
#define MFB_MODE2 2 /* Plane 1 to display, planes 2+3 written back*/
#define MFB_MODE3 3 /* All three planes written back to memory */
#define MFB_MODE4 4 /* Color bar generation */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __FSL_DIU_FB_H__ */ #endif /* __FSL_DIU_FB_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment