This strips out the v1 and v2 GTA02 revision specific defines (we do not support these internal non-shipped revisions) and fixes a bug in the glamo reset resource found from that.
Signed-off-by: Andy Green <[email protected]> --- arch/arm/mach-s3c2442/include/mach/gta02.h | 26 -------------------------- arch/arm/mach-s3c2442/mach-gta02.c | 4 ++-- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/arch/arm/mach-s3c2442/include/mach/gta02.h b/arch/arm/mach-s3c2442/include/mach/gta02.h index ef0b184..d8d9d90 100644 --- a/arch/arm/mach-s3c2442/include/mach/gta02.h +++ b/arch/arm/mach-s3c2442/include/mach/gta02.h @@ -18,52 +18,34 @@ #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 @@ -71,25 +53,17 @@ #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 */ diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index c9c1a4d..ffc72fb 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -1564,8 +1564,8 @@ static struct resource gta02_glamo_resources[] = { .flags = IORESOURCE_IRQ, }, [2] = { - .start = GTA02v1_GPIO_3D_RESET, - .end = GTA02v1_GPIO_3D_RESET, + .start = GTA02_GPIO_3D_RESET, + .end = GTA02_GPIO_3D_RESET, }, };
