Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62669e61 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: mach-hp6xx: Fix up the hp6xx build for hd64461 changes. 



Fixes several compile errors due to the recent hd64461 I/O base changes.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 639138a9

arch/sh/cchips/hd6446x/hd64461.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int __init setup_hd64461(void) 


	printk(KERN_INFO

	       "HD64461 configured at 0x%x on irq %d(mapped into %d to %d)\n",

	       CONFIG_HD64461_IOBASE, CONFIG_HD64461_IRQ, HD64461_IRQBASE,

	       HD64461_IOBASE, CONFIG_HD64461_IRQ, HD64461_IRQBASE,

	       HD64461_IRQBASE + 15);



/* Should be at processor specific part.. */

arch/sh/include/asm/hd64461.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define	HD64461_PCC1_COMM	(HD64461_PCC1_BASE+HD64461_PCC_WINDOW)		/* 0xb5000000 */



/* Standby Control Register for HD64461 */

#define	HD64461_STBCR			CONFIG_HD64461_IOBASE

#define	HD64461_STBCR			HD64461_IO_OFFSET(0x00000000)

#define	HD64461_STBCR_CKIO_STBY		0x2000

#define	HD64461_STBCR_SAFECKE_IST	0x1000

#define	HD64461_STBCR_SLCKE_IST		0x0800

drivers/video/hitfb.c

+2 −2
Original line number Diff line number Diff line
@@ -335,9 +335,9 @@ static int __init hitfb_probe(struct platform_device *dev) 
	if (fb_get_options("hitfb", NULL))

		return -ENODEV;



	hitfb_fix.mmio_start = CONFIG_HD64461_IOBASE+0x1000;

	hitfb_fix.mmio_start = HD64461_IO_OFFSET(0x1000);

	hitfb_fix.mmio_len = 0x1000;

	hitfb_fix.smem_start = CONFIG_HD64461_IOBASE + 0x02000000;

	hitfb_fix.smem_start = HD64461_IO_OFFSET(0x02000000);

	hitfb_fix.smem_len = 512 * 1024;



	lcdclor = fb_readw(HD64461_LCDCLOR);