diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 18:49:03 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 18:49:03 +0300 |
commit | 94db5b98d0bc56729e8f3cf2e1673017860c4a3a (patch) | |
tree | dd43ee9486506f7af00c1243b179c0cc9b3f25d7 /arch/arm/include | |
parent | 73e601ea57020c42d989120061dfc83ce9c85360 (diff) | |
parent | 122694a0c71281cf2b349af41309c3caf5f31d61 (diff) | |
download | linux-94db5b98d0bc56729e8f3cf2e1673017860c4a3a.tar.xz |
Merge tag 'socfpga_updates_for_v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/soc
Merge "SoCFPGA updates for v4.2" from Dinh Nguyen:
- Add big endian support
- Add earlyprintk support on UART1 that is used on Arria10
- Remove the need to map uart_io_desc
- Use of_iomap to map the SCU
- Remove socfpga_smp_init_cpus as arm_dt_init_cpu_maps is already doing
the CPU mapping.
* tag 'socfpga_updates_for_v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga: use of_iomap to map the SCU
ARM: socfpga: remove the need to map uart_io_desc
ARM: socfpga: Add support for UART1 debug uart for earlyprintk
ARM: socfpga: support big endian for socfpga
ARM: socfpga: enable big endian for secondary core(s)
ARM: debug: fix big endian operation for 8250 word mode
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/debug/8250.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/debug/8250.S b/arch/arm/include/debug/8250.S index 7a2baf913aa0..7f7446f6f806 100644 --- a/arch/arm/include/debug/8250.S +++ b/arch/arm/include/debug/8250.S @@ -16,11 +16,14 @@ #ifdef CONFIG_DEBUG_UART_8250_WORD .macro store, rd, rx:vararg + ARM_BE8(rev \rd, \rd) str \rd, \rx + ARM_BE8(rev \rd, \rd) .endm .macro load, rd, rx:vararg ldr \rd, \rx + ARM_BE8(rev \rd, \rd) .endm #else .macro store, rd, rx:vararg |