All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] ALSA: atmel: fix building the ac97 driver for at91-multiplatform
@ 2014-12-26 13:27 ` Alexandre Belloni
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Belloni @ 2014-12-26 13:27 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
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
Changes in v3:
 - added my SoB

 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..e458957c5f52 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] 5+ messages in thread
* [PATCH v3] ALSA: atmel: fix building the ac97 driver for at91-multiplatform
@ 2014-12-26 13:27 ` Alexandre Belloni
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Belloni @ 2014-12-26 13:27 UTC (permalink / raw)
  To: linux-arm-kernel

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
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
Changes in v3:
 - added my SoB

 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..e458957c5f52 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] 5+ messages in thread
* Re: [PATCH v3] ALSA: atmel: fix building the ac97 driver for at91-multiplatform
  2014-12-26 13:27 ` Alexandre Belloni
  (?)
@ 2014-12-27 14:52   ` Takashi Iwai
  -1 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2014-12-27 14:52 UTC (permalink / raw)
  To: Alexandre Belloni
  Cc: Jaroslav Kysela, Alexander Stein, alsa-devel, linux-kernel,
	linux-arm-kernel, Nicolas Ferre, Arnd Bergmann

At Fri, 26 Dec 2014 14:27:58 +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
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Thanks, applied.


Takashi

> ---
> Changes in v3:
>  - added my SoB
> 
>  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..e458957c5f52 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] 5+ messages in thread
* Re: [PATCH v3] ALSA: atmel: fix building the ac97 driver for at91-multiplatform
@ 2014-12-27 14:52   ` Takashi Iwai
  0 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2014-12-27 14:52 UTC (permalink / raw)
  To: Alexandre Belloni
  Cc: alsa-devel, Arnd Bergmann, Nicolas Ferre, linux-kernel,
	Alexander Stein, linux-arm-kernel

At Fri, 26 Dec 2014 14:27:58 +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
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Thanks, applied.


Takashi

> ---
> Changes in v3:
>  - added my SoB
> 
>  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..e458957c5f52 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] 5+ messages in thread
* [PATCH v3] ALSA: atmel: fix building the ac97 driver for at91-multiplatform
@ 2014-12-27 14:52   ` Takashi Iwai
  0 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2014-12-27 14:52 UTC (permalink / raw)
  To: linux-arm-kernel

At Fri, 26 Dec 2014 14:27:58 +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
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Thanks, applied.


Takashi

> ---
> Changes in v3:
>  - added my SoB
> 
>  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..e458957c5f52 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] 5+ messages in thread
end of thread, other threads:[~2014-12-27 14:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-26 13:27 [PATCH v3] ALSA: atmel: fix building the ac97 driver for at91-multiplatform Alexandre Belloni
2014-12-26 13:27 ` Alexandre Belloni
2014-12-27 14:52 ` Takashi Iwai
2014-12-27 14:52   ` Takashi Iwai
2014-12-27 14:52   ` Takashi Iwai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.