From 2ba9302df2cca8c08af59f65c6284348d11ba93e Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Wed, 19 Nov 2008 17:11:03 +0000 Subject: Move asm/arch/gta02.h to mach/gta02.h Signed-off-by: Jonas Bonn --- arch/arm/mach-s3c2410/include/mach/gta02.h | 109 +++++++++++++++++++++++ arch/arm/mach-s3c2440/mach-gta02.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 +- arch/arm/plat-s3c24xx/neo1973_pm_host.c | 2 +- arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c | 2 +- arch/arm/plat-s3c24xx/neo1973_version.c | 2 +- 8 files changed, 116 insertions(+), 7 deletions(-) create mode 100644 arch/arm/mach-s3c2410/include/mach/gta02.h (limited to 'arch') diff --git a/arch/arm/mach-s3c2410/include/mach/gta02.h b/arch/arm/mach-s3c2410/include/mach/gta02.h new file mode 100644 index 00000000000..c376b899779 --- /dev/null +++ b/arch/arm/mach-s3c2410/include/mach/gta02.h @@ -0,0 +1,109 @@ +#ifndef _GTA02_H +#define _GTA02_H + +#include +#include + +/* Different hardware revisions, passed in ATAG_REVISION by u-boot */ +#define GTA02v1_SYSTEM_REV 0x00000310 +#define GTA02v2_SYSTEM_REV 0x00000320 +#define GTA02v3_SYSTEM_REV 0x00000330 +#define GTA02v4_SYSTEM_REV 0x00000340 +#define GTA02v5_SYSTEM_REV 0x00000350 +#define GTA02v6_SYSTEM_REV 0x00000360 + +#define GTA02_GPIO_n3DL_GSM S3C2410_GPA13 /* v1 + v2 + v3 only */ + +#define GTA02_GPIO_PWR_LED1 S3C2410_GPB0 +#define GTA02_GPIO_PWR_LED2 S3C2410_GPB1 +#define GTA02_GPIO_AUX_LED S3C2410_GPB2 +#define GTA02_GPIO_VIBRATOR_ON S3C2410_GPB3 +#define GTA02v1_GPIO_GPS_PWRON S3C2410_GPB4 /* v1 only */ +#define GTA02_GPIO_MODEM_RST S3C2410_GPB5 +#define GTA02_GPIO_BT_EN S3C2410_GPB6 +#define GTA02_GPIO_MODEM_ON S3C2410_GPB7 +#define GTA02v1_GPIO_EN_AGPS3V S3C2410_GPB8 /* v1 only */ +#define GTA02_GPIO_EXTINT8 S3C2410_GPB8 +#define GTA02_GPIO_USB_PULLUP S3C2410_GPB9 + +#define GTA02v1_GPIO_nGPS_RST S3C2410_GPC0 /* v1 only */ +#define GTA02v12_GPIO_PIO3 S3C2410_GPC5 /* v1 + v2 only */ +#define GTA02_GPIO_PIO5 S3C2410_GPC5 /* v3 + v4 only */ +#define GTA02_GPIO_LCD_RESET S3C2410_GPC6 /* v1 + v2 only */ +#define GTA02v12_GPIO_PIO2 S3C2410_GPC7 /* v1 + v2 only */ +#define GTA02v2_nUSB_FLT S3C2410_GPC9 /* v2 only */ +#define GTA02v2_nUSB_OC S3C2410_GPC10 /* v2 only */ +#define GTA02v2_nGSM_OC S3C2410_GPC12 /* v2 only */ + +#define GTA02v3_GPIO_nG1_CS S3C2410_GPD12 /* v3 + v4 only */ +#define GTA02v3_GPIO_nG2_CS S3C2410_GPD13 /* v3 + v4 only */ +#define GTA02v5_GPIO_HDQ S3C2410_GPD14 /* v5 + */ + +#define GTA02_GPIO_nG1_INT S3C2410_GPF0 +#define GTA02_GPIO_IO1 S3C2410_GPF1 +#define GTA02v1_GPIO_nG2_INT S3C2410_GPF2 /* v1 only */ +#define GTA02_GPIO_PIO_2 S3C2410_GPF2 /* v2 + v3 + v4 only */ +#define GTA02_GPIO_JACK_INSERT S3C2410_GPF4 +#define GTA02v1_GPIO_nSD_DETECT S3C2410_GPF5 /* v1 only */ +#define GTA02_GPIO_WLAN_GPIO1 S3C2410_GPF5 /* v2 + v3 + v4 only */ +#define GTA02_GPIO_AUX_KEY S3C2410_GPF6 +#define GTA02_GPIO_HOLD_KEY S3C2410_GPF7 + +#define GTA02_GPIO_3D_IRQ S3C2410_GPG4 +#define GTA02v1_GPIO_nG1_CS S3C2410_GPG8 /* v1 only */ +#define GTA02v2_GPIO_nG2_INT S3C2410_GPG8 /* v2 + v3 + v4 only */ +#define GTA02v3_GPIO_nUSB_OC S3C2410_GPG9 /* v3 + v4 only */ +#define GTA02v3_GPIO_nUSB_FLT S3C2410_GPG10 /* v3 + v4 only */ +#define GTA02v1_GPIO_nG2_CS S3C2410_GPG11 /* v1 only */ +#define GTA02v3_GPIO_nGSM_OC S3C2410_GPG11 /* v3 + v4 only */ + +#define GTA02v1_GPIO_3D_RESET S3C2440_GPJ0 /* v1 only */ +#define GTA02v2_GPIO_BAT_ID S3C2440_GPJ0 /* v2 only */ +#define GTA02v1_GPIO_WLAN_GPIO8 S3C2440_GPJ1 /* v1 only */ +#define GTA02_GPIO_AMP_SHUT S3C2440_GPJ1 /* v2 + v3 + v4 only */ +#define GTA02v1_GPIO_WLAN_GPIO10 S3C2440_GPJ2 +#define GTA02_GPIO_HP_IN S3C2440_GPJ2 /* v2 + v3 + v4 only */ +#define GTA02v1_GPIO_KEEPACT S3C2440_GPJ3 /* v1 only */ +#define GTA02_GPIO_INT0 S3C2440_GPJ3 /* v2 + v3 + v4 only */ +#define GTA02_GPIO_nGSM_EN S3C2440_GPJ4 +#define GTA02_GPIO_3D_RESET S3C2440_GPJ5 +#define GTA02_GPIO_nDL_GSM S3C2440_GPJ6 /* v4 + v5 only */ +#define GTA02_GPIO_WLAN_GPIO0 S3C2440_GPJ7 +#define GTA02v1_GPIO_BAT_ID S3C2440_GPJ8 +#define GTA02_GPIO_KEEPACT S3C2440_GPJ8 +#define GTA02v1_GPIO_AMP_SHUT S3C2440_GPJ9 /* v1 only */ +#define GTA02v2_nG1_CS S3C2440_GPJ9 /* v2 only */ +#define GTA02v1_GPIO_HP_IN S3C2440_GPJ10 +#define GTA02v2_nG2_CS S3C2440_GPJ10 /* v2 only */ +#define GTA02v1_GPIO_INT0 S3C2440_GPJ11 /* v1 only */ +#define GTA02_CHIP_PWD S3C2440_GPJ11 /* v2 + v3 + v4 only */ +#define GTA02v1_GPIO_nGSM_EN S3C2440_GPJ12 /* v1 only */ +#define GTA02_GPIO_nWLAN_RESET S3C2440_GPJ12 /* v2 + v3 + v4 only */ + +#define GTA02_IRQ_GSENSOR_1 IRQ_EINT0 +#define GTA02_IRQ_MODEM IRQ_EINT1 +#define GTA02v1_IRQ_GSENSOR_2 IRQ_EINT2 /* v1 only */ +#define GTA02_IRQ_PIO_2 IRQ_EINT2 /* v2 + v3 + v4 only */ +#define GTA02_IRQ_nJACK_INSERT IRQ_EINT4 +#define GTA02v1_IRQ_nSD_CD IRQ_EINT5 /* v1 only */ +#define GTA02_IRQ_WLAN_GPIO1 IRQ_EINT5 +#define GTA02_IRQ_AUX IRQ_EINT6 +#define GTA02_IRQ_nHOLD IRQ_EINT7 +#define GTA02v1_IRQ_nSIM_CD IRQ_EINT8 /* v1 only */ +#define GTA02_IRQ_PCF50633 IRQ_EINT9 +#define GTA02_IRQ_3D IRQ_EINT12 +#define GTA02_IRQ_GSENSOR_2 IRQ_EINT16 /* v2 + v3 + v4 only */ +#define GTA02v3_IRQ_nUSB_OC IRQ_EINT17 /* v3 + v4 only */ +#define GTA02v3_IRQ_nUSB_FLT IRQ_EINT18 /* v3 + v4 only */ +#define GTA02v3_IRQ_nGSM_OC IRQ_EINT19 /* v3 + v4 only */ + +/* returns 00 000 on GTA02 A5 and earlier, A6 returns 01 001 */ +#define GTA02_PCB_ID1_0 S3C2410_GPC13 +#define GTA02_PCB_ID1_1 S3C2410_GPC15 +#define GTA02_PCB_ID1_2 S3C2410_GPD0 +#define GTA02_PCB_ID2_0 S3C2410_GPD3 +#define GTA02_PCB_ID2_1 S3C2410_GPD4 + +int gta02_get_pcb_revision(void); + +#endif /* _GTA02_H */ diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 6f9cf3e538f..3c1cb831ff6 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -68,7 +68,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 8d5274bc5e8..8be584c9f82 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c @@ -25,7 +25,7 @@ #include /* For GTA02 */ -#include +#include #include diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c index 4a22afb492c..a88b1a240d0 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c @@ -28,7 +28,7 @@ #include /* For GTA02 */ -#include +#include #include struct neo1973_pm_gps_data { diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index 2a0f2c883fe..7dd28911904 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -28,7 +28,7 @@ #include /* For GTA02 */ -#include +#include #include #include #include diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c index a0c7cc198fb..bb25acdb7d2 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_host.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c @@ -20,7 +20,7 @@ #include #ifdef CONFIG_MACH_NEO1973_GTA02 -#include +#include #include static ssize_t pm_host_read(struct device *dev, struct device_attribute *attr, diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c index da529c7a566..c7730b60da9 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c @@ -21,7 +21,7 @@ #include #ifdef CONFIG_MACH_NEO1973_GTA02 -#include +#include #include #endif diff --git a/arch/arm/plat-s3c24xx/neo1973_version.c b/arch/arm/plat-s3c24xx/neo1973_version.c index 062ac2f2fe8..a88172132dc 100644 --- a/arch/arm/plat-s3c24xx/neo1973_version.c +++ b/arch/arm/plat-s3c24xx/neo1973_version.c @@ -20,7 +20,7 @@ #include #ifdef CONFIG_MACH_NEO1973_GTA02 -#include +#include static ssize_t version_read(struct device *dev, struct device_attribute *attr, char *buf) -- cgit v1.2.3