diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
commit | 3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4 (patch) | |
tree | 7d729e347d8860c9ef5631cb8cdfa96e892f86d5 /arch/arm/mach-zynq/include/mach/uncompress.h | |
parent | a990cbd887585a1056b927b3b20de325f14fdf96 (diff) | |
parent | 3d64b4496f5fd90618106555344205a522178c0c (diff) | |
download | talos-op-linux-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.tar.gz talos-op-linux-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.zip |
Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-zynq/include/mach/uncompress.h')
-rw-r--r-- | arch/arm/mach-zynq/include/mach/uncompress.h | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/include/mach/uncompress.h b/arch/arm/mach-zynq/include/mach/uncompress.h new file mode 100644 index 000000000000..af4e8447bfa3 --- /dev/null +++ b/arch/arm/mach-zynq/include/mach/uncompress.h @@ -0,0 +1,51 @@ +/* arch/arm/mach-zynq/include/mach/uncompress.h + * + * Copyright (C) 2011 Xilinx + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __MACH_UNCOMPRESS_H__ +#define __MACH_UNCOMPRESS_H__ + +#include <linux/io.h> +#include <asm/processor.h> +#include <mach/zynq_soc.h> +#include <mach/uart.h> + +void arch_decomp_setup(void) +{ +} + +static inline void flush(void) +{ + /* + * Wait while the FIFO is not empty + */ + while (!(__raw_readl(IOMEM(LL_UART_PADDR + UART_SR_OFFSET)) & + UART_SR_TXEMPTY)) + cpu_relax(); +} + +#define arch_decomp_wdog() + +static void putc(char ch) +{ + /* + * Wait for room in the FIFO, then write the char into the FIFO + */ + while (__raw_readl(IOMEM(LL_UART_PADDR + UART_SR_OFFSET)) & + UART_SR_TXFULL) + cpu_relax(); + + __raw_writel(ch, IOMEM(LL_UART_PADDR + UART_FIFO_OFFSET)); +} + +#endif |