diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 12:17:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 12:17:33 -0500 |
| commit | ea7531ac4a9d0b39edce43472147dc41cc2b7a34 (patch) | |
| tree | c49d395de24f670bcf6cb5746af9e503b255e96b /arch/arm/include/debug | |
| parent | 4025fa97ff39db054b47b9cdb9f3980480637668 (diff) | |
| parent | 41e229a91207afc326f9a83ba33c098c8362d303 (diff) | |
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanups from Olof Johansson:
"This is a good healthy set of various code removals. Total net delta
is 8100 lines removed.
Among the larger cleanups are:
- Removal of old Samsung S3C DMA infrastructure by Arnd
- Removal of the non-DT version of the 'lager' board by Magnus Damm
- General stale code removal on OMAP and Davinci by Rickard Strandqvist
- Removal of non-DT support on am3517 platforms by Tony Lindgren
... plus several other cleanups of various platforms across the board"
* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (47 commits)
ARM: sirf: drop redundant function and marco declaration
arm: omap: specify PMUs are for ARMv7 CPUs
arm: shmobile: specify PMUs are for ARMv7 CPUs
arm: iop: specify PMUs are for XScale CPUs
arm: pxa: specify PMUs are for XScale CPUs
arm: realview: specify PMU types
ARM: SAMSUNG: remove unused DMA infrastructure
ARM: OMAP3: Add back Kconfig option MACH_OMAP3517EVM for ASoC
ARM: davinci: Remove CDCE949 driver
ARM: at91: remove useless at91rm9200_set_type()
ARM: at91: remove useless at91rm9200_dt_initialize()
ARM: at91: move debug-macro.S into the common space
ARM: at91: remove useless at91_sysirq_mask_rtx
ARM: at91: remove useless config MACH_AT91SAM9_DT
ARM: at91: remove useless config MACH_AT91RM9200_DT
ARM: at91: remove unused mach/memory.h
ARM: at91: remove useless header file includes
ARM: at91: remove unneeded header file
rtc: at91/Kconfig: remove useless options
ARM: at91/Documentation: add a README for Atmel SoCs
...
Diffstat (limited to 'arch/arm/include/debug')
| -rw-r--r-- | arch/arm/include/debug/at91.S | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/arch/arm/include/debug/at91.S b/arch/arm/include/debug/at91.S new file mode 100644 index 000000000000..80a6501b4d50 --- /dev/null +++ b/arch/arm/include/debug/at91.S | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2003-2005 SAN People | ||
| 3 | * | ||
| 4 | * Debugging macro include header | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | */ | ||
| 11 | |||
| 12 | #if defined(CONFIG_AT91_DEBUG_LL_DBGU0) | ||
| 13 | #define AT91_DBGU 0xfffff200 /* AT91_BASE_DBGU0 */ | ||
| 14 | #elif defined(CONFIG_AT91_DEBUG_LL_DBGU1) | ||
| 15 | #define AT91_DBGU 0xffffee00 /* AT91_BASE_DBGU1 */ | ||
| 16 | #else | ||
| 17 | /* On sama5d4, use USART3 as low level serial console */ | ||
| 18 | #define AT91_DBGU 0xfc00c000 /* SAMA5D4_BASE_USART3 */ | ||
| 19 | #endif | ||
| 20 | |||
| 21 | /* Keep in sync with mach-at91/include/mach/hardware.h */ | ||
| 22 | #define AT91_IO_P2V(x) ((x) - 0x01000000) | ||
| 23 | |||
| 24 | #define AT91_DBGU_SR (0x14) /* Status Register */ | ||
| 25 | #define AT91_DBGU_THR (0x1c) /* Transmitter Holding Register */ | ||
| 26 | #define AT91_DBGU_TXRDY (1 << 1) /* Transmitter Ready */ | ||
| 27 | #define AT91_DBGU_TXEMPTY (1 << 9) /* Transmitter Empty */ | ||
| 28 | |||
| 29 | .macro addruart, rp, rv, tmp | ||
| 30 | ldr \rp, =AT91_DBGU @ System peripherals (phys address) | ||
| 31 | ldr \rv, =AT91_IO_P2V(AT91_DBGU) @ System peripherals (virt address) | ||
| 32 | .endm | ||
| 33 | |||
| 34 | .macro senduart,rd,rx | ||
| 35 | strb \rd, [\rx, #(AT91_DBGU_THR)] @ Write to Transmitter Holding Register | ||
| 36 | .endm | ||
| 37 | |||
| 38 | .macro waituart,rd,rx | ||
| 39 | 1001: ldr \rd, [\rx, #(AT91_DBGU_SR)] @ Read Status Register | ||
| 40 | tst \rd, #AT91_DBGU_TXRDY @ DBGU_TXRDY = 1 when ready to transmit | ||
| 41 | beq 1001b | ||
| 42 | .endm | ||
| 43 | |||
| 44 | .macro busyuart,rd,rx | ||
| 45 | 1001: ldr \rd, [\rx, #(AT91_DBGU_SR)] @ Read Status Register | ||
| 46 | tst \rd, #AT91_DBGU_TXEMPTY @ DBGU_TXEMPTY = 1 when transmission complete | ||
| 47 | beq 1001b | ||
| 48 | .endm | ||
| 49 | |||
