Skip to content

Commit

Permalink
s3c2410fb: fix s3c2410 compilation
Browse files Browse the repository at this point in the history 
The implicit mapping has been removed from the arch
as this should be handled in the driver, this patch
fixes the s3c2410_fb driver to ioremap() the necessary
registers.

Signed-off-by: Ben Dooks <[email protected]>
Acked-by: Arnaud Patard <[email protected]>
Signed-off-by: Antonino Daplas <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Ben Dooks authored and Linus Torvalds committed Jul 31, 2007
1 parent 1692b37 commit aff39a8
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 31 deletions.
88 changes: 57 additions & 31 deletions drivers/video/s3c2410fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ static void schedule_palette_update(struct s3c2410fb_info *fbi,
{
unsigned long flags;
unsigned long irqen;
void __iomem *regs = fbi->io;

local_irq_save(flags);

Expand All @@ -483,9 +484,9 @@ static void schedule_palette_update(struct s3c2410fb_info *fbi,
fbi->palette_ready = 1;

/* enable IRQ */
irqen = readl(S3C2410_LCDINTMSK);
irqen = readl(regs + S3C2410_LCDINTMSK);
irqen &= ~S3C2410_LCDINT_FRSYNC;
writel(irqen, S3C2410_LCDINTMSK);
writel(irqen, regs + S3C2410_LCDINTMSK);
}

local_irq_restore(flags);
Expand Down Expand Up @@ -680,6 +681,7 @@ static inline void modify_gpio(void __iomem *reg,
static int s3c2410fb_init_registers(struct s3c2410fb_info *fbi)
{
unsigned long flags;
void __iomem *regs = fbi->io;

/* Initialise LCD with values from haret */

Expand All @@ -694,47 +696,48 @@ static int s3c2410fb_init_registers(struct s3c2410fb_info *fbi)

local_irq_restore(flags);

writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
writel(fbi->regs.lcdcon2, S3C2410_LCDCON2);
writel(fbi->regs.lcdcon3, S3C2410_LCDCON3);
writel(fbi->regs.lcdcon4, S3C2410_LCDCON4);
writel(fbi->regs.lcdcon5, S3C2410_LCDCON5);
writel(fbi->regs.lcdcon1, regs + S3C2410_LCDCON1);
writel(fbi->regs.lcdcon2, regs + S3C2410_LCDCON2);
writel(fbi->regs.lcdcon3, regs + S3C2410_LCDCON3);
writel(fbi->regs.lcdcon4, regs + S3C2410_LCDCON4);
writel(fbi->regs.lcdcon5, regs + S3C2410_LCDCON5);

s3c2410fb_set_lcdaddr(fbi);

dprintk("LPCSEL = 0x%08lx\n", mach_info->lpcsel);
writel(mach_info->lpcsel, S3C2410_LPCSEL);
writel(mach_info->lpcsel, regs + S3C2410_LPCSEL);

dprintk("replacing TPAL %08x\n", readl(S3C2410_TPAL));
dprintk("replacing TPAL %08x\n", readl(regs + S3C2410_TPAL));

/* ensure temporary palette disabled */
writel(0x00, S3C2410_TPAL);
writel(0x00, regs + S3C2410_TPAL);

/* Enable video by setting the ENVID bit to 1 */
fbi->regs.lcdcon1 |= S3C2410_LCDCON1_ENVID;
writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
writel(fbi->regs.lcdcon1, regs + S3C2410_LCDCON1);
return 0;
}

static void s3c2410fb_write_palette(struct s3c2410fb_info *fbi)
{
unsigned int i;
unsigned long ent;
void __iomem *regs = fbi->io;

fbi->palette_ready = 0;

for (i = 0; i < 256; i++) {
if ((ent = fbi->palette_buffer[i]) == PALETTE_BUFF_CLEAR)
continue;

writel(ent, S3C2410_TFTPAL(i));
writel(ent, regs + S3C2410_TFTPAL(i));

/* it seems the only way to know exactly
* if the palette wrote ok, is to check
* to see if the value verifies ok
*/

if (readw(S3C2410_TFTPAL(i)) == ent)
if (readw(regs + S3C2410_TFTPAL(i)) == ent)
fbi->palette_buffer[i] = PALETTE_BUFF_CLEAR;
else
fbi->palette_ready = 1; /* retry */
Expand All @@ -744,14 +747,15 @@ static void s3c2410fb_write_palette(struct s3c2410fb_info *fbi)
static irqreturn_t s3c2410fb_irq(int irq, void *dev_id)
{
struct s3c2410fb_info *fbi = dev_id;
unsigned long lcdirq = readl(S3C2410_LCDINTPND);
void __iomem *regs = fbi->io;
unsigned long lcdirq = readl(regs + S3C2410_LCDINTPND);

if (lcdirq & S3C2410_LCDINT_FRSYNC) {
if (fbi->palette_ready)
s3c2410fb_write_palette(fbi);

writel(S3C2410_LCDINT_FRSYNC, S3C2410_LCDINTPND);
writel(S3C2410_LCDINT_FRSYNC, S3C2410_LCDSRCPND);
writel(S3C2410_LCDINT_FRSYNC, regs + S3C2410_LCDINTPND);
writel(S3C2410_LCDINT_FRSYNC, regs + S3C2410_LCDSRCPND);
}

return IRQ_HANDLED;
Expand All @@ -764,9 +768,11 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
struct s3c2410fb_info *info;
struct fb_info *fbinfo;
struct s3c2410fb_hw *mregs;
struct resource *res;
int ret;
int irq;
int i;
int size;
u32 lcdcon1;

mach_info = pdev->dev.platform_data;
Expand All @@ -788,11 +794,32 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
return -ENOMEM;
}


info = fbinfo->par;
info->fb = fbinfo;
info->dev = &pdev->dev;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) {
dev_err(&pdev->dev, "failed to get memory registersn");
ret = -ENXIO;
goto dealloc_fb;
}

size = (res->end - res->start)+1;
info->mem = request_mem_region(res->start, size, pdev->name);
if (info->mem == NULL) {
dev_err(&pdev->dev, "failed to get memory region\n");
ret = -ENOENT;
goto dealloc_fb;
}

info->io = ioremap(res->start, size);
if (info->io == NULL) {
dev_err(&pdev->dev, "ioremap() of registers failed\n");
ret = -ENXIO;
goto release_mem;
}

platform_set_drvdata(pdev, fbinfo);

dprintk("devinit\n");
Expand All @@ -803,8 +830,8 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)

/* Stop the video and unset ENVID if set */
info->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
lcdcon1 = readl(S3C2410_LCDCON1);
writel(lcdcon1 & ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1);
lcdcon1 = readl(info->io + S3C2410_LCDCON1);
writel(lcdcon1 & ~S3C2410_LCDCON1_ENVID, info->io + S3C2410_LCDCON1);

info->mach_info = pdev->dev.platform_data;

Expand Down Expand Up @@ -855,19 +882,11 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
for (i = 0; i < 256; i++)
info->palette_buffer[i] = PALETTE_BUFF_CLEAR;

if (!request_mem_region((unsigned long)S3C24XX_VA_LCD, SZ_1M, "s3c2410-lcd")) {
ret = -EBUSY;
goto dealloc_fb;
}


dprintk("got LCD region\n");

ret = request_irq(irq, s3c2410fb_irq, IRQF_DISABLED, pdev->name, info);
if (ret) {
dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret);
ret = -EBUSY;
goto release_mem;
goto release_regs;
}

info->clk = clk_get(NULL, "lcd");
Expand All @@ -889,6 +908,7 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
ret = -ENOMEM;
goto release_clock;
}

dprintk("got video memory\n");

ret = s3c2410fb_init_registers(info);
Expand Down Expand Up @@ -916,8 +936,11 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
clk_put(info->clk);
release_irq:
free_irq(irq,info);
release_regs:
iounmap(info->io);
release_mem:
release_mem_region((unsigned long)S3C24XX_VA_LCD, S3C24XX_SZ_LCD);
release_resource(info->mem);
kfree(info->mem);
dealloc_fb:
framebuffer_release(fbinfo);
return ret;
Expand All @@ -935,7 +958,7 @@ static void s3c2410fb_stop_lcd(struct s3c2410fb_info *fbi)
local_irq_save(flags);

fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
writel(fbi->regs.lcdcon1, fbi->io + S3C2410_LCDCON1);

local_irq_restore(flags);
}
Expand All @@ -962,7 +985,10 @@ static int s3c2410fb_remove(struct platform_device *pdev)

irq = platform_get_irq(pdev, 0);
free_irq(irq,info);
release_mem_region((unsigned long)S3C24XX_VA_LCD, S3C24XX_SZ_LCD);

release_resource(info->mem);
kfree(info->mem);
iounmap(info->io);
unregister_framebuffer(fbinfo);

return 0;
Expand Down
3 changes: 3 additions & 0 deletions drivers/video/s3c2410fb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ struct s3c2410fb_info {
struct device *dev;
struct clk *clk;

struct resource *mem;
void __iomem *io;

struct s3c2410fb_mach_info *mach_info;

/* raw memory addresses */
Expand Down

0 comments on commit aff39a8

Please sign in to comment.