Commit 74017294 authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds
Browse files

[PATCH] sh: SH4-202 microdev updates 



A few trivial updates for the microdev board support code:

	- Update for __IO_PREFIX changes.
	- Consolidate headers into a single microdev.h.
	- Update the microdev_defconfig.
	- Add init values for the S1D13806 used by s1d13xxxfb.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4a41cdf9

arch/sh/boards/superh/microdev/io.c

+95 −97
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/pci.h>

#include <linux/wait.h>

#include <asm/io.h>

#include <asm/mach/io.h>

#include <asm/microdev.h>



	/*

	 *	we need to have a 'safe' address to re-direct all I/O requests
@@ -52,8 +52,90 @@ 
#define	IO_ISP1161_PHYS		0xa7700000ul	/* Physical address of Philips ISP1161x USB chip */

#define	IO_SUPERIO_PHYS		0xa7800000ul	/* Physical address of SMSC FDC37C93xAPM SuperIO chip */



#define PORT2ADDR(x) (microdev_isa_port2addr(x))

/*

 * map I/O ports to memory-mapped addresses

 */

static unsigned long microdev_isa_port2addr(unsigned long offset)

{

	unsigned long result;



	if ((offset >= IO_LAN91C111_BASE) &&

	    (offset <  IO_LAN91C111_BASE + IO_LAN91C111_EXTENT)) {

			/*

			 *	SMSC LAN91C111 Ethernet chip

			 */

		result = IO_LAN91C111_PHYS + offset - IO_LAN91C111_BASE;

	} else if ((offset >= IO_SUPERIO_BASE) &&

		   (offset <  IO_SUPERIO_BASE + IO_SUPERIO_EXTENT)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	Configuration Registers

			 */

		result = IO_SUPERIO_PHYS + (offset << 1);

#if 0

	} else if (offset == KBD_DATA_REG || offset == KBD_CNTL_REG ||

		   offset == KBD_STATUS_REG) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	PS/2 Keyboard + Mouse (ports 0x60 and 0x64).

			 */

	        result = IO_SUPERIO_PHYS + (offset << 1);

#endif

	} else if (((offset >= IO_IDE1_BASE) &&

		    (offset <  IO_IDE1_BASE + IO_IDE_EXTENT)) ||

		    (offset == IO_IDE1_MISC)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	IDE #1

			 */

	        result = IO_SUPERIO_PHYS + (offset << 1);

	} else if (((offset >= IO_IDE2_BASE) &&

		    (offset <  IO_IDE2_BASE + IO_IDE_EXTENT)) ||

		    (offset == IO_IDE2_MISC)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	IDE #2

			 */

	        result = IO_SUPERIO_PHYS + (offset << 1);

	} else if ((offset >= IO_SERIAL1_BASE) &&

		   (offset <  IO_SERIAL1_BASE + IO_SERIAL_EXTENT)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	Serial #1

			 */

		result = IO_SUPERIO_PHYS + (offset << 1);

	} else if ((offset >= IO_SERIAL2_BASE) &&

		   (offset <  IO_SERIAL2_BASE + IO_SERIAL_EXTENT)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	Serial #2

			 */

		result = IO_SUPERIO_PHYS + (offset << 1);

	} else if ((offset >= IO_ISP1161_BASE) &&

		   (offset < IO_ISP1161_BASE + IO_ISP1161_EXTENT)) {

			/*

			 *	Philips USB ISP1161x chip

			 */

		result = IO_ISP1161_PHYS + offset - IO_ISP1161_BASE;

	} else {

			/*

			 *	safe default.

			 */

		printk("Warning: unexpected port in %s( offset = 0x%lx )\n",

		       __FUNCTION__, offset);

		result = PVR;

	}



	return result;

}



#define PORT2ADDR(x) (microdev_isa_port2addr(x))



static inline void delay(void)

{
@@ -94,6 +176,17 @@ unsigned int microdev_inl(unsigned long port) 
	return *(volatile unsigned int*)PORT2ADDR(port);

}



void microdev_outw(unsigned short b, unsigned long port)

{

#ifdef CONFIG_PCI

	if (port >= PCIBIOS_MIN_IO) {

		microdev_pci_outw(b, port);

		return;

	}

#endif

	*(volatile unsigned short*)PORT2ADDR(port) = b;

}



void microdev_outb(unsigned char b, unsigned long port)

{

#ifdef CONFIG_PCI
@@ -158,17 +251,6 @@ void microdev_outb(unsigned char b, unsigned long port) 
	}

}



void microdev_outw(unsigned short b, unsigned long port)

