* [PATCH] ARM: pxa: cm-x2xx: avoid duplicate macro warnings
@ 2015-12-09 16:52 Arnd Bergmann
2015-12-09 21:00 ` Robert Jarzmik
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2015-12-09 16:52 UTC (permalink / raw)
To: linux-arm-kernel
In an old commit, we worked around the duplicate definition of
GPIO24_SSP1_SFRM in cm-x2xx.c, which includes files for both
pxa25x and pxa27x. Apparently the problem has come back and we
now have four additional duplicate symbols that cause warnings:
In file included from /git/arm-soc/arch/arm/mach-pxa/pxa27x.h:7:0,
from /git/arm-soc/arch/arm/mach-pxa/cm-x2xx.c:27:
/git/arm-soc/arch/arm/mach-pxa/mfp-pxa27x.h:21:0: warning: "GPIO86_GPIO" redefined
#define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF0)
This uses the same hack as before and undefines all symbols that
are defined more than once. Fortunately, cm-x2xx does not need
any of these.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index f2d801160079..7202022ee243 100644
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -24,7 +24,16 @@
#include "pxa25x.h"
#undef GPIO24_SSP1_SFRM
+#undef GPIO86_GPIO
+#undef GPIO87_GPIO
+#undef GPIO88_GPIO
+#undef GPIO89_GPIO
#include "pxa27x.h"
+#undef GPIO24_SSP1_SFRM
+#undef GPIO86_GPIO
+#undef GPIO87_GPIO
+#undef GPIO88_GPIO
+#undef GPIO89_GPIO
#include <mach/audio.h>
#include <linux/platform_data/video-pxafb.h>
#include <mach/smemc.h>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: pxa: cm-x2xx: avoid duplicate macro warnings
2015-12-09 16:52 [PATCH] ARM: pxa: cm-x2xx: avoid duplicate macro warnings Arnd Bergmann
@ 2015-12-09 21:00 ` Robert Jarzmik
0 siblings, 0 replies; 2+ messages in thread
From: Robert Jarzmik @ 2015-12-09 21:00 UTC (permalink / raw)
To: linux-arm-kernel
Arnd Bergmann <arnd@arndb.de> writes:
> In an old commit, we worked around the duplicate definition of
> GPIO24_SSP1_SFRM in cm-x2xx.c, which includes files for both
> pxa25x and pxa27x. Apparently the problem has come back and we
> now have four additional duplicate symbols that cause warnings:
>
> In file included from /git/arm-soc/arch/arm/mach-pxa/pxa27x.h:7:0,
> from /git/arm-soc/arch/arm/mach-pxa/cm-x2xx.c:27:
> /git/arm-soc/arch/arm/mach-pxa/mfp-pxa27x.h:21:0: warning: "GPIO86_GPIO" redefined
> #define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF0)
>
> This uses the same hack as before and undefines all symbols that
> are defined more than once. Fortunately, cm-x2xx does not need
> any of these.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Digging out old patches of 2012, cool.
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
I suppose it's a necessary hack until I manage to kill the mfp interface in
favor of pinctrl.
Cheers.
--
Robert
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-09 21:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 16:52 [PATCH] ARM: pxa: cm-x2xx: avoid duplicate macro warnings Arnd Bergmann
2015-12-09 21:00 ` Robert Jarzmik
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).