Commit 61c542bf authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c 



This patch moves regarding s3c24xx dev files to one devs.c
file in plat-samsung directory and this is required to merge
to plat-samsung.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 6b6844dd

arch/arm/mach-s3c2410/include/mach/fb.h

+1 −74
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/fb.h

 *

 * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>

 *

 * Inspired by pxafb.h

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#ifndef __ASM_ARM_FB_H

#define __ASM_ARM_FB_H



#include <mach/regs-lcd.h>



struct s3c2410fb_hw {

	unsigned long	lcdcon1;

	unsigned long	lcdcon2;

	unsigned long	lcdcon3;

	unsigned long	lcdcon4;

	unsigned long	lcdcon5;

};



/* LCD description */

struct s3c2410fb_display {

	/* LCD type */

	unsigned type;



	/* Screen size */

	unsigned short width;

	unsigned short height;



	/* Screen info */

	unsigned short xres;

	unsigned short yres;

	unsigned short bpp;



	unsigned pixclock;		/* pixclock in picoseconds */

	unsigned short left_margin;  /* value in pixels (TFT) or HCLKs (STN) */

	unsigned short right_margin; /* value in pixels (TFT) or HCLKs (STN) */

	unsigned short hsync_len;    /* value in pixels (TFT) or HCLKs (STN) */

	unsigned short upper_margin;	/* value in lines (TFT) or 0 (STN) */

	unsigned short lower_margin;	/* value in lines (TFT) or 0 (STN) */

	unsigned short vsync_len;	/* value in lines (TFT) or 0 (STN) */



	/* lcd configuration registers */

	unsigned long	lcdcon5;

};



struct s3c2410fb_mach_info {



	struct s3c2410fb_display *displays;	/* attached diplays info */

	unsigned num_displays;			/* number of defined displays */

	unsigned default_display;



	/* GPIOs */



	unsigned long	gpcup;

	unsigned long	gpcup_mask;

	unsigned long	gpccon;

	unsigned long	gpccon_mask;

	unsigned long	gpdup;

	unsigned long	gpdup_mask;

	unsigned long	gpdcon;

	unsigned long	gpdcon_mask;



	/* lpc3600 control register */

	unsigned long	lpcsel;

};



extern void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *);



#endif /* __ASM_ARM_FB_H */
 
#include <plat/fb-s3c2410.h>

arch/arm/mach-s3c2410/mach-qt2410.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 


#include <mach/regs-gpio.h>

#include <mach/leds-gpio.h>

#include <mach/regs-lcd.h>

#include <plat/regs-serial.h>

#include <mach/fb.h>

#include <plat/nand.h>

arch/arm/mach-s3c2440/mach-rx1950.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 


#include <mach/regs-gpio.h>

#include <mach/regs-gpioj.h>

#include <mach/regs-lcd.h>

#include <mach/h1940.h>

#include <mach/fb.h>

arch/arm/plat-s3c24xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj- := 


obj-y				+= cpu.o

obj-y				+= irq.o

obj-y				+= devs.o

obj-y				+= dev-uart.o

obj-y				+= clock.o

obj-$(CONFIG_S3C24XX_DCLK)	+= clock-dclk.o

arch/arm/plat-s3c24xx/dev-uart.c

0 → 100644
+100 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c24xx/dev-uart.c

 *

 * Copyright (c) 2004 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * Base S3C24XX UART resource and platform device definitions

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/interrupt.h>

#include <linux/list.h>

#include <linux/serial_core.h>

#include <linux/platform_device.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/irq.h>

#include <mach/hardware.h>

#include <mach/map.h>



#include <plat/devs.h>

#include <plat/regs-serial.h>



/* Serial port registrations */



static struct resource s3c2410_uart0_resource[] = {

	[0] = {

		.start = S3C2410_PA_UART0,

		.end   = S3C2410_PA_UART0 + 0x3fff,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_S3CUART_RX0,

		.end   = IRQ_S3CUART_ERR0,

		.flags = IORESOURCE_IRQ,

	}

};



static struct resource s3c2410_uart1_resource[] = {

	[0] = {

		.start = S3C2410_PA_UART1,

		.end   = S3C2410_PA_UART1 + 0x3fff,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_S3CUART_RX1,

		.end   = IRQ_S3CUART_ERR1,

		.flags = IORESOURCE_IRQ,

	}

};



static struct resource s3c2410_uart2_resource[] = {

	[0] = {

		.start = S3C2410_PA_UART2,

		.end   = S3C2410_PA_UART2 + 0x3fff,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_S3CUART_RX2,

		.end   = IRQ_S3CUART_ERR2,

		.flags = IORESOURCE_IRQ,

	}

};



static struct resource s3c2410_uart3_resource[] = {

	[0] = {

		.start = S3C2443_PA_UART3,

		.end   = S3C2443_PA_UART3 + 0x3fff,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_S3CUART_RX3,

		.end   = IRQ_S3CUART_ERR3,

		.flags = IORESOURCE_IRQ,

	},

};



struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {

	[0] = {

		.resources	= s3c2410_uart0_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart0_resource),

	},

	[1] = {

		.resources	= s3c2410_uart1_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart1_resource),

	},

	[2] = {

		.resources	= s3c2410_uart2_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart2_resource),

	},

	[3] = {

		.resources	= s3c2410_uart3_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart3_resource),

	},

};