aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2009-11-27 06:07:47 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 11:52:56 -0500
commit4c88a5c20f59c07afc4536c219a9c1f196cec36d (patch)
tree6974e7ec4d409180360d87db43c78669f3fd17ee
parent51834901faee2850e55865589cefd7588202cbf7 (diff)
ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitions
As all existing code was converted to gpiolib, drop no more used pre-gpiolib (bit-shifted) GPIO definintions. Supply new gpiolib-friendly definitions for GPIOs which don't have them yet. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-sa1100/include/mach/h3600.h24
-rw-r--r--arch/arm/mach-sa1100/include/mach/h3600_gpio.h31
2 files changed, 7 insertions, 48 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/h3600.h b/arch/arm/mach-sa1100/include/mach/h3600.h
index f4911dbf6b37..e42042213aeb 100644
--- a/arch/arm/mach-sa1100/include/mach/h3600.h
+++ b/arch/arm/mach-sa1100/include/mach/h3600.h
@@ -33,28 +33,4 @@
33#define H3600_BANK_2_VIRT 0xf1000000 33#define H3600_BANK_2_VIRT 0xf1000000
34#define H3600_BANK_4_VIRT 0xf3800000 34#define H3600_BANK_4_VIRT 0xf3800000
35 35
36/*
37 Machine-independent GPIO definitions
38 --- these are common across all current iPAQ platforms
39*/
40
41#define GPIO_H3600_NPOWER_BUTTON GPIO_GPIO (0) /* Also known as the "off button" */
42
43#define GPIO_H3600_PCMCIA_CD1 GPIO_GPIO (10)
44#define GPIO_H3600_PCMCIA_IRQ1 GPIO_GPIO (11)
45
46/* UDA1341 L3 Interface */
47#define GPIO_H3600_L3_DATA GPIO_GPIO (14)
48#define GPIO_H3600_L3_MODE GPIO_GPIO (15)
49#define GPIO_H3600_L3_CLOCK GPIO_GPIO (16)
50
51#define GPIO_H3600_PCMCIA_CD0 GPIO_GPIO (17)
52#define GPIO_H3600_SYS_CLK GPIO_GPIO (19)
53#define GPIO_H3600_PCMCIA_IRQ0 GPIO_GPIO (21)
54
55#define GPIO_H3600_COM_DCD GPIO_GPIO (23)
56#define GPIO_H3600_OPT_IRQ GPIO_GPIO (24)
57#define GPIO_H3600_COM_CTS GPIO_GPIO (25)
58#define GPIO_H3600_COM_RTS GPIO_GPIO (26)
59
60#endif /* _INCLUDE_H3600_H_ */ 36#endif /* _INCLUDE_H3600_H_ */
diff --git a/arch/arm/mach-sa1100/include/mach/h3600_gpio.h b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h
index 0c0bfa5464f4..2537f35685c6 100644
--- a/arch/arm/mach-sa1100/include/mach/h3600_gpio.h
+++ b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h
@@ -30,6 +30,7 @@
30#define H3XXX_GPIO_PCMCIA_CD1 10 30#define H3XXX_GPIO_PCMCIA_CD1 10
31#define H3XXX_GPIO_PCMCIA_IRQ1 11 31#define H3XXX_GPIO_PCMCIA_IRQ1 11
32#define H3XXX_GPIO_PCMCIA_CD0 17 32#define H3XXX_GPIO_PCMCIA_CD0 17
33#define H3XXX_GPIO_ACTION_BUTTON 18
33#define H3XXX_GPIO_SYS_CLK 19 34#define H3XXX_GPIO_SYS_CLK 19
34#define H3XXX_GPIO_PCMCIA_IRQ0 21 35#define H3XXX_GPIO_PCMCIA_IRQ0 21
35#define H3XXX_GPIO_COM_DCD 23 36#define H3XXX_GPIO_COM_DCD 23
@@ -37,23 +38,8 @@
37#define H3XXX_GPIO_COM_CTS 25 38#define H3XXX_GPIO_COM_CTS 25
38#define H3XXX_GPIO_COM_RTS 26 39#define H3XXX_GPIO_COM_RTS 26
39 40
40/* 41/* machine-specific gpios */
41 * GPIO lines that are common across ALL iPAQ models are in "h3600.h"
42 * This file contains machine-specific definitions
43 */
44 42
45#define GPIO_H3600_SUSPEND GPIO_GPIO (0)
46/* GPIO[2:9] used by LCD on H3600/3800, used as GPIO on H3100 */
47#define GPIO_H3100_BT_ON GPIO_GPIO (2)
48#define GPIO_H3100_GPIO3 GPIO_GPIO (3)
49#define GPIO_H3100_QMUTE GPIO_GPIO (4)
50#define GPIO_H3100_LCD_3V_ON GPIO_GPIO (5)
51#define GPIO_H3100_AUD_ON GPIO_GPIO (6)
52#define GPIO_H3100_AUD_PWR_ON GPIO_GPIO (7)
53#define GPIO_H3100_IR_ON GPIO_GPIO (8)
54#define GPIO_H3100_IR_FSEL GPIO_GPIO (9)
55
56/* gpiolib versions of the above */
57#define H3100_GPIO_BT_ON 2 43#define H3100_GPIO_BT_ON 2
58#define H3100_GPIO_QMUTE 4 44#define H3100_GPIO_QMUTE 4
59#define H3100_GPIO_LCD_3V_ON 5 45#define H3100_GPIO_LCD_3V_ON 5
@@ -62,14 +48,11 @@
62#define H3100_GPIO_IR_ON 8 48#define H3100_GPIO_IR_ON 8
63#define H3100_GPIO_IR_FSEL 9 49#define H3100_GPIO_IR_FSEL 9
64 50
65/* for H3600, audio sample rate clock generator */ 51#define H3600_GPIO_CLK_SET0 12 /* audio sample rate clock generator */
66#define GPIO_H3600_CLK_SET0 GPIO_GPIO (12) 52#define H3600_GPIO_CLK_SET1 13
67#define GPIO_H3600_CLK_SET1 GPIO_GPIO (13) 53#define H3600_GPIO_SOFT_RESET 20 /* also known as BATT_FAULT */
68 54#define H3600_GPIO_OPT_LOCK 22
69#define GPIO_H3600_ACTION_BUTTON GPIO_GPIO (18) 55#define H3600_GPIO_OPT_DET 27
70#define GPIO_H3600_SOFT_RESET GPIO_GPIO (20) /* Also known as BATT_FAULT */
71#define GPIO_H3600_OPT_LOCK GPIO_GPIO (22)
72#define GPIO_H3600_OPT_DET GPIO_GPIO (27)
73 56
74 57
75/* H3100 / 3600 EGPIO pins */ 58/* H3100 / 3600 EGPIO pins */