Commit 232910d6 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S3C24XX: make h1940.h and h1940-latch.h local 



The headers can be local in mach-s3c24xx/.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent b2ca7871

arch/arm/mach-s3c24xx/h1940-bluetooth.c

+3 −3
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
#include <linux/gpio.h>

#include <linux/rfkill.h>



#include <mach/regs-gpio.h>

#include <mach/hardware.h>

#include <mach/h1940-latch.h>

#include <mach/h1940.h>

#include <mach/regs-gpio.h>



#include "h1940.h"



#define DRV_NAME "h1940-bt"

arch/arm/mach-s3c24xx/include/mach/h1940-latch.h→arch/arm/mach-s3c24xx/h1940.h

+16 −6
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/h1940-latch.h

/*

 * Copyright 2006 Ben Dooks <ben-linux@fluff.org>

 *

 * Copyright (c) 2005 Simtec Electronics

 *	http://armlinux.simtec.co.uk/

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

 *

 *  iPAQ H1940 series - latch definitions

 * iPAQ H1940 series 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.

*/



#ifndef __ASM_ARCH_H1940_LATCH_H

#define __ASM_ARCH_H1940_LATCH_H

#ifndef __MACH_S3C24XX_H1940_H

#define __MACH_S3C24XX_H1940_H __FILE__



#include <asm/gpio.h>

#define H1940_SUSPEND_CHECKSUM		(0x30003ff8)

#define H1940_SUSPEND_RESUMEAT		(0x30081000)

#define H1940_SUSPEND_CHECK		(0x30080000)



extern void h1940_pm_return(void);

extern int h1940_led_blink_set(unsigned gpio, int state,

			       unsigned long *delay_on,

			       unsigned long *delay_off);



#include <linux/gpio.h>



#define H1940_LATCH_GPIO(x)		(S3C_GPIO_END + (x))
@@ -40,4 +50,4 @@ 
#define H1940_LATCH_LED_GREEN		H1940_LATCH_GPIO(14)

#define H1940_LATCH_LED_FLASH		H1940_LATCH_GPIO(15)



#endif /* __ASM_ARCH_H1940_LATCH_H */
 
#endif /* __MACH_S3C24XX_H1940_H */

arch/arm/mach-s3c24xx/include/mach/h1940.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/h1940.h

 *

 * Copyright 2006 Ben Dooks <ben-linux@fluff.org>

 *

 * H1940 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.

*/



#ifndef __ASM_ARCH_H1940_H

#define __ASM_ARCH_H1940_H



#define H1940_SUSPEND_CHECKSUM		(0x30003ff8)

#define H1940_SUSPEND_RESUMEAT		(0x30081000)

#define H1940_SUSPEND_CHECK		(0x30080000)



extern void h1940_pm_return(void);

extern int h1940_led_blink_set(unsigned gpio, int state,

	unsigned long *delay_on, unsigned long *delay_off);





#endif /* __ASM_ARCH_H1940_H */

arch/arm/mach-s3c24xx/mach-h1940.c

+16 −19
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s3c2410/mach-h1940.c

 *

/*

 * Copyright (c) 2003-2005 Simtec Electronics

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

 *
@@ -37,38 +36,36 @@ 
#include <linux/mmc/host.h>

#include <linux/export.h>



#include <asm/irq.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/irq.h>



#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/mach-types.h>



#include <plat/regs-serial.h>

#include <mach/regs-lcd.h>

#include <mach/regs-clock.h>

#include <linux/platform_data/i2c-s3c2410.h>

#include <linux/platform_data/mmc-s3cmci.h>

#include <linux/platform_data/touchscreen-s3c2410.h>

#include <linux/platform_data/usb-s3c2410_udc.h>



#include <mach/regs-gpio.h>

#include <sound/uda1380.h>



#include <mach/h1940.h>

#include <mach/h1940-latch.h>

#include <mach/fb.h>

#include <linux/platform_data/usb-s3c2410_udc.h>

#include <linux/platform_data/i2c-s3c2410.h>

#include <mach/hardware.h>

#include <mach/regs-clock.h>

#include <mach/regs-gpio.h>

#include <mach/regs-lcd.h>



#include <plat/gpio-cfg.h>

#include <plat/clock.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/gpio-cfg.h>

#include <plat/pll.h>

#include <plat/pm.h>

#include <linux/platform_data/mmc-s3cmci.h>

#include <linux/platform_data/touchscreen-s3c2410.h>

#include <plat/regs-serial.h>



#include <sound/uda1380.h>



#include "common.h"

#include "h1940.h"



#define H1940_LATCH		((void __force __iomem *)0xF8000000)

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

+16 −16
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s3c2440/mach-rx1950.c

 *

/*

 * Copyright (c) 2006-2009 Victor Chukhantsev, Denis Grigoriev,

 * Copyright (c) 2007-2010 Vasily Khoruzhick

 *
@@ -37,31 +36,32 @@ 


#include <linux/mmc/host.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach-types.h>



#include <linux/platform_data/i2c-s3c2410.h>

#include <linux/platform_data/mmc-s3cmci.h>

#include <linux/platform_data/mtd-nand-s3c2410.h>

#include <linux/platform_data/touchscreen-s3c2410.h>

#include <linux/platform_data/usb-s3c2410_udc.h>



#include <sound/uda1380.h>



#include <mach/fb.h>

#include <mach/regs-gpio.h>

#include <mach/regs-lcd.h>

#include <mach/h1940.h>

#include <mach/fb.h>



#include <plat/clock.h>

#include <plat/regs-serial.h>

#include <plat/regs-iic.h>

#include <linux/platform_data/mmc-s3cmci.h>

#include <linux/platform_data/usb-s3c2410_udc.h>

#include <linux/platform_data/mtd-nand-s3c2410.h>

#include <linux/platform_data/i2c-s3c2410.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/pm.h>

#include <plat/devs.h>

#include <plat/irq.h>

#include <linux/platform_data/touchscreen-s3c2410.h>



#include <sound/uda1380.h>

#include <plat/pm.h>

#include <plat/regs-iic.h>

#include <plat/regs-serial.h>



#include "common.h"

#include "h1940.h"



#define LCD_PWM_PERIOD 192960

#define LCD_PWM_DUTY 127353