{

#ifdef CONFIG_PCI

	if (port >= PCIBIOS_MIN_IO) {

		microdev_pci_outw(b, port);

		return;

	}

#endif

	*(volatile unsigned short*)PORT2ADDR(port) = b;

}



void microdev_outl(unsigned int b, unsigned long port)

{

#ifdef CONFIG_PCI
@@ -284,87 +366,3 @@ void microdev_outsl(unsigned long port, const void *buffer, unsigned long count) 
	while (count--)

		*port_addr = *buf++;

}
 


/*

 * map I/O ports to memory-mapped addresses

 */

unsigned long microdev_isa_port2addr(unsigned long offset)

{

	unsigned long result;



	if ((offset >= IO_LAN91C111_BASE) &&

	    (offset <  IO_LAN91C111_BASE + IO_LAN91C111_EXTENT)) {

			/*

			 *	SMSC LAN91C111 Ethernet chip

			 */

		result = IO_LAN91C111_PHYS + offset - IO_LAN91C111_BASE;

	} else if ((offset >= IO_SUPERIO_BASE) &&

		   (offset <  IO_SUPERIO_BASE + IO_SUPERIO_EXTENT)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	Configuration Registers

			 */

		result = IO_SUPERIO_PHYS + (offset << 1);

#if 0

	} else if (offset == KBD_DATA_REG || offset == KBD_CNTL_REG ||

		   offset == KBD_STATUS_REG) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	PS/2 Keyboard + Mouse (ports 0x60 and 0x64).

			 */

	        result = IO_SUPERIO_PHYS + (offset << 1);

#endif

	} else if (((offset >= IO_IDE1_BASE) &&

		    (offset <  IO_IDE1_BASE + IO_IDE_EXTENT)) ||

		    (offset == IO_IDE1_MISC)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	IDE #1

			 */

	        result = IO_SUPERIO_PHYS + (offset << 1);

	} else if (((offset >= IO_IDE2_BASE) &&

		    (offset <  IO_IDE2_BASE + IO_IDE_EXTENT)) ||

		    (offset == IO_IDE2_MISC)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	IDE #2

			 */

	        result = IO_SUPERIO_PHYS + (offset << 1);

	} else if ((offset >= IO_SERIAL1_BASE) &&

		   (offset <  IO_SERIAL1_BASE + IO_SERIAL_EXTENT)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	Serial #1

			 */

		result = IO_SUPERIO_PHYS + (offset << 1);

	} else if ((offset >= IO_SERIAL2_BASE) &&

		   (offset <  IO_SERIAL2_BASE + IO_SERIAL_EXTENT)) {

			/*

			 *	SMSC FDC37C93xAPM SuperIO chip

			 *

			 *	Serial #2

			 */

		result = IO_SUPERIO_PHYS + (offset << 1);

	} else if ((offset >= IO_ISP1161_BASE) &&

		   (offset < IO_ISP1161_BASE + IO_ISP1161_EXTENT)) {

			/*

			 *	Philips USB ISP1161x chip

			 */

		result = IO_ISP1161_PHYS + offset - IO_ISP1161_BASE;

	} else {

			/*

			 *	safe default.

			 */

		printk("Warning: unexpected port in %s( offset = 0x%lx )\n",

		       __FUNCTION__, offset);

		result = PVR;

	}



	return result;

}

arch/sh/boards/superh/microdev/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include <asm/system.h>

#include <asm/io.h>

#include <asm/mach/irq.h>

#include <asm/microdev.h>



#define NUM_EXTERNAL_IRQS 16	/* IRL0 .. IRL15 */

arch/sh/boards/superh/microdev/setup.c

+154 −12
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2003 Sean McGoogan (Sean.McGoogan@superh.com)

 * Copyright (C) 2003, 2004 SuperH, Inc.

 * Copyright (C) 2004 Paul Mundt

 * Copyright (C) 2004, 2005 Paul Mundt

 *

 * SuperH SH4-202 MicroDev board support.

 *
@@ -15,11 +15,10 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/ioport.h>

#include <video/s1d13xxxfb.h>

#include <asm/microdev.h>

#include <asm/io.h>

#include <asm/mach/irq.h>

#include <asm/mach/io.h>

#include <asm/machvec.h>

#include <asm/machvec_init.h>



