diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-05 22:41:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-05 22:41:01 -0700 |
| commit | 553228d073444ac49cb24cafdde3e8a3fc56297a (patch) | |
| tree | f11727a3ee3087d3ab7f3d679de3c9fafd76979b /arch/arm/include | |
| parent | df92d2e39313d0af510cacef27e82be6a002b889 (diff) | |
| parent | 1c03274d68f4744afe582fcff1c2e5b1c5c34b5b (diff) | |
| download | op-kernel-dev-553228d073444ac49cb24cafdde3e8a3fc56297a.zip op-kernel-dev-553228d073444ac49cb24cafdde3e8a3fc56297a.tar.gz | |
Merge tag 'samsung-soc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc
Samsung mach/soc update for v4.8, part 2:
1. Endian-friendly fixes.
2. Maintainers update.
* tag 'samsung-soc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
MAINTAINERS: Extend Samsung SoC entry with S3C/S5P drivers
ARM: SAMSUNG: Fix missing s5p_init_cpu() declaration
ARM: EXYNOS: Fix UART address selection for DEBUG_LL
ARM: EXYNOS: Fixup for __raw operations in suspend.c
ARM: SAMSUNG: Fixup usage of __raw IO in PM
ARM: EXYNOS: Fixup endian in pm/pmu
ARM: EXYNOS: Fixups for big-endian operation
ARM: SAMSUNG: Fixup endian issues in CPU detection
ARM: EXYNOS: Fixup debug macros for big-endian
ARM: s3c24xx: Sort cpufreq tables
ARM: SAMSUNG: Fix typos
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/debug/exynos.S | 6 | ||||
| -rw-r--r-- | arch/arm/include/debug/samsung.S | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/include/debug/exynos.S b/arch/arm/include/debug/exynos.S index b17fdb7..60bf3c2 100644 --- a/arch/arm/include/debug/exynos.S +++ b/arch/arm/include/debug/exynos.S @@ -24,7 +24,11 @@ mrc p15, 0, \tmp, c0, c0, 0 and \tmp, \tmp, #0xf0 teq \tmp, #0xf0 @@ A15 - ldreq \rp, =EXYNOS5_PA_UART + beq 100f + mrc p15, 0, \tmp, c0, c0, 5 + and \tmp, \tmp, #0xf00 + teq \tmp, #0x100 @@ A15 + A7 but boot to A7 +100: ldreq \rp, =EXYNOS5_PA_UART movne \rp, #EXYNOS4_PA_UART @@ EXYNOS4 ldr \rv, =S3C_VA_UART #if CONFIG_DEBUG_S3C_UART != 0 diff --git a/arch/arm/include/debug/samsung.S b/arch/arm/include/debug/samsung.S index 8d8d922..f4eeed2 100644 --- a/arch/arm/include/debug/samsung.S +++ b/arch/arm/include/debug/samsung.S @@ -15,11 +15,13 @@ .macro fifo_level_s5pv210 rd, rx ldr \rd, [\rx, # S3C2410_UFSTAT] +ARM_BE8(rev \rd, \rd) and \rd, \rd, #S5PV210_UFSTAT_TXMASK .endm .macro fifo_full_s5pv210 rd, rx ldr \rd, [\rx, # S3C2410_UFSTAT] +ARM_BE8(rev \rd, \rd) tst \rd, #S5PV210_UFSTAT_TXFULL .endm @@ -28,6 +30,7 @@ .macro fifo_level_s3c2440 rd, rx ldr \rd, [\rx, # S3C2410_UFSTAT] +ARM_BE8(rev \rd, \rd) and \rd, \rd, #S3C2440_UFSTAT_TXMASK .endm @@ -37,6 +40,7 @@ .macro fifo_full_s3c2440 rd, rx ldr \rd, [\rx, # S3C2410_UFSTAT] +ARM_BE8(rev \rd, \rd) tst \rd, #S3C2440_UFSTAT_TXFULL .endm @@ -50,6 +54,7 @@ .macro busyuart, rd, rx ldr \rd, [\rx, # S3C2410_UFCON] +ARM_BE8(rev \rd, \rd) tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? beq 1001f @ @ FIFO enabled... @@ -61,6 +66,7 @@ 1001: @ busy waiting for non fifo ldr \rd, [\rx, # S3C2410_UTRSTAT] +ARM_BE8(rev \rd, \rd) tst \rd, #S3C2410_UTRSTAT_TXFE beq 1001b @@ -69,6 +75,7 @@ .macro waituart,rd,rx ldr \rd, [\rx, # S3C2410_UFCON] +ARM_BE8(rev \rd, \rd) tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? beq 1001f @ @ FIFO enabled... @@ -80,6 +87,7 @@ 1001: @ idle waiting for non fifo ldr \rd, [\rx, # S3C2410_UTRSTAT] +ARM_BE8(rev \rd, \rd) tst \rd, #S3C2410_UTRSTAT_TXFE beq 1001b |
