* [PATCH v2] ALSA: atmel: fix building the ac97 driver for at91-multiplatform
@ 2014-12-21 11:18 Alexandre Belloni
2014-12-25 10:19 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Alexandre Belloni @ 2014-12-21 11:18 UTC (permalink / raw)
To: Takashi Iwai
Cc: Jaroslav Kysela, Alexander Stein, alsa-devel, linux-kernel,
linux-arm-kernel, Nicolas Ferre, alexandre.belloni,
Arnd Bergmann
From: Arnd Bergmann <arnd@arndb.de>
at91 will no longer export the mach/cpu.h and mach/hardware.h header files
in the future, which would break building the atmel ac97c driver.
Since the cpu_is_* check is only used to find out whether we are running
on avr32 or arm/at91, we can hardcode that check in the ARM case.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: http://www.spinics.net/lists/arm-kernel/msg382068.html
---
sound/atmel/ac97c.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index b59427d5a697..83975f8d5947 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -34,10 +34,10 @@
#include <linux/platform_data/dma-dw.h>
#include <linux/dma/dw.h>
+#ifdef CONFIG_AVR32
#include <mach/cpu.h>
-
-#ifdef CONFIG_ARCH_AT91
-#include <mach/hardware.h>
+#else
+#define cpu_is_at32ap7000() 0
#endif
#include "ac97c.h"
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ALSA: atmel: fix building the ac97 driver for at91-multiplatform
2014-12-21 11:18 [PATCH v2] ALSA: atmel: fix building the ac97 driver for at91-multiplatform Alexandre Belloni
@ 2014-12-25 10:19 ` Takashi Iwai
2014-12-25 10:48 ` Alexandre Belloni
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2014-12-25 10:19 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Jaroslav Kysela, Alexander Stein, alsa-devel, linux-kernel,
linux-arm-kernel, Nicolas Ferre, Arnd Bergmann
At Sun, 21 Dec 2014 12:18:09 +0100,
Alexandre Belloni wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> at91 will no longer export the mach/cpu.h and mach/hardware.h header files
> in the future, which would break building the atmel ac97c driver.
>
> Since the cpu_is_* check is only used to find out whether we are running
> on avr32 or arm/at91, we can hardcode that check in the ARM case.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Link: http://www.spinics.net/lists/arm-kernel/msg382068.html
Is this targeted for 3.19 or 3.20?
thanks,
Takashi
> ---
> sound/atmel/ac97c.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
> index b59427d5a697..83975f8d5947 100644
> --- a/sound/atmel/ac97c.c
> +++ b/sound/atmel/ac97c.c
> @@ -34,10 +34,10 @@
> #include <linux/platform_data/dma-dw.h>
> #include <linux/dma/dw.h>
>
> +#ifdef CONFIG_AVR32
> #include <mach/cpu.h>
> -
> -#ifdef CONFIG_ARCH_AT91
> -#include <mach/hardware.h>
> +#else
> +#define cpu_is_at32ap7000() 0
> #endif
>
> #include "ac97c.h"
> --
> 2.1.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ALSA: atmel: fix building the ac97 driver for at91-multiplatform
2014-12-25 10:19 ` Takashi Iwai
@ 2014-12-25 10:48 ` Alexandre Belloni
2014-12-26 11:14 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Alexandre Belloni @ 2014-12-25 10:48 UTC (permalink / raw)
To: Takashi Iwai
Cc: Jaroslav Kysela, Alexander Stein, alsa-devel, linux-kernel,
linux-arm-kernel, Nicolas Ferre, Arnd Bergmann
Hi,
On 25/12/2014 at 11:19:04 +0100, Takashi Iwai wrote :
> At Sun, 21 Dec 2014 12:18:09 +0100,
> Alexandre Belloni wrote:
> >
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > at91 will no longer export the mach/cpu.h and mach/hardware.h header files
> > in the future, which would break building the atmel ac97c driver.
> >
> > Since the cpu_is_* check is only used to find out whether we are running
> > on avr32 or arm/at91, we can hardcode that check in the ARM case.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Link: http://www.spinics.net/lists/arm-kernel/msg382068.html
>
> Is this targeted for 3.19 or 3.20?
>
It is not urgent, that is definitely for 3.20.
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ALSA: atmel: fix building the ac97 driver for at91-multiplatform
2014-12-25 10:48 ` Alexandre Belloni
@ 2014-12-26 11:14 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2014-12-26 11:14 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Jaroslav Kysela, Alexander Stein, alsa-devel, linux-kernel,
linux-arm-kernel, Nicolas Ferre, Arnd Bergmann
At Thu, 25 Dec 2014 11:48:37 +0100,
Alexandre Belloni wrote:
>
> Hi,
>
> On 25/12/2014 at 11:19:04 +0100, Takashi Iwai wrote :
> > At Sun, 21 Dec 2014 12:18:09 +0100,
> > Alexandre Belloni wrote:
> > >
> > > From: Arnd Bergmann <arnd@arndb.de>
> > >
> > > at91 will no longer export the mach/cpu.h and mach/hardware.h header files
> > > in the future, which would break building the atmel ac97c driver.
> > >
> > > Since the cpu_is_* check is only used to find out whether we are running
> > > on avr32 or arm/at91, we can hardcode that check in the ARM case.
> > >
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > Link: http://www.spinics.net/lists/arm-kernel/msg382068.html
> >
> > Is this targeted for 3.19 or 3.20?
> >
>
> It is not urgent, that is definitely for 3.20.
OK. But I can't apply it now because your sign-off is missing.
If you submit a patch, you must give your own sign-off, too, even if
it's not written by you.
thanks,
Takashi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-26 11:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-21 11:18 [PATCH v2] ALSA: atmel: fix building the ac97 driver for at91-multiplatform Alexandre Belloni
2014-12-25 10:19 ` Takashi Iwai
2014-12-25 10:48 ` Alexandre Belloni
2014-12-26 11:14 ` Takashi Iwai
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).