* [PATCH] ARM: s3c2442: gta02: Fix usage gpio bank j pin definitions
@ 2010-09-24 18:24 Lars-Peter Clausen
2010-09-27 0:13 ` Ben Dooks
0 siblings, 1 reply; 3+ messages in thread
From: Lars-Peter Clausen @ 2010-09-24 18:24 UTC (permalink / raw)
To: linux-arm-kernel
The gta02 header file still uses the old S3C2410_GPJx defines instead of the
S3C2410_GPJ(x) macro. Since the S3C2410_GPJx defines have already been removed
this causes a build failure.
This patches fixes the issue by doing a s,S3C2410_GPJ([\d]+),S3C2410_GPJ(\1),g
on the file.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
arch/arm/mach-s3c2440/include/mach/gta02.h | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-s3c2440/include/mach/gta02.h b/arch/arm/mach-s3c2440/include/mach/gta02.h
index 0147ed6..2e84b5a 100644
--- a/arch/arm/mach-s3c2440/include/mach/gta02.h
+++ b/arch/arm/mach-s3c2440/include/mach/gta02.h
@@ -44,19 +44,19 @@
#define GTA02v3_GPIO_nUSB_FLT S3C2410_GPG(10) /* v3 + v4 only */
#define GTA02v3_GPIO_nGSM_OC S3C2410_GPG(11) /* v3 + v4 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 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_HP_IN S3C2440_GPJ10
-#define GTA02_CHIP_PWD S3C2440_GPJ11 /* v2 + v3 + v4 only */
-#define GTA02_GPIO_nWLAN_RESET S3C2440_GPJ12 /* v2 + v3 + v4 only */
+#define GTA02_GPIO_AMP_SHUT S3C2410_GPJ(1) /* v2 + v3 + v4 only */
+#define GTA02v1_GPIO_WLAN_GPIO10 S3C2410_GPJ(2)
+#define GTA02_GPIO_HP_IN S3C2410_GPJ(2) /* v2 + v3 + v4 only */
+#define GTA02_GPIO_INT0 S3C2410_GPJ(3) /* v2 + v3 + v4 only */
+#define GTA02_GPIO_nGSM_EN S3C2410_GPJ(4)
+#define GTA02_GPIO_3D_RESET S3C2410_GPJ(5)
+#define GTA02_GPIO_nDL_GSM S3C2410_GPJ(6) /* v4 + v5 only */
+#define GTA02_GPIO_WLAN_GPIO0 S3C2410_GPJ(7)
+#define GTA02v1_GPIO_BAT_ID S3C2410_GPJ(8)
+#define GTA02_GPIO_KEEPACT S3C2410_GPJ(8)
+#define GTA02v1_GPIO_HP_IN S3C2410_GPJ(10)
+#define GTA02_CHIP_PWD S3C2410_GPJ(11) /* v2 + v3 + v4 only */
+#define GTA02_GPIO_nWLAN_RESET S3C2410_GPJ(12) /* v2 + v3 + v4 only */
#define GTA02_IRQ_GSENSOR_1 IRQ_EINT0
#define GTA02_IRQ_MODEM IRQ_EINT1
--
1.5.6.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: s3c2442: gta02: Fix usage gpio bank j pin definitions
2010-09-24 18:24 [PATCH] ARM: s3c2442: gta02: Fix usage gpio bank j pin definitions Lars-Peter Clausen
@ 2010-09-27 0:13 ` Ben Dooks
2010-09-27 0:39 ` Lars-Peter Clausen
0 siblings, 1 reply; 3+ messages in thread
From: Ben Dooks @ 2010-09-27 0:13 UTC (permalink / raw)
To: linux-arm-kernel
On 24/09/10 19:24, Lars-Peter Clausen wrote:
> The gta02 header file still uses the old S3C2410_GPJx defines instead of the
> S3C2410_GPJ(x) macro. Since the S3C2410_GPJx defines have already been removed
> this causes a build failure.
> This patches fixes the issue by doing a s,S3C2410_GPJ([\d]+),S3C2410_GPJ(\1),g
> on the file.
Is this currently causing a build error? If so, please add the snippet
of the build log. Otherwise it'll get queued for the next merge.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM: s3c2442: gta02: Fix usage gpio bank j pin definitions
2010-09-27 0:13 ` Ben Dooks
@ 2010-09-27 0:39 ` Lars-Peter Clausen
0 siblings, 0 replies; 3+ messages in thread
From: Lars-Peter Clausen @ 2010-09-27 0:39 UTC (permalink / raw)
To: linux-arm-kernel
Ben Dooks wrote:
> On 24/09/10 19:24, Lars-Peter Clausen wrote:
>> The gta02 header file still uses the old S3C2410_GPJx defines instead of the
>> S3C2410_GPJ(x) macro. Since the S3C2410_GPJx defines have already been removed
>> this causes a build failure.
>> This patches fixes the issue by doing a s,S3C2410_GPJ([\d]+),S3C2410_GPJ(\1),g
>> on the file.
>
> Is this currently causing a build error? If so, please add the snippet
> of the build log. Otherwise it'll get queued for the next merge.
CC sound/soc/s3c24xx/neo1973_gta02_wm8753.o
sound/soc/s3c24xx/neo1973_gta02_wm8753.c: In function 'lm4853_set_spk':
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:244: error: 'S3C2440_GPJ2' undeclared (first
use in this function)
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:244: error: (Each undeclared identifier is
reported only once
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:244: error: for each function it appears in.)
sound/soc/s3c24xx/neo1973_gta02_wm8753.c: In function 'lm4853_event':
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:265: error: 'S3C2440_GPJ1' undeclared (first
use in this function)
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:265: error: 'value' undeclared (first use in
this function)
sound/soc/s3c24xx/neo1973_gta02_wm8753.c: In function 'neo1973_gta02_init':
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:458: error: 'S3C2440_GPJ2' undeclared (first
use in this function)
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:464: error: 'GTA02_GPIO_AMP_HP_IN'
undeclared (first use in this function)
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:470: error: 'S3C2440_GPJ1' undeclared (first
use in this function)
sound/soc/s3c24xx/neo1973_gta02_wm8753.c: In function 'neo1973_gta02_exit':
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:498: error: 'S3C2440_GPJ2' undeclared (first
use in this function)
sound/soc/s3c24xx/neo1973_gta02_wm8753.c:499: error: 'S3C2440_GPJ1' undeclared (first
use in this function)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-27 0:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-24 18:24 [PATCH] ARM: s3c2442: gta02: Fix usage gpio bank j pin definitions Lars-Peter Clausen
2010-09-27 0:13 ` Ben Dooks
2010-09-27 0:39 ` Lars-Peter Clausen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).