Patchwork [v2] avr32: fix build error in atstk1006_defconfig

login
register
mail settings
Submitter Wu, Josh
Date April 1, 2013, 6:26 a.m.
Message ID <1364797597-22005-1-git-send-email-josh.wu@atmel.com>
Download mbox | patch
Permalink /patch/232671/
State New
Headers show

Comments

Wu, Josh - April 1, 2013, 6:26 a.m.
fixed the following compile error when use avr32 atstk1006_defconfig:
  drivers/mtd/nand/atmel_nand.c: In function 'pmecc_err_location':
  drivers/mtd/nand/atmel_nand.c:639: error: implicit declaration of function 'writel_relaxed'

which was introduced by commit:
  1c7b874d33b463f7150b1ab4617f000af9b327fd
  mtd: at91: atmel_nand: add Programmable Multibit ECC controller support
The PMECC for nand flash code uses writel_relaxed(). But in avr32, there is no
macro "writel_relaxed" defined.

This patch add writex_relaxed macro definitions.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Havard Skinnemoen <havard@skinnemoen.net>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
---
change since v1:
 refined the commit message and wrap it into 80 characters.

 arch/avr32/include/asm/io.h |    4 ++++
 1 file changed, 4 insertions(+)
Wu, Josh - April 8, 2013, 7:06 a.m.
Hi, Andrew

Could you merge it for avr32? Thanks in advance.

Best Regards,
Josh Wu

On 4/1/2013 2:26 PM, Josh Wu wrote:
> fixed the following compile error when use avr32 atstk1006_defconfig:
>    drivers/mtd/nand/atmel_nand.c: In function 'pmecc_err_location':
>    drivers/mtd/nand/atmel_nand.c:639: error: implicit declaration of function 'writel_relaxed'
>
> which was introduced by commit:
>    1c7b874d33b463f7150b1ab4617f000af9b327fd
>    mtd: at91: atmel_nand: add Programmable Multibit ECC controller support
> The PMECC for nand flash code uses writel_relaxed(). But in avr32, there is no
> macro "writel_relaxed" defined.
>
> This patch add writex_relaxed macro definitions.
>
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> Acked-by: Havard Skinnemoen <havard@skinnemoen.net>
> Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
> ---
> change since v1:
>   refined the commit message and wrap it into 80 characters.
>
>   arch/avr32/include/asm/io.h |    4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h
> index cf60d0a..fc6483f 100644
> --- a/arch/avr32/include/asm/io.h
> +++ b/arch/avr32/include/asm/io.h
> @@ -165,6 +165,10 @@ BUILDIO_IOPORT(l, u32)
>   #define readw_be			__raw_readw
>   #define readl_be			__raw_readl
>   
> +#define writeb_relaxed			writeb
> +#define writew_relaxed			writew
> +#define writel_relaxed			writel
> +
>   #define writeb_be			__raw_writeb
>   #define writew_be			__raw_writew
>   #define writel_be			__raw_writel

Patch

diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h
index cf60d0a..fc6483f 100644
--- a/arch/avr32/include/asm/io.h
+++ b/arch/avr32/include/asm/io.h
@@ -165,6 +165,10 @@  BUILDIO_IOPORT(l, u32)
 #define readw_be			__raw_readw
 #define readl_be			__raw_readl
 
+#define writeb_relaxed			writeb
+#define writew_relaxed			writew
+#define writel_relaxed			writel
+
 #define writeb_be			__raw_writeb
 #define writew_be			__raw_writew
 #define writel_be			__raw_writel