diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-05 10:53:52 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-05 10:53:52 +0200 |
| commit | b69354dfe25bf0b103ef3ed6c881d34cc442265c (patch) | |
| tree | 7bb912aa103d1501c9e67457cab8b761e175aba0 /arch/arm/include/debug | |
| parent | c268a743103aebba8d81d3365107f7170653099e (diff) | |
| parent | e4a9288942392965bd5cfad93d9996b83c0dc4a6 (diff) | |
Merge tag 'zynq-soc-for-4.3' of https://github.com/Xilinx/linux-xlnx into next/soc
arm: Xilinx Zynq SoC patches for v4.2
- Fix earlyprintk, jump trampoline for SMP
- Update git tree location
- Setup PL310 aux (bit 22)
* tag 'zynq-soc-for-4.3' of https://github.com/Xilinx/linux-xlnx:
ARM: zynq: reserve space for jump target in secondary trampoline
clk: zynq: remove redundant $(CONFIG_ARCH_ZYNQ) in Makefile
MAINTAINERS: Update Zynq git tree location
ARM: zynq: Set bit 22 in PL310 AuxCtrl register (6395/1)
ARM: zynq: Fix earlyprintk in big endian mode
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/include/debug')
| -rw-r--r-- | arch/arm/include/debug/zynq.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/debug/zynq.S b/arch/arm/include/debug/zynq.S index bd13dedbdeff..de86b9247564 100644 --- a/arch/arm/include/debug/zynq.S +++ b/arch/arm/include/debug/zynq.S @@ -38,7 +38,7 @@ .endm .macro senduart,rd,rx - str \rd, [\rx, #UART_FIFO_OFFSET] @ TXDATA + strb \rd, [\rx, #UART_FIFO_OFFSET] @ TXDATA .endm .macro waituart,rd,rx |