From e98ad875b68c1205d30182d7a77391e6ae91c4ad Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Wed, 19 Nov 2008 17:11:02 +0000 Subject: [ARM]: Move asm/arch/gta01.h to include/mach This file is OpenMoko specific and didn't get moved in the big file move. Move it to arch/arm/mach-s3c2410/include/mach where it belongs and fix the references to it. Signed-off-by: Jonas Bonn --- arch/arm/mach-s3c2410/include/mach/gta01.h | 74 ++++++++++++++++++++++++++++++ arch/arm/mach-s3c2410/mach-gta01.c | 2 +- arch/arm/plat-s3c24xx/neo1973_pm_bt.c | 2 +- arch/arm/plat-s3c24xx/neo1973_pm_gps.c | 2 +- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 2 +- drivers/i2c/chips/pcf50606.c | 2 +- drivers/input/keyboard/qt2410kbd.c | 2 +- drivers/leds/leds-neo1973-vibrator.c | 2 +- drivers/video/backlight/gta01_bl.c | 2 +- include/asm-arm/arch-s3c2410/gta01.h | 74 ------------------------------ include/asm-arm/arch-s3c2410/pwm.h | 2 +- 11 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 arch/arm/mach-s3c2410/include/mach/gta01.h delete mode 100644 include/asm-arm/arch-s3c2410/gta01.h diff --git a/arch/arm/mach-s3c2410/include/mach/gta01.h b/arch/arm/mach-s3c2410/include/mach/gta01.h new file mode 100644 index 00000000000..0a90f9ce218 --- /dev/null +++ b/arch/arm/mach-s3c2410/include/mach/gta01.h @@ -0,0 +1,74 @@ +#ifndef _GTA01_H +#define _GTA01_H + +#include +#include + +/* Different hardware revisions, passed in ATAG_REVISION by u-boot */ +#define GTA01v3_SYSTEM_REV 0x00000130 +#define GTA01v4_SYSTEM_REV 0x00000140 +#define GTA01Bv2_SYSTEM_REV 0x00000220 +#define GTA01Bv3_SYSTEM_REV 0x00000230 +#define GTA01Bv4_SYSTEM_REV 0x00000240 + +/* Backlight */ + +extern void gta01bl_deferred_resume(void); + +struct gta01bl_machinfo { + unsigned int default_intensity; + unsigned int max_intensity; + unsigned int limit_mask; + unsigned int defer_resume_backlight; +}; + +/* Definitions common to all revisions */ +#define GTA01_GPIO_BACKLIGHT S3C2410_GPB0 +#define GTA01_GPIO_GPS_PWRON S3C2410_GPB1 +#define GTA01_GPIO_MODEM_RST S3C2410_GPB6 +#define GTA01_GPIO_MODEM_ON S3C2410_GPB7 +#define GTA01_GPIO_LCD_RESET S3C2410_GPC6 +#define GTA01_GPIO_PMU_IRQ S3C2410_GPG8 +#define GTA01_GPIO_JACK_INSERT S3C2410_GPF4 +#define GTA01_GPIO_nSD_DETECT S3C2410_GPF5 +#define GTA01_GPIO_AUX_KEY S3C2410_GPF6 +#define GTA01_GPIO_HOLD_KEY S3C2410_GPF7 +#define GTA01_GPIO_VIBRATOR_ON S3C2410_GPG11 + +#define GTA01_IRQ_MODEM IRQ_EINT1 +#define GTA01_IRQ_JACK_INSERT IRQ_EINT4 +#define GTA01_IRQ_nSD_DETECT IRQ_EINT5 +#define GTA01_IRQ_AUX_KEY IRQ_EINT6 +#define GTA01_IRQ_PCF50606 IRQ_EINT16 + +/* GTA01v3 */ +#define GTA01v3_GPIO_nGSM_EN S3C2410_GPG9 + +/* GTA01v4 */ +#define GTA01_GPIO_MODEM_DNLOAD S3C2410_GPG0 + +/* GTA01Bv2 */ +#define GTA01Bv2_GPIO_nGSM_EN S3C2410_GPF2 +#define GTA01Bv2_GPIO_VIBRATOR_ON S3C2410_GPB10 + +/* GTA01Bv3 */ +#define GTA01_GPIO_GPS_EN_3V3 S3C2410_GPG9 + +#define GTA01_GPIO_SDMMC_ON S3C2410_GPB2 +#define GTA01_GPIO_BT_EN S3C2410_GPB5 +#define GTA01_GPIO_AB_DETECT S3C2410_GPB8 +#define GTA01_GPIO_USB_PULLUP S3C2410_GPB9 +#define GTA01_GPIO_USB_ATTACH S3C2410_GPB10 + +#define GTA01_GPIO_GPS_EN_2V8 S3C2410_GPG9 +#define GTA01_GPIO_GPS_EN_3V S3C2410_GPG10 +#define GTA01_GPIO_GPS_RESET S3C2410_GPC0 + +/* GTA01Bv4 */ +#define GTA01Bv4_GPIO_nNAND_WP S3C2410_GPA16 +#define GTA01Bv4_GPIO_VIBRATOR_ON S3C2410_GPB3 +#define GTA01Bv4_GPIO_PMU_IRQ S3C2410_GPG1 + +#define GTA01Bv4_IRQ_PCF50606 IRQ_EINT9 + +#endif /* _GTA01_H */ diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index e0df70e3f29..41383ad6dcf 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -65,7 +65,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c index ce8d420398a..002adc4627a 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c @@ -21,7 +21,7 @@ #include /* For GTA01 */ -#include +#include #include /* For GTA02 */ diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c index f8dd2ef4194..5bc1c0c02c8 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c @@ -24,7 +24,7 @@ #include /* For GTA01 */ -#include +#include #include /* For GTA02 */ diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index 4669d9d16fe..b720db4e88f 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c index 005b968b49b..399703dab91 100644 --- a/drivers/i2c/chips/pcf50606.c +++ b/drivers/i2c/chips/pcf50606.c @@ -52,7 +52,7 @@ #include #include -#include +#include #include "pcf50606.h" diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c index b14135cd21e..bd41a24429c 100644 --- a/drivers/input/keyboard/qt2410kbd.c +++ b/drivers/input/keyboard/qt2410kbd.c @@ -21,7 +21,7 @@ #include #include -#include +#include struct gta01kbd { struct input_dev *input; diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c index 494fb83af4e..c3f24768e5e 100644 --- a/drivers/leds/leds-neo1973-vibrator.c +++ b/drivers/leds/leds-neo1973-vibrator.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #ifdef CONFIG_MACH_NEO1973_GTA02 diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c index cc2caee549d..2b9f8cd1dc1 100644 --- a/drivers/video/backlight/gta01_bl.c +++ b/drivers/video/backlight/gta01_bl.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include diff --git a/include/asm-arm/arch-s3c2410/gta01.h b/include/asm-arm/arch-s3c2410/gta01.h deleted file mode 100644 index 0a90f9ce218..00000000000 --- a/include/asm-arm/arch-s3c2410/gta01.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef _GTA01_H -#define _GTA01_H - -#include -#include - -/* Different hardware revisions, passed in ATAG_REVISION by u-boot */ -#define GTA01v3_SYSTEM_REV 0x00000130 -#define GTA01v4_SYSTEM_REV 0x00000140 -#define GTA01Bv2_SYSTEM_REV 0x00000220 -#define GTA01Bv3_SYSTEM_REV 0x00000230 -#define GTA01Bv4_SYSTEM_REV 0x00000240 - -/* Backlight */ - -extern void gta01bl_deferred_resume(void); - -struct gta01bl_machinfo { - unsigned int default_intensity; - unsigned int max_intensity; - unsigned int limit_mask; - unsigned int defer_resume_backlight; -}; - -/* Definitions common to all revisions */ -#define GTA01_GPIO_BACKLIGHT S3C2410_GPB0 -#define GTA01_GPIO_GPS_PWRON S3C2410_GPB1 -#define GTA01_GPIO_MODEM_RST S3C2410_GPB6 -#define GTA01_GPIO_MODEM_ON S3C2410_GPB7 -#define GTA01_GPIO_LCD_RESET S3C2410_GPC6 -#define GTA01_GPIO_PMU_IRQ S3C2410_GPG8 -#define GTA01_GPIO_JACK_INSERT S3C2410_GPF4 -#define GTA01_GPIO_nSD_DETECT S3C2410_GPF5 -#define GTA01_GPIO_AUX_KEY S3C2410_GPF6 -#define GTA01_GPIO_HOLD_KEY S3C2410_GPF7 -#define GTA01_GPIO_VIBRATOR_ON S3C2410_GPG11 - -#define GTA01_IRQ_MODEM IRQ_EINT1 -#define GTA01_IRQ_JACK_INSERT IRQ_EINT4 -#define GTA01_IRQ_nSD_DETECT IRQ_EINT5 -#define GTA01_IRQ_AUX_KEY IRQ_EINT6 -#define GTA01_IRQ_PCF50606 IRQ_EINT16 - -/* GTA01v3 */ -#define GTA01v3_GPIO_nGSM_EN S3C2410_GPG9 - -/* GTA01v4 */ -#define GTA01_GPIO_MODEM_DNLOAD S3C2410_GPG0 - -/* GTA01Bv2 */ -#define GTA01Bv2_GPIO_nGSM_EN S3C2410_GPF2 -#define GTA01Bv2_GPIO_VIBRATOR_ON S3C2410_GPB10 - -/* GTA01Bv3 */ -#define GTA01_GPIO_GPS_EN_3V3 S3C2410_GPG9 - -#define GTA01_GPIO_SDMMC_ON S3C2410_GPB2 -#define GTA01_GPIO_BT_EN S3C2410_GPB5 -#define GTA01_GPIO_AB_DETECT S3C2410_GPB8 -#define GTA01_GPIO_USB_PULLUP S3C2410_GPB9 -#define GTA01_GPIO_USB_ATTACH S3C2410_GPB10 - -#define GTA01_GPIO_GPS_EN_2V8 S3C2410_GPG9 -#define GTA01_GPIO_GPS_EN_3V S3C2410_GPG10 -#define GTA01_GPIO_GPS_RESET S3C2410_GPC0 - -/* GTA01Bv4 */ -#define GTA01Bv4_GPIO_nNAND_WP S3C2410_GPA16 -#define GTA01Bv4_GPIO_VIBRATOR_ON S3C2410_GPB3 -#define GTA01Bv4_GPIO_PMU_IRQ S3C2410_GPG1 - -#define GTA01Bv4_IRQ_PCF50606 IRQ_EINT9 - -#endif /* _GTA01_H */ diff --git a/include/asm-arm/arch-s3c2410/pwm.h b/include/asm-arm/arch-s3c2410/pwm.h index b77a40e7106..5689ce973d2 100644 --- a/include/asm-arm/arch-s3c2410/pwm.h +++ b/include/asm-arm/arch-s3c2410/pwm.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include enum pwm_timer { PWM0, -- cgit v1.2.3