Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3c450be authored by Harvey Harrison's avatar Harvey Harrison Committed by Haavard Skinnemoen
Browse files

avr32: use the new byteorder headers 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
[haavard.skinnemoen@atmel.com: fix <mach/io.h> build breakage]
Signed-off-by: default avatarHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
parent 72d31053

arch/avr32/include/asm/byteorder.h

+14 −8
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 
#include <asm/types.h>

#include <linux/compiler.h>



#define __BIG_ENDIAN

#define __SWAB_64_THRU_32__



#ifdef __CHECKER__

extern unsigned long __builtin_bswap_32(unsigned long x);

extern unsigned short __builtin_bswap_16(unsigned short x);
@@ -17,15 +20,18 @@ extern unsigned short __builtin_bswap_16(unsigned short x); 
 * the result.

 */

#if !(__GNUC__ == 4 && __GNUC_MINOR__ < 2)

#define __arch__swab32(x) __builtin_bswap_32(x)

#define __arch__swab16(x) __builtin_bswap_16(x)

#endif

static inline __attribute_const__ __u16 __arch_swab16(__u16 val)

{

	return __builtin_bswap_16(val);

}

#define __arch_swab16 __arch_swab16



#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)

# define __BYTEORDER_HAS_U64__

# define __SWAB_64_THRU_32__

static inline __attribute_const__ __u32 __arch_swab32(__u32 val)

{

	return __builtin_bswap_32(val);

}

#define __arch_swab32 __arch_swab32

#endif



#include <linux/byteorder/big_endian.h>



#include <linux/byteorder.h>

#endif /* __ASM_AVR32_BYTEORDER_H */

arch/avr32/mach-at32ap/include/mach/io.h

+1 −2
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_ARCH_AT32AP_IO_H

#define __ASM_AVR32_ARCH_AT32AP_IO_H



/* For "bizarre" halfword swapping */

#include <linux/byteorder/swabb.h>

#include <linux/swab.h>



#if defined(CONFIG_AP700X_32_BIT_SMC)

# define __swizzle_addr_b(addr)	(addr ^ 3UL)