tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: clps711x: Move debug include into arch/arm/include/debug/

One more step to allowing CLPS711X to participate in the
multi-platform defconfig.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>

authored by

Alexander Shiyan and committed by
Olof Johansson dd99eef5 a8a28aff

+40 -39
+1
arch/arm/Kconfig.debug
··· 991 991 config DEBUG_LL_INCLUDE 992 992 string 993 993 default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250 994 + default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2 994 995 default "debug/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X 995 996 default "debug/exynos.S" if DEBUG_EXYNOS_UART 996 997 default "debug/efm32.S" if DEBUG_LL_UART_EFM32
+38
arch/arm/include/debug/clps711x.S
··· 1 + /* 2 + * Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru> 3 + * 4 + * This program is free software; you can redistribute it and/or modify 5 + * it under the terms of the GNU General Public License as published by 6 + * the Free Software Foundation; either version 2 of the License, or 7 + * (at your option) any later version. 8 + */ 9 + 10 + #ifndef CONFIG_DEBUG_CLPS711X_UART2 11 + #define CLPS711X_UART_PADDR (0x80000000 + 0x0000) 12 + #define CLPS711X_UART_VADDR (0xfeff0000 + 0x0000) 13 + #else 14 + #define CLPS711X_UART_PADDR (0x80000000 + 0x1000) 15 + #define CLPS711X_UART_VADDR (0xfeff0000 + 0x1000) 16 + #endif 17 + 18 + #define SYSFLG (0x0140) 19 + #define SYSFLG_UBUSY (1 << 11) 20 + #define UARTDR (0x0480) 21 + 22 + .macro addruart, rp, rv, tmp 23 + ldr \rv, =CLPS711X_UART_VADDR 24 + ldr \rp, =CLPS711X_UART_PADDR 25 + .endm 26 + 27 + .macro waituart,rd,rx 28 + .endm 29 + 30 + .macro senduart,rd,rx 31 + str \rd, [\rx, #UARTDR] 32 + .endm 33 + 34 + .macro busyuart,rd,rx 35 + 1001: ldr \rd, [\rx, #SYSFLG] 36 + tst \rd, #SYSFLG_UBUSY 37 + bne 1001b 38 + .endm
-38
arch/arm/mach-clps711x/include/mach/debug-macro.S
··· 1 - /* arch/arm/mach-clps711x/include/mach/debug-macro.S 2 - * 3 - * Debugging macro include header 4 - * 5 - * Copyright (C) 1994-1999 Russell King 6 - * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks 7 - * 8 - * This program is free software; you can redistribute it and/or modify 9 - * it under the terms of the GNU General Public License version 2 as 10 - * published by the Free Software Foundation. 11 - * 12 - */ 13 - 14 - #include <mach/hardware.h> 15 - 16 - .macro addruart, rp, rv, tmp 17 - #ifndef CONFIG_DEBUG_CLPS711X_UART2 18 - mov \rp, #0x0000 @ UART1 19 - #else 20 - mov \rp, #0x1000 @ UART2 21 - #endif 22 - orr \rv, \rp, #CLPS711X_VIRT_BASE 23 - orr \rp, \rp, #CLPS711X_PHYS_BASE 24 - .endm 25 - 26 - .macro senduart,rd,rx 27 - str \rd, [\rx, #0x0480] @ UARTDR 28 - .endm 29 - 30 - .macro waituart,rd,rx 31 - .endm 32 - 33 - .macro busyuart,rd,rx 34 - 1001: ldr \rd, [\rx, #0x0140] @ SYSFLGx 35 - tst \rd, #1 << 11 @ UBUSYx 36 - bne 1001b 37 - .endm 38 -
+1 -1
arch/arm/mach-clps711x/include/mach/hardware.h
··· 24 24 25 25 #include <mach/clps711x.h> 26 26 27 - #define CLPS711X_VIRT_BASE IOMEM(0xfe000000) 27 + #define CLPS711X_VIRT_BASE IOMEM(0xfeff0000) 28 28 29 29 #ifndef __ASSEMBLY__ 30 30 #define clps_readb(off) readb(CLPS711X_VIRT_BASE + (off))