diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
| commit | 31271e9aacaa3c3460cbad8ec62fb5a04a522f5b (patch) | |
| tree | 815c671dac14e0e07959dc88e94c36a994f9c460 /arch/arm/include/debug/socfpga.S | |
| parent | 32111abb508424d1d110fa471d940160abe251f5 (diff) | |
| parent | dc4dc36056392c0b0b1ca9e81bebff964b9297e0 (diff) | |
Merge branch 'spi-tegra' into spi-next
Diffstat (limited to 'arch/arm/include/debug/socfpga.S')
| -rw-r--r-- | arch/arm/include/debug/socfpga.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/debug/socfpga.S b/arch/arm/include/debug/socfpga.S index d6f26d23374f..966b2f994946 100644 --- a/arch/arm/include/debug/socfpga.S +++ b/arch/arm/include/debug/socfpga.S | |||
| @@ -7,6 +7,9 @@ | |||
| 7 | * published by the Free Software Foundation. | 7 | * published by the Free Software Foundation. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #define UART_SHIFT 2 | ||
| 11 | #define DEBUG_LL_UART_OFFSET 0x00002000 | ||
| 12 | |||
| 10 | .macro addruart, rp, rv, tmp | 13 | .macro addruart, rp, rv, tmp |
| 11 | mov \rp, #DEBUG_LL_UART_OFFSET | 14 | mov \rp, #DEBUG_LL_UART_OFFSET |
| 12 | orr \rp, \rp, #0x00c00000 | 15 | orr \rp, \rp, #0x00c00000 |
| @@ -14,3 +17,5 @@ | |||
| 14 | orr \rp, \rp, #0xff000000 @ physical base | 17 | orr \rp, \rp, #0xff000000 @ physical base |
| 15 | .endm | 18 | .endm |
| 16 | 19 | ||
| 20 | #include "8250_32.S" | ||
| 21 | |||