aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2009-11-27 06:09:25 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 11:52:56 -0500
commit8715b29db2787f7c70f662b7b4d5b01017c61948 (patch)
tree2f1254879673cde83fe08f11de2a6a0f6c291568 /arch
parent4c88a5c20f59c07afc4536c219a9c1f196cec36d (diff)
ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h
Combine both headers into one, rename to h3xxx.h and change all users accordingly. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-sa1100/h3600.c3
-rw-r--r--arch/arm/mach-sa1100/include/mach/h3600.h36
-rw-r--r--arch/arm/mach-sa1100/include/mach/h3xxx.h (renamed from arch/arm/mach-sa1100/include/mach/h3600_gpio.h)16
3 files changed, 14 insertions, 41 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 3d52190a2690..dd39f90db0db 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -44,8 +44,7 @@
44#include <asm/mach/map.h> 44#include <asm/mach/map.h>
45#include <asm/mach/serial_sa1100.h> 45#include <asm/mach/serial_sa1100.h>
46 46
47#include <mach/h3600.h> 47#include <mach/h3xxx.h>
48#include <mach/h3600_gpio.h>
49 48
50#include "generic.h" 49#include "generic.h"
51 50
diff --git a/arch/arm/mach-sa1100/include/mach/h3600.h b/arch/arm/mach-sa1100/include/mach/h3600.h
deleted file mode 100644
index e42042213aeb..000000000000
--- a/arch/arm/mach-sa1100/include/mach/h3600.h
+++ /dev/null
@@ -1,36 +0,0 @@
1/*
2 *
3 * Definitions for H3600 Handheld Computer
4 *
5 * Copyright 2000 Compaq Computer Corporation.
6 *
7 * Use consistent with the GNU GPL is permitted,
8 * provided that this copyright notice is
9 * preserved in its entirety in all copies and derived works.
10 *
11 * COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED,
12 * AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS
13 * FITNESS FOR ANY PARTICULAR PURPOSE.
14 *
15 * Author: Jamey Hicks.
16 *
17 * History:
18 *
19 * 2001-10-?? Andrew Christian Added support for iPAQ H3800
20 *
21 */
22
23#ifndef _INCLUDE_H3600_H_
24#define _INCLUDE_H3600_H_
25
26/* Physical memory regions corresponding to chip selects */
27#define H3600_EGPIO_PHYS (SA1100_CS5_PHYS + 0x01000000)
28#define H3600_BANK_2_PHYS SA1100_CS2_PHYS
29#define H3600_BANK_4_PHYS SA1100_CS4_PHYS
30
31/* Virtual memory regions corresponding to chip selects 2 & 4 (used on sleeves) */
32#define H3600_EGPIO_VIRT 0xf0000000
33#define H3600_BANK_2_VIRT 0xf1000000
34#define H3600_BANK_4_VIRT 0xf3800000
35
36#endif /* _INCLUDE_H3600_H_ */
diff --git a/arch/arm/mach-sa1100/include/mach/h3600_gpio.h b/arch/arm/mach-sa1100/include/mach/h3xxx.h
index 2537f35685c6..7f1e130be949 100644
--- a/arch/arm/mach-sa1100/include/mach/h3600_gpio.h
+++ b/arch/arm/mach-sa1100/include/mach/h3xxx.h
@@ -20,8 +20,18 @@
20 * 20 *
21 */ 21 */
22 22
23#ifndef _INCLUDE_H3600_GPIO_H_ 23#ifndef _INCLUDE_H3XXX_H_
24#define _INCLUDE_H3600_GPIO_H_ 24#define _INCLUDE_H3XXX_H_
25
26/* Physical memory regions corresponding to chip selects */
27#define H3600_EGPIO_PHYS (SA1100_CS5_PHYS + 0x01000000)
28#define H3600_BANK_2_PHYS SA1100_CS2_PHYS
29#define H3600_BANK_4_PHYS SA1100_CS4_PHYS
30
31/* Virtual memory regions corresponding to chip selects 2 & 4 (used on sleeves) */
32#define H3600_EGPIO_VIRT 0xf0000000
33#define H3600_BANK_2_VIRT 0xf1000000
34#define H3600_BANK_4_VIRT 0xf3800000
25 35
26/* 36/*
27 * gpiolib numbers for all iPAQs 37 * gpiolib numbers for all iPAQs
@@ -77,4 +87,4 @@
77#define H3600_EGPIO_LCD_5V_ON (H3XXX_EGPIO_BASE + 14) /* enable 5V to LCD. active high. */ 87#define H3600_EGPIO_LCD_5V_ON (H3XXX_EGPIO_BASE + 14) /* enable 5V to LCD. active high. */
78#define H3600_EGPIO_LVDD_ON (H3XXX_EGPIO_BASE + 15) /* enable 9V and -6.5V to LCD. */ 88#define H3600_EGPIO_LVDD_ON (H3XXX_EGPIO_BASE + 15) /* enable 9V and -6.5V to LCD. */
79 89
80#endif /* _INCLUDE_H3600_GPIO_H_ */ 90#endif /* _INCLUDE_H3XXX_H_ */