extern void microdev_heartbeat(void);
@@ -51,8 +50,6 @@ struct sh_machine_vector mv_sh4202_microdev __initmv = { 
	.mv_outsw		= microdev_outsw,

	.mv_outsl		= microdev_outsl,



	.mv_isa_port2addr	= microdev_isa_port2addr,



	.mv_init_irq		= init_microdev_irq,



#ifdef CONFIG_HEARTBEAT
@@ -142,16 +139,161 @@ static struct platform_device smc91x_device = { 
	.resource	= smc91x_resources,

};



static int __init smc91x_setup(void)

#ifdef CONFIG_FB_S1D13XXX

static struct s1d13xxxfb_regval s1d13806_initregs[] = {

	{ S1DREG_MISC,			0x00 },

	{ S1DREG_COM_DISP_MODE,		0x00 },

	{ S1DREG_GPIO_CNF0,		0x00 },

	{ S1DREG_GPIO_CNF1,		0x00 },

	{ S1DREG_GPIO_CTL0,		0x00 },

	{ S1DREG_GPIO_CTL1,		0x00 },

	{ S1DREG_CLK_CNF,		0x02 },

	{ S1DREG_LCD_CLK_CNF,		0x01 },

	{ S1DREG_CRT_CLK_CNF,		0x03 },

	{ S1DREG_MPLUG_CLK_CNF,		0x03 },

	{ S1DREG_CPU2MEM_WST_SEL,	0x02 },

	{ S1DREG_SDRAM_REF_RATE,	0x03 },

	{ S1DREG_SDRAM_TC0,		0x00 },

	{ S1DREG_SDRAM_TC1,		0x01 },

	{ S1DREG_MEM_CNF,		0x80 },

	{ S1DREG_PANEL_TYPE,		0x25 },

	{ S1DREG_MOD_RATE,		0x00 },

	{ S1DREG_LCD_DISP_HWIDTH,	0x63 },

	{ S1DREG_LCD_NDISP_HPER,	0x1e },

	{ S1DREG_TFT_FPLINE_START,	0x06 },

	{ S1DREG_TFT_FPLINE_PWIDTH,	0x03 },

	{ S1DREG_LCD_DISP_VHEIGHT0,	0x57 },

	{ S1DREG_LCD_DISP_VHEIGHT1,	0x02 },

	{ S1DREG_LCD_NDISP_VPER,	0x00 },

	{ S1DREG_TFT_FPFRAME_START,	0x0a },

	{ S1DREG_TFT_FPFRAME_PWIDTH,	0x81 },

	{ S1DREG_LCD_DISP_MODE,		0x03 },

	{ S1DREG_LCD_MISC,		0x00 },

	{ S1DREG_LCD_DISP_START0,	0x00 },

	{ S1DREG_LCD_DISP_START1,	0x00 },

	{ S1DREG_LCD_DISP_START2,	0x00 },

	{ S1DREG_LCD_MEM_OFF0,		0x90 },

	{ S1DREG_LCD_MEM_OFF1,		0x01 },

	{ S1DREG_LCD_PIX_PAN,		0x00 },

	{ S1DREG_LCD_DISP_FIFO_HTC,	0x00 },

	{ S1DREG_LCD_DISP_FIFO_LTC,	0x00 },

	{ S1DREG_CRT_DISP_HWIDTH,	0x63 },

	{ S1DREG_CRT_NDISP_HPER,	0x1f },

	{ S1DREG_CRT_HRTC_START,	0x04 },

	{ S1DREG_CRT_HRTC_PWIDTH,	0x8f },

	{ S1DREG_CRT_DISP_VHEIGHT0,	0x57 },

	{ S1DREG_CRT_DISP_VHEIGHT1,	0x02 },

	{ S1DREG_CRT_NDISP_VPER,	0x1b },

	{ S1DREG_CRT_VRTC_START,	0x00 },

	{ S1DREG_CRT_VRTC_PWIDTH,	0x83 },

	{ S1DREG_TV_OUT_CTL,		0x10 },

	{ S1DREG_CRT_DISP_MODE,		0x05 },

	{ S1DREG_CRT_DISP_START0,	0x00 },

	{ S1DREG_CRT_DISP_START1,	0x00 },

	{ S1DREG_CRT_DISP_START2,	0x00 },

	{ S1DREG_CRT_MEM_OFF0,		0x20 },

	{ S1DREG_CRT_MEM_OFF1,		0x03 },

	{ S1DREG_CRT_PIX_PAN,		0x00 },

	{ S1DREG_CRT_DISP_FIFO_HTC,	0x00 },

	{ S1DREG_CRT_DISP_FIFO_LTC,	0x00 },

	{ S1DREG_LCD_CUR_CTL,		0x00 },

	{ S1DREG_LCD_CUR_START,		0x01 },

	{ S1DREG_LCD_CUR_XPOS0,		0x00 },

	{ S1DREG_LCD_CUR_XPOS1,		0x00 },

	{ S1DREG_LCD_CUR_YPOS0,		0x00 },

	{ S1DREG_LCD_CUR_YPOS1,		0x00 },

	{ S1DREG_LCD_CUR_BCTL0,		0x00 },

	{ S1DREG_LCD_CUR_GCTL0,		0x00 },

	{ S1DREG_LCD_CUR_RCTL0,		0x00 },

	{ S1DREG_LCD_CUR_BCTL1,		0x1f },

	{ S1DREG_LCD_CUR_GCTL1,		0x3f },

	{ S1DREG_LCD_CUR_RCTL1,		0x1f },

	{ S1DREG_LCD_CUR_FIFO_HTC,	0x00 },

	{ S1DREG_CRT_CUR_CTL,		0x00 },

	{ S1DREG_CRT_CUR_START,		0x01 },

	{ S1DREG_CRT_CUR_XPOS0,		0x00 },

	{ S1DREG_CRT_CUR_XPOS1,		0x00 },

	{ S1DREG_CRT_CUR_YPOS0,		0x00 },

	{ S1DREG_CRT_CUR_YPOS1,		0x00 },

	{ S1DREG_CRT_CUR_BCTL0,		0x00 },

	{ S1DREG_CRT_CUR_GCTL0,		0x00 },

	{ S1DREG_CRT_CUR_RCTL0,		0x00 },

	{ S1DREG_CRT_CUR_BCTL1,		0x1f },

	{ S1DREG_CRT_CUR_GCTL1,		0x3f },

	{ S1DREG_CRT_CUR_RCTL1,		0x1f },

	{ S1DREG_CRT_CUR_FIFO_HTC,	0x00 },

	{ S1DREG_BBLT_CTL0,		0x00 },

	{ S1DREG_BBLT_CTL1,		0x00 },

	{ S1DREG_BBLT_CC_EXP,		0x00 },

	{ S1DREG_BBLT_OP,		0x00 },

	{ S1DREG_BBLT_SRC_START0,	0x00 },

	{ S1DREG_BBLT_SRC_START1,	0x00 },

	{ S1DREG_BBLT_SRC_START2,	0x00 },

	{ S1DREG_BBLT_DST_START0,	0x00 },

	{ S1DREG_BBLT_DST_START1,	0x00 },

	{ S1DREG_BBLT_DST_START2,	0x00 },

	{ S1DREG_BBLT_MEM_OFF0,		0x00 },

	{ S1DREG_BBLT_MEM_OFF1,		0x00 },

	{ S1DREG_BBLT_WIDTH0,		0x00 },

	{ S1DREG_BBLT_WIDTH1,		0x00 },

	{ S1DREG_BBLT_HEIGHT0,		0x00 },

	{ S1DREG_BBLT_HEIGHT1,		0x00 },

	{ S1DREG_BBLT_BGC0,		0x00 },

	{ S1DREG_BBLT_BGC1,		0x00 },

	{ S1DREG_BBLT_FGC0,		0x00 },

	{ S1DREG_BBLT_FGC1,		0x00 },

	{ S1DREG_LKUP_MODE,		0x00 },

	{ S1DREG_LKUP_ADDR,		0x00 },

	{ S1DREG_PS_CNF,		0x10 },

	{ S1DREG_PS_STATUS,		0x00 },

	{ S1DREG_CPU2MEM_WDOGT,		0x00 },

	{ S1DREG_COM_DISP_MODE,		0x02 },

};



static struct s1d13xxxfb_pdata s1d13806_platform_data = {

	.initregs	= s1d13806_initregs,

	.initregssize	= ARRAY_SIZE(s1d13806_initregs),

};



static struct resource s1d13806_resources[] = {

	[0] = {

		.start		= 0x07200000,

		.end		= 0x07200000 + 0x00200000 - 1,

		.flags		= IORESOURCE_MEM,

	},

	[1] = {

		.start		= 0x07000000,

		.end		= 0x07000000 + 0x00200000 - 1,

		.flags		= IORESOURCE_MEM,

	},

};



static struct platform_device s1d13806_device = {

	.name		= "s1d13806fb",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(s1d13806_resources),

	.resource	= s1d13806_resources,



	.dev = {

		.platform_data	= &s1d13806_platform_data,

	},

};

#endif



static struct platform_device *microdev_devices[] __initdata = {

	&smc91x_device,

#ifdef CONFIG_FB_S1D13XXX

	&s1d13806_device,

#endif

};



static int __init microdev_devices_setup(void)

{

	return platform_device_register(&smc91x_device);

	return platform_add_devices(microdev_devices, ARRAY_SIZE(microdev_devices));

}



__initcall(smc91x_setup);

__initcall(microdev_devices_setup);



	/*

	 * Initialize the board

	 */

void __init platform_setup(void)

{

	int * const fpgaRevisionRegister = (int*)(MICRODEV_FPGA_GP_BASE + 0x8ul);

arch/sh/configs/microdev_defconfig

+252 −158

File changed.

Preview size limit exceeded, changes collapsed.

include/asm-sh/microdev/irq.h→include/asm-sh/microdev.h

+34 −26
Original line number Diff line number Diff line 
/*

 * linux/include/asm-sh/irq_microdev.h

 * linux/include/asm-sh/microdev.h

 *

 * Copyright (C) 2003 Sean McGoogan (Sean.McGoogan@superh.com)

 *

 * IRQ functions for the SuperH SH4-202 MicroDev board.

 * Definitions for the SuperH SH4-202 MicroDev board.

 *

 * May be copied or modified under the terms of the GNU General Public

 * License.  See linux/COPYING for more information.

 *

 */





#ifndef _ASM_SH_IRQ_MICRODEV_H

#define _ASM_SH_IRQ_MICRODEV_H

#ifndef __ASM_SH_MICRODEV_H

#define __ASM_SH_MICRODEV_H



extern void init_microdev_irq(void);

extern void microdev_print_fpga_intc_status(void);





/*

	 *	The following are useful macros for manipulating the

	 *	interrupt controller (INTC) on the CPU-board FPGA.

	 *	It should be noted that there is an INTC on the FPGA,

	 *	and a seperate INTC on the SH4-202 core - these are

	 *	two different things, both of which need to be prorammed

	 *	to correctly route - unfortunately, they have the

	 *	same name and abbreviations!

 * The following are useful macros for manipulating the interrupt

 * controller (INTC) on the CPU-board FPGA.  should be noted that there

 * is an INTC on the FPGA, and a seperate INTC on the SH4-202 core -

 * these are two different things, both of which need to be prorammed to

 * correctly route - unfortunately, they have the same name and

 * abbreviations!

 */

#define	MICRODEV_FPGA_INTC_BASE		0xa6110000ul				/* INTC base address on CPU-board FPGA */

#define	MICRODEV_FPGA_INTENB_REG	(MICRODEV_FPGA_INTC_BASE+0ul)		/* Interrupt Enable Register on INTC on CPU-board FPGA */
@@ -39,8 +34,8 @@ extern void microdev_print_fpga_intc_status(void); 




/*

	 *	The following are the IRQ numbers for the Linux Kernel for external interrupts.

	 *	i.e. the numbers seen by 'cat /proc/interrupt'.

 * The following are the IRQ numbers for the Linux Kernel for external

 * interrupts.  i.e. the numbers seen by 'cat /proc/interrupt'.

 */

#define MICRODEV_LINUX_IRQ_KEYBOARD	 1	/* SuperIO Keyboard */

#define MICRODEV_LINUX_IRQ_SERIAL1	 2	/* SuperIO Serial #1 */
@@ -52,8 +47,9 @@ extern void microdev_print_fpga_intc_status(void); 
#define MICRODEV_LINUX_IRQ_IDE1		14	/* SuperIO IDE #1 */



/*

	 *	The following are the IRQ numbers for the INTC on the FPGA for external interrupts.

	 *	i.e. the bits in the INTC registers in the FPGA.

 * The following are the IRQ numbers for the INTC on the FPGA for

 * external interrupts.  i.e. the bits in the INTC registers in the

 * FPGA.

 */

#define MICRODEV_FPGA_IRQ_KEYBOARD	 1	/* SuperIO Keyboard */

#define MICRODEV_FPGA_IRQ_SERIAL1	 3	/* SuperIO Serial #1 */
@@ -69,4 +65,16 @@ extern void microdev_print_fpga_intc_status(void); 
#define MICRODEV_IRQ_PCI_INTC		10

#define MICRODEV_IRQ_PCI_INTD		11



#endif /* _ASM_SH_IRQ_MICRODEV_H */
 
#define __IO_PREFIX microdev

#include <asm/io_generic.h>



#if defined(CONFIG_PCI)

unsigned char  microdev_pci_inb(unsigned long port);

unsigned short microdev_pci_inw(unsigned long port);

unsigned long  microdev_pci_inl(unsigned long port);

void           microdev_pci_outb(unsigned char  data, unsigned long port);

void           microdev_pci_outw(unsigned short data, unsigned long port);

void           microdev_pci_outl(unsigned long  data, unsigned long port);

#endif



#endif /* __ASM_SH_MICRODEV_H */