aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-nomadik
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-02-27 17:35:40 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-03-06 20:48:03 -0500
commita2823dd5f5e2f9da2eafc402612ae85526ed222c (patch)
tree5819cb851bc678192e2cb9f0d2f73cec208a5589 /arch/arm/mach-nomadik
parent1187ed87723899816128ec9f75edf4fad9c07dc6 (diff)
ARM: nomadik: delete remnant include files
This deletes the leftover <mach/timex.h> and <mach/uncompress.h> and Makefile.boot that have no role in a multiplatform environment. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-nomadik')
-rw-r--r--arch/arm/mach-nomadik/Makefile.boot4
-rw-r--r--arch/arm/mach-nomadik/include/mach/timex.h6
-rw-r--r--arch/arm/mach-nomadik/include/mach/uncompress.h60
3 files changed, 0 insertions, 70 deletions
diff --git a/arch/arm/mach-nomadik/Makefile.boot b/arch/arm/mach-nomadik/Makefile.boot
deleted file mode 100644
index ff0a4b5b0a82..000000000000
--- a/arch/arm/mach-nomadik/Makefile.boot
+++ /dev/null
@@ -1,4 +0,0 @@
1 zreladdr-y += 0x00008000
2params_phys-y := 0x00000100
3initrd_phys-y := 0x00800000
4
diff --git a/arch/arm/mach-nomadik/include/mach/timex.h b/arch/arm/mach-nomadik/include/mach/timex.h
deleted file mode 100644
index 318b8896ce96..000000000000
--- a/arch/arm/mach-nomadik/include/mach/timex.h
+++ /dev/null
@@ -1,6 +0,0 @@
1#ifndef __ASM_ARCH_TIMEX_H
2#define __ASM_ARCH_TIMEX_H
3
4#define CLOCK_TICK_RATE 2400000
5
6#endif
diff --git a/arch/arm/mach-nomadik/include/mach/uncompress.h b/arch/arm/mach-nomadik/include/mach/uncompress.h
deleted file mode 100644
index 106fccca2021..000000000000
--- a/arch/arm/mach-nomadik/include/mach/uncompress.h
+++ /dev/null
@@ -1,60 +0,0 @@
1/*
2 * Copyright (C) 2008 STMicroelectronics
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 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program; if not, write to the Free Software
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17 */
18
19#ifndef __ASM_ARCH_UNCOMPRESS_H
20#define __ASM_ARCH_UNCOMPRESS_H
21
22#include <asm/setup.h>
23#include <asm/io.h>
24
25/* we need the constants in amba/serial.h, but it refers to amba_device */
26struct amba_device;
27#include <linux/amba/serial.h>
28
29#define NOMADIK_UART_DR (void __iomem *)0x101FB000
30#define NOMADIK_UART_LCRH (void __iomem *)0x101FB02c
31#define NOMADIK_UART_CR (void __iomem *)0x101FB030
32#define NOMADIK_UART_FR (void __iomem *)0x101FB018
33
34static void putc(const char c)
35{
36 /* Do nothing if the UART is not enabled. */
37 if (!(readb(NOMADIK_UART_CR) & UART01x_CR_UARTEN))
38 return;
39
40 if (c == '\n')
41 putc('\r');
42
43 while (readb(NOMADIK_UART_FR) & UART01x_FR_TXFF)
44 barrier();
45 writeb(c, NOMADIK_UART_DR);
46}
47
48static void flush(void)
49{
50 if (!(readb(NOMADIK_UART_CR) & UART01x_CR_UARTEN))
51 return;
52 while (readb(NOMADIK_UART_FR) & UART01x_FR_BUSY)
53 barrier();
54}
55
56static inline void arch_decomp_setup(void)
57{
58}
59
60#endif /* __ASM_ARCH_UNCOMPRESS_H */