diff options
| author | Antony Pavlov <antonynpavlov@gmail.com> | 2015-09-21 01:50:43 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-21 08:21:49 +0200 |
| commit | 072a4af45409182c6cbfb32ac4a68b072b876860 (patch) | |
| tree | 3af83db5c176e96dc9f160901dbb99eeaed07733 /arch/mips/mach-ath79 | |
| parent | 36152c5aa546660c456eee3049c8bb7f0dd2a2ad (diff) | |
| download | barebox-072a4af45409182c6cbfb32ac4a68b072b876860.tar.gz barebox-072a4af45409182c6cbfb32ac4a68b072b876860.tar.xz | |
MIPS: mach-ath79: make ar71xx_regs.h assembler-tolerant
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips/mach-ath79')
| -rw-r--r-- | arch/mips/mach-ath79/include/mach/ar71xx_regs.h | 4 | ||||
| -rw-r--r-- | arch/mips/mach-ath79/include/mach/debug_ll.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/mips/mach-ath79/include/mach/ar71xx_regs.h b/arch/mips/mach-ath79/include/mach/ar71xx_regs.h index 0c6ddd6388..77138ab48e 100644 --- a/arch/mips/mach-ath79/include/mach/ar71xx_regs.h +++ b/arch/mips/mach-ath79/include/mach/ar71xx_regs.h @@ -15,7 +15,11 @@ #ifndef __ASM_MACH_AR71XX_REGS_H #define __ASM_MACH_AR71XX_REGS_H +#ifndef __ASSEMBLER__ #include <linux/bitops.h> +#else +#define BIT(nr) (1 << (nr)) +#endif #define AR71XX_APB_BASE 0x18000000 diff --git a/arch/mips/mach-ath79/include/mach/debug_ll.h b/arch/mips/mach-ath79/include/mach/debug_ll.h index 64db67499c..d3813afb7d 100644 --- a/arch/mips/mach-ath79/include/mach/debug_ll.h +++ b/arch/mips/mach-ath79/include/mach/debug_ll.h @@ -19,10 +19,7 @@ #define __AR933X_DEBUG_LL__ #include <asm/addrspace.h> - -/* Alas! <mach/ar71xx_regs.h> isn't assembly-tolerant */ -#define AR71XX_APB_BASE 0x18000000 -#define AR933X_UART_BASE (AR71XX_APB_BASE + 0x00020000) +#include <mach/ar71xx_regs.h> #define DEBUG_LL_UART_ADDR KSEG1ADDR(AR933X_UART_BASE) |