mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 12:21:37 +00:00
820d41cf0c
Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes, moving some of the oft-repeated macros to a common location and removing a bunch of boiler plate. This is another step closer to a common zImage for multiple platforms. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPcpqHAAoJEIwa5zzehBx3xCMP/2evrPQyorzMBztrFB4Ry9Ol qNkSVNsemZjdtkY2dnJv+zJ/Xb0PPDU9EuBHr/SpqmVrRZEZeJND42wZK/OTFCBZ Ufi7KP1qE30daO5H3YmL+58/Ixir5fTHqggqolHhTcEYU2hnHgLBI4rIFu92kSO7 TMyrAUs14jSkTVZc6HSF83w3PfQWhMzWvspJVHQ6RebZRruETAr7v9weVMbgxcDk jQ5XJ9y73rGs2AF8bZTpUdFPzkcac7UiHn3/XyqoZs8RNCL98BGpskzhILyTARf5 X90c9mqQF+AEbb9QSDDd52uYFsJ/5COJvWdlExRI9gZZDI8Pd05ijZBR9IdGJg/B NsVsl98wvZ/zjHJ/Sb2qt5ruet7PiQUGhkshB42jVHsaWfRM030sKGYxQ8pX5Tsa cSagnfBCvAZ9VjDLkXrnEbWRNTz8LSwn9l63z0jmtm5D8+vbpMtgvtWARtuZ4RNn D8wIWoyT0ytVZnosu5441TEgCejtcKOEFzThvKDYMeMJZ/rqVkAbcznapoC2qUd4 fceNlLfQFvW7xpY1MY8mhlwC0ki4hM9MSDieaXUyefvAU/hoSp8MveVUH5UspYfb 0FpkEhzklW/g0/fuq0DJQIrMn7dajjUvVZIUQtiVQuFHOr6RUbFG5vmXuCbAyx10 PE2K4rnKz+PC8bKab7v9 =YIsn -----END PGP SIGNATURE----- Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: cleanups of io includes" from Olof Johansson: "Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes, moving some of the oft-repeated macros to a common location and removing a bunch of boiler plate. This is another step closer to a common zImage for multiple platforms." Fix up various fairly trivial conflicts (<mach/io.h> removal vs changes around it, tegra localtimer.o is *still* gone, yadda-yadda). * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits) ARM: tegra: Include assembler.h in sleep.S to fix build break ARM: pxa: use common IOMEM definition ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol ARM: __io abuse cleanup ARM: create a common IOMEM definition ARM: iop13xx: fix missing declaration of iop13xx_init_early ARM: fix ioremap/iounmap for !CONFIG_MMU ARM: kill off __mem_pci ARM: remove bunch of now unused mach/io.h files ARM: make mach/io.h include optional ARM: clps711x: remove unneeded include of mach/io.h ARM: dove: add explicit include of dove.h to addr-map.c ARM: at91: add explicit include of hardware.h to uncompressor ARM: ep93xx: clean-up mach/io.h ARM: tegra: clean-up mach/io.h ARM: orion5x: clean-up mach/io.h ARM: davinci: remove unneeded mach/io.h include [media] davinci: remove includes of mach/io.h ARM: OMAP: Remove remaining includes for mach/io.h ARM: msm: clean-up mach/io.h ...
101 lines
2.9 KiB
ArmAsm
101 lines
2.9 KiB
ArmAsm
/*
|
|
* arch/arm/mach-tegra/include/mach/debug-macro.S
|
|
*
|
|
* Copyright (C) 2010,2011 Google, Inc.
|
|
* Copyright (C) 2011-2012 NVIDIA CORPORATION. All Rights Reserved.
|
|
*
|
|
* Author:
|
|
* Colin Cross <ccross@google.com>
|
|
* Erik Gilling <konkers@google.com>
|
|
* Doug Anderson <dianders@chromium.org>
|
|
* Stephen Warren <swarren@nvidia.com>
|
|
*
|
|
* Portions based on mach-omap2's debug-macro.S
|
|
* Copyright (C) 1994-1999 Russell King
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include <linux/serial_reg.h>
|
|
|
|
#include <mach/iomap.h>
|
|
#include <mach/irammap.h>
|
|
|
|
.macro addruart, rp, rv, tmp
|
|
adr \rp, 99f @ actual addr of 99f
|
|
ldr \rv, [\rp] @ linked addr is stored there
|
|
sub \rv, \rv, \rp @ offset between the two
|
|
ldr \rp, [\rp, #4] @ linked tegra_uart_config
|
|
sub \tmp, \rp, \rv @ actual tegra_uart_config
|
|
ldr \rp, [\tmp] @ Load tegra_uart_config
|
|
cmp \rp, #1 @ needs intitialization?
|
|
bne 100f @ no; go load the addresses
|
|
mov \rv, #0 @ yes; record init is done
|
|
str \rv, [\tmp]
|
|
mov \rp, #TEGRA_IRAM_BASE @ See if cookie is in IRAM
|
|
ldr \rv, [\rp, #TEGRA_IRAM_DEBUG_UART_OFFSET]
|
|
movw \rp, #TEGRA_IRAM_DEBUG_UART_COOKIE & 0xffff
|
|
movt \rp, #TEGRA_IRAM_DEBUG_UART_COOKIE >> 16
|
|
cmp \rv, \rp @ Cookie present?
|
|
bne 100f @ No, use default UART
|
|
mov \rp, #TEGRA_IRAM_BASE @ Load UART address from IRAM
|
|
ldr \rv, [\rp, #TEGRA_IRAM_DEBUG_UART_OFFSET + 4]
|
|
str \rv, [\tmp, #4] @ Store in tegra_uart_phys
|
|
sub \rv, \rv, #IO_APB_PHYS @ Calculate virt address
|
|
add \rv, \rv, #IO_APB_VIRT
|
|
str \rv, [\tmp, #8] @ Store in tegra_uart_virt
|
|
b 100f
|
|
|
|
.align
|
|
99: .word .
|
|
.word tegra_uart_config
|
|
.ltorg
|
|
|
|
100: ldr \rp, [\tmp, #4] @ Load tegra_uart_phys
|
|
ldr \rv, [\tmp, #8] @ Load tegra_uart_virt
|
|
.endm
|
|
|
|
#define UART_SHIFT 2
|
|
|
|
/*
|
|
* Code below is swiped from <asm/hardware/debug-8250.S>, but add an extra
|
|
* check to make sure that we aren't in the CONFIG_TEGRA_DEBUG_UART_NONE case.
|
|
* We use the fact that all 5 valid UART addresses all have something in the
|
|
* 2nd-to-lowest byte.
|
|
*/
|
|
|
|
.macro senduart, rd, rx
|
|
tst \rx, #0x0000ff00
|
|
strneb \rd, [\rx, #UART_TX << UART_SHIFT]
|
|
1001:
|
|
.endm
|
|
|
|
.macro busyuart, rd, rx
|
|
tst \rx, #0x0000ff00
|
|
beq 1002f
|
|
1001: ldrb \rd, [\rx, #UART_LSR << UART_SHIFT]
|
|
and \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE
|
|
teq \rd, #UART_LSR_TEMT | UART_LSR_THRE
|
|
bne 1001b
|
|
1002:
|
|
.endm
|
|
|
|
.macro waituart, rd, rx
|
|
#ifdef FLOW_CONTROL
|
|
tst \rx, #0x0000ff00
|
|
beq 1002f
|
|
1001: ldrb \rd, [\rx, #UART_MSR << UART_SHIFT]
|
|
tst \rd, #UART_MSR_CTS
|
|
beq 1001b
|
|
1002:
|
|
#endif
|
|
.endm
|