diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-10 02:21:08 -0400 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 08:07:58 -0500 |
commit | 6384fdadb48a875bcc1c0f58933275f15f409b76 (patch) | |
tree | d9416a0d9e3d9654939aa85fc515f7336dec5893 /arch/arm/mach-pxa/include | |
parent | 31555213f03bca37d2c02e10946296052f4ecfcd (diff) |
ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ
Avoid potential naming confliction since multiple architecture will be built
in a single kernel.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/arm/mach-pxa/include')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/balloon3.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/corgi.h | 24 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/gpio.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/gumstix.h | 20 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/idp.h | 14 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/irqs.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmld.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmt5.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmtc.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmtx.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pcm027.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pcm990_baseboard.h | 14 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/poodle.h | 24 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/spitz.h | 34 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/tosa.h | 48 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/trizeps4.h | 16 |
16 files changed, 120 insertions, 120 deletions
diff --git a/arch/arm/mach-pxa/include/mach/balloon3.h b/arch/arm/mach-pxa/include/mach/balloon3.h index 6d7eab3d0867..f02fa1e6ba86 100644 --- a/arch/arm/mach-pxa/include/mach/balloon3.h +++ b/arch/arm/mach-pxa/include/mach/balloon3.h | |||
@@ -172,9 +172,9 @@ enum balloon3_features { | |||
172 | /* Balloon3 Interrupts */ | 172 | /* Balloon3 Interrupts */ |
173 | #define BALLOON3_IRQ(x) (IRQ_BOARD_START + (x)) | 173 | #define BALLOON3_IRQ(x) (IRQ_BOARD_START + (x)) |
174 | 174 | ||
175 | #define BALLOON3_AUX_NIRQ IRQ_GPIO(BALLOON3_GPIO_AUX_NIRQ) | 175 | #define BALLOON3_AUX_NIRQ PXA_GPIO_TO_IRQ(BALLOON3_GPIO_AUX_NIRQ) |
176 | #define BALLOON3_CODEC_IRQ IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ) | 176 | #define BALLOON3_CODEC_IRQ PXA_GPIO_TO_IRQ(BALLOON3_GPIO_CODEC_IRQ) |
177 | #define BALLOON3_S0_CD_IRQ IRQ_GPIO(BALLOON3_GPIO_S0_CD) | 177 | #define BALLOON3_S0_CD_IRQ PXA_GPIO_TO_IRQ(BALLOON3_GPIO_S0_CD) |
178 | 178 | ||
179 | #define BALLOON3_NR_IRQS (IRQ_BOARD_START + 16) | 179 | #define BALLOON3_NR_IRQS (IRQ_BOARD_START + 16) |
180 | 180 | ||
diff --git a/arch/arm/mach-pxa/include/mach/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h index 5dfd1195a5a7..c9f86172520e 100644 --- a/arch/arm/mach-pxa/include/mach/corgi.h +++ b/arch/arm/mach-pxa/include/mach/corgi.h | |||
@@ -66,18 +66,18 @@ | |||
66 | /* | 66 | /* |
67 | * Corgi Interrupts | 67 | * Corgi Interrupts |
68 | */ | 68 | */ |
69 | #define CORGI_IRQ_GPIO_KEY_INT IRQ_GPIO(0) | 69 | #define CORGI_IRQ_GPIO_KEY_INT PXA_GPIO_TO_IRQ(0) |
70 | #define CORGI_IRQ_GPIO_AC_IN IRQ_GPIO(1) | 70 | #define CORGI_IRQ_GPIO_AC_IN PXA_GPIO_TO_IRQ(1) |
71 | #define CORGI_IRQ_GPIO_WAKEUP IRQ_GPIO(3) | 71 | #define CORGI_IRQ_GPIO_WAKEUP PXA_GPIO_TO_IRQ(3) |
72 | #define CORGI_IRQ_GPIO_AK_INT IRQ_GPIO(4) | 72 | #define CORGI_IRQ_GPIO_AK_INT PXA_GPIO_TO_IRQ(4) |
73 | #define CORGI_IRQ_GPIO_TP_INT IRQ_GPIO(5) | 73 | #define CORGI_IRQ_GPIO_TP_INT PXA_GPIO_TO_IRQ(5) |
74 | #define CORGI_IRQ_GPIO_nSD_DETECT IRQ_GPIO(9) | 74 | #define CORGI_IRQ_GPIO_nSD_DETECT PXA_GPIO_TO_IRQ(9) |
75 | #define CORGI_IRQ_GPIO_nSD_INT IRQ_GPIO(10) | 75 | #define CORGI_IRQ_GPIO_nSD_INT PXA_GPIO_TO_IRQ(10) |
76 | #define CORGI_IRQ_GPIO_MAIN_BAT_LOW IRQ_GPIO(11) | 76 | #define CORGI_IRQ_GPIO_MAIN_BAT_LOW PXA_GPIO_TO_IRQ(11) |
77 | #define CORGI_IRQ_GPIO_CF_CD IRQ_GPIO(14) | 77 | #define CORGI_IRQ_GPIO_CF_CD PXA_GPIO_TO_IRQ(14) |
78 | #define CORGI_IRQ_GPIO_CHRG_FULL IRQ_GPIO(16) /* Battery fully charged */ | 78 | #define CORGI_IRQ_GPIO_CHRG_FULL PXA_GPIO_TO_IRQ(16) /* Battery fully charged */ |
79 | #define CORGI_IRQ_GPIO_CF_IRQ IRQ_GPIO(17) | 79 | #define CORGI_IRQ_GPIO_CF_IRQ PXA_GPIO_TO_IRQ(17) |
80 | #define CORGI_IRQ_GPIO_KEY_SENSE(a) IRQ_GPIO(58+(a)) /* Keyboard Sense lines */ | 80 | #define CORGI_IRQ_GPIO_KEY_SENSE(a) PXA_GPIO_TO_IRQ(58+(a)) /* Keyboard Sense lines */ |
81 | 81 | ||
82 | 82 | ||
83 | /* | 83 | /* |
diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h index 004cade7bb13..07fa3ba7a818 100644 --- a/arch/arm/mach-pxa/include/mach/gpio.h +++ b/arch/arm/mach-pxa/include/mach/gpio.h | |||
@@ -28,7 +28,7 @@ | |||
28 | /* The defines for the driver are needed for the accelerated accessors */ | 28 | /* The defines for the driver are needed for the accelerated accessors */ |
29 | #include "gpio-pxa.h" | 29 | #include "gpio-pxa.h" |
30 | 30 | ||
31 | #define gpio_to_irq(gpio) IRQ_GPIO(gpio) | 31 | #define gpio_to_irq(gpio) PXA_GPIO_TO_IRQ(gpio) |
32 | 32 | ||
33 | static inline int irq_to_gpio(unsigned int irq) | 33 | static inline int irq_to_gpio(unsigned int irq) |
34 | { | 34 | { |
diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h index 9b898680b206..dba14b6503ad 100644 --- a/arch/arm/mach-pxa/include/mach/gumstix.h +++ b/arch/arm/mach-pxa/include/mach/gumstix.h | |||
@@ -24,7 +24,7 @@ has detected a cable insertion; driven low otherwise. */ | |||
24 | #define GPIO_GUMSTIX_USB_GPIOx 41 | 24 | #define GPIO_GUMSTIX_USB_GPIOx 41 |
25 | 25 | ||
26 | /* usb state change */ | 26 | /* usb state change */ |
27 | #define GUMSTIX_USB_INTR_IRQ IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn) | 27 | #define GUMSTIX_USB_INTR_IRQ PXA_GPIO_TO_IRQ(GPIO_GUMSTIX_USB_GPIOn) |
28 | 28 | ||
29 | #define GPIO_GUMSTIX_USB_GPIOn_MD (GPIO_GUMSTIX_USB_GPIOn | GPIO_IN) | 29 | #define GPIO_GUMSTIX_USB_GPIOn_MD (GPIO_GUMSTIX_USB_GPIOn | GPIO_IN) |
30 | #define GPIO_GUMSTIX_USB_GPIOx_CON_MD (GPIO_GUMSTIX_USB_GPIOx | GPIO_OUT) | 30 | #define GPIO_GUMSTIX_USB_GPIOx_CON_MD (GPIO_GUMSTIX_USB_GPIOx | GPIO_OUT) |
@@ -35,7 +35,7 @@ has detected a cable insertion; driven low otherwise. */ | |||
35 | */ | 35 | */ |
36 | #define GUMSTIX_GPIO_nSD_WP 22 /* SD Write Protect */ | 36 | #define GUMSTIX_GPIO_nSD_WP 22 /* SD Write Protect */ |
37 | #define GUMSTIX_GPIO_nSD_DETECT 11 /* MMC/SD Card Detect */ | 37 | #define GUMSTIX_GPIO_nSD_DETECT 11 /* MMC/SD Card Detect */ |
38 | #define GUMSTIX_IRQ_GPIO_nSD_DETECT IRQ_GPIO(GUMSTIX_GPIO_nSD_DETECT) | 38 | #define GUMSTIX_IRQ_GPIO_nSD_DETECT PXA_GPIO_TO_IRQ(GUMSTIX_GPIO_nSD_DETECT) |
39 | 39 | ||
40 | /* | 40 | /* |
41 | * SMC Ethernet definitions | 41 | * SMC Ethernet definitions |
@@ -49,10 +49,10 @@ has detected a cable insertion; driven low otherwise. */ | |||
49 | 49 | ||
50 | #define GPIO_GUMSTIX_ETH0 36 | 50 | #define GPIO_GUMSTIX_ETH0 36 |
51 | #define GPIO_GUMSTIX_ETH0_MD (GPIO_GUMSTIX_ETH0 | GPIO_IN) | 51 | #define GPIO_GUMSTIX_ETH0_MD (GPIO_GUMSTIX_ETH0 | GPIO_IN) |
52 | #define GUMSTIX_ETH0_IRQ IRQ_GPIO(GPIO_GUMSTIX_ETH0) | 52 | #define GUMSTIX_ETH0_IRQ PXA_GPIO_TO_IRQ(GPIO_GUMSTIX_ETH0) |
53 | #define GPIO_GUMSTIX_ETH1 27 | 53 | #define GPIO_GUMSTIX_ETH1 27 |
54 | #define GPIO_GUMSTIX_ETH1_MD (GPIO_GUMSTIX_ETH1 | GPIO_IN) | 54 | #define GPIO_GUMSTIX_ETH1_MD (GPIO_GUMSTIX_ETH1 | GPIO_IN) |
55 | #define GUMSTIX_ETH1_IRQ IRQ_GPIO(GPIO_GUMSTIX_ETH1) | 55 | #define GUMSTIX_ETH1_IRQ PXA_GPIO_TO_IRQ(GPIO_GUMSTIX_ETH1) |
56 | 56 | ||
57 | 57 | ||
58 | /* CF reset line */ | 58 | /* CF reset line */ |
@@ -63,18 +63,18 @@ has detected a cable insertion; driven low otherwise. */ | |||
63 | #define GPIO4_nSTSCHG GPIO4_nBVD1 | 63 | #define GPIO4_nSTSCHG GPIO4_nBVD1 |
64 | #define GPIO11_nCD 11 | 64 | #define GPIO11_nCD 11 |
65 | #define GPIO26_PRDY_nBSY 26 | 65 | #define GPIO26_PRDY_nBSY 26 |
66 | #define GUMSTIX_S0_nSTSCHG_IRQ IRQ_GPIO(GPIO4_nSTSCHG) | 66 | #define GUMSTIX_S0_nSTSCHG_IRQ PXA_GPIO_TO_IRQ(GPIO4_nSTSCHG) |
67 | #define GUMSTIX_S0_nCD_IRQ IRQ_GPIO(GPIO11_nCD) | 67 | #define GUMSTIX_S0_nCD_IRQ PXA_GPIO_TO_IRQ(GPIO11_nCD) |
68 | #define GUMSTIX_S0_PRDY_nBSY_IRQ IRQ_GPIO(GPIO26_PRDY_nBSY) | 68 | #define GUMSTIX_S0_PRDY_nBSY_IRQ PXA_GPIO_TO_IRQ(GPIO26_PRDY_nBSY) |
69 | 69 | ||
70 | /* CF slot 1 */ | 70 | /* CF slot 1 */ |
71 | #define GPIO18_nBVD1 18 | 71 | #define GPIO18_nBVD1 18 |
72 | #define GPIO18_nSTSCHG GPIO18_nBVD1 | 72 | #define GPIO18_nSTSCHG GPIO18_nBVD1 |
73 | #define GPIO36_nCD 36 | 73 | #define GPIO36_nCD 36 |
74 | #define GPIO27_PRDY_nBSY 27 | 74 | #define GPIO27_PRDY_nBSY 27 |
75 | #define GUMSTIX_S1_nSTSCHG_IRQ IRQ_GPIO(GPIO18_nSTSCHG) | 75 | #define GUMSTIX_S1_nSTSCHG_IRQ PXA_GPIO_TO_IRQ(GPIO18_nSTSCHG) |
76 | #define GUMSTIX_S1_nCD_IRQ IRQ_GPIO(GPIO36_nCD) | 76 | #define GUMSTIX_S1_nCD_IRQ PXA_GPIO_TO_IRQ(GPIO36_nCD) |
77 | #define GUMSTIX_S1_PRDY_nBSY_IRQ IRQ_GPIO(GPIO27_PRDY_nBSY) | 77 | #define GUMSTIX_S1_PRDY_nBSY_IRQ PXA_GPIO_TO_IRQ(GPIO27_PRDY_nBSY) |
78 | 78 | ||
79 | /* CF GPIO line modes */ | 79 | /* CF GPIO line modes */ |
80 | #define GPIO4_nSTSCHG_MD (GPIO4_nSTSCHG | GPIO_IN) | 80 | #define GPIO4_nSTSCHG_MD (GPIO4_nSTSCHG | GPIO_IN) |
diff --git a/arch/arm/mach-pxa/include/mach/idp.h b/arch/arm/mach-pxa/include/mach/idp.h index 5eff96fcc944..a7f912f5ea2f 100644 --- a/arch/arm/mach-pxa/include/mach/idp.h +++ b/arch/arm/mach-pxa/include/mach/idp.h | |||
@@ -135,24 +135,24 @@ | |||
135 | 135 | ||
136 | /* A listing of interrupts used by external hardware devices */ | 136 | /* A listing of interrupts used by external hardware devices */ |
137 | 137 | ||
138 | #define TOUCH_PANEL_IRQ IRQ_GPIO(5) | 138 | #define TOUCH_PANEL_IRQ PXA_GPIO_TO_IRQ(5) |
139 | #define IDE_IRQ IRQ_GPIO(21) | 139 | #define IDE_IRQ PXA_GPIO_TO_IRQ(21) |
140 | 140 | ||
141 | #define TOUCH_PANEL_IRQ_EDGE IRQ_TYPE_EDGE_FALLING | 141 | #define TOUCH_PANEL_IRQ_EDGE IRQ_TYPE_EDGE_FALLING |
142 | 142 | ||
143 | #define ETHERNET_IRQ IRQ_GPIO(4) | 143 | #define ETHERNET_IRQ PXA_GPIO_TO_IRQ(4) |
144 | #define ETHERNET_IRQ_EDGE IRQ_TYPE_EDGE_RISING | 144 | #define ETHERNET_IRQ_EDGE IRQ_TYPE_EDGE_RISING |
145 | 145 | ||
146 | #define IDE_IRQ_EDGE IRQ_TYPE_EDGE_RISING | 146 | #define IDE_IRQ_EDGE IRQ_TYPE_EDGE_RISING |
147 | 147 | ||
148 | #define PCMCIA_S0_CD_VALID IRQ_GPIO(7) | 148 | #define PCMCIA_S0_CD_VALID PXA_GPIO_TO_IRQ(7) |
149 | #define PCMCIA_S0_CD_VALID_EDGE IRQ_TYPE_EDGE_BOTH | 149 | #define PCMCIA_S0_CD_VALID_EDGE IRQ_TYPE_EDGE_BOTH |
150 | 150 | ||
151 | #define PCMCIA_S1_CD_VALID IRQ_GPIO(8) | 151 | #define PCMCIA_S1_CD_VALID PXA_GPIO_TO_IRQ(8) |
152 | #define PCMCIA_S1_CD_VALID_EDGE IRQ_TYPE_EDGE_BOTH | 152 | #define PCMCIA_S1_CD_VALID_EDGE IRQ_TYPE_EDGE_BOTH |
153 | 153 | ||
154 | #define PCMCIA_S0_RDYINT IRQ_GPIO(19) | 154 | #define PCMCIA_S0_RDYINT PXA_GPIO_TO_IRQ(19) |
155 | #define PCMCIA_S1_RDYINT IRQ_GPIO(22) | 155 | #define PCMCIA_S1_RDYINT PXA_GPIO_TO_IRQ(22) |
156 | 156 | ||
157 | 157 | ||
158 | /* | 158 | /* |
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 7cc5a781e99e..1f996643b9de 100644 --- a/arch/arm/mach-pxa/include/mach/irqs.h +++ b/arch/arm/mach-pxa/include/mach/irqs.h | |||
@@ -91,7 +91,7 @@ | |||
91 | #define PXA_GPIO_IRQ_NUM (192) | 91 | #define PXA_GPIO_IRQ_NUM (192) |
92 | 92 | ||
93 | #define GPIO_2_x_TO_IRQ(x) (PXA_GPIO_IRQ_BASE + (x)) | 93 | #define GPIO_2_x_TO_IRQ(x) (PXA_GPIO_IRQ_BASE + (x)) |
94 | #define IRQ_GPIO(x) (((x) < 2) ? (IRQ_GPIO0 + (x)) : GPIO_2_x_TO_IRQ(x)) | 94 | #define PXA_GPIO_TO_IRQ(x) (((x) < 2) ? (IRQ_GPIO0 + (x)) : GPIO_2_x_TO_IRQ(x)) |
95 | 95 | ||
96 | /* | 96 | /* |
97 | * The following interrupts are for board specific purposes. Since | 97 | * The following interrupts are for board specific purposes. Since |
diff --git a/arch/arm/mach-pxa/include/mach/palmld.h b/arch/arm/mach-pxa/include/mach/palmld.h index ae536e86d8e8..2c4471336570 100644 --- a/arch/arm/mach-pxa/include/mach/palmld.h +++ b/arch/arm/mach-pxa/include/mach/palmld.h | |||
@@ -68,10 +68,10 @@ | |||
68 | /* 20, 53 and 86 are usb related too */ | 68 | /* 20, 53 and 86 are usb related too */ |
69 | 69 | ||
70 | /* INTERRUPTS */ | 70 | /* INTERRUPTS */ |
71 | #define IRQ_GPIO_PALMLD_GPIO_RESET IRQ_GPIO(GPIO_NR_PALMLD_GPIO_RESET) | 71 | #define IRQ_GPIO_PALMLD_GPIO_RESET PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_GPIO_RESET) |
72 | #define IRQ_GPIO_PALMLD_SD_DETECT_N IRQ_GPIO(GPIO_NR_PALMLD_SD_DETECT_N) | 72 | #define IRQ_GPIO_PALMLD_SD_DETECT_N PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_SD_DETECT_N) |
73 | #define IRQ_GPIO_PALMLD_WM9712_IRQ IRQ_GPIO(GPIO_NR_PALMLD_WM9712_IRQ) | 73 | #define IRQ_GPIO_PALMLD_WM9712_IRQ PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_WM9712_IRQ) |
74 | #define IRQ_GPIO_PALMLD_IDE_IRQ IRQ_GPIO(GPIO_NR_PALMLD_IDE_IRQ) | 74 | #define IRQ_GPIO_PALMLD_IDE_IRQ PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_IDE_IRQ) |
75 | 75 | ||
76 | 76 | ||
77 | /** HERE ARE INIT VALUES **/ | 77 | /** HERE ARE INIT VALUES **/ |
diff --git a/arch/arm/mach-pxa/include/mach/palmt5.h b/arch/arm/mach-pxa/include/mach/palmt5.h index 6baf7469d4ec..0bd4f036c72f 100644 --- a/arch/arm/mach-pxa/include/mach/palmt5.h +++ b/arch/arm/mach-pxa/include/mach/palmt5.h | |||
@@ -48,10 +48,10 @@ | |||
48 | #define GPIO_NR_PALMT5_BT_RESET 83 | 48 | #define GPIO_NR_PALMT5_BT_RESET 83 |
49 | 49 | ||
50 | /* INTERRUPTS */ | 50 | /* INTERRUPTS */ |
51 | #define IRQ_GPIO_PALMT5_SD_DETECT_N IRQ_GPIO(GPIO_NR_PALMT5_SD_DETECT_N) | 51 | #define IRQ_GPIO_PALMT5_SD_DETECT_N PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_SD_DETECT_N) |
52 | #define IRQ_GPIO_PALMT5_WM9712_IRQ IRQ_GPIO(GPIO_NR_PALMT5_WM9712_IRQ) | 52 | #define IRQ_GPIO_PALMT5_WM9712_IRQ PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_WM9712_IRQ) |
53 | #define IRQ_GPIO_PALMT5_USB_DETECT IRQ_GPIO(GPIO_NR_PALMT5_USB_DETECT) | 53 | #define IRQ_GPIO_PALMT5_USB_DETECT PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_USB_DETECT) |
54 | #define IRQ_GPIO_PALMT5_GPIO_RESET IRQ_GPIO(GPIO_NR_PALMT5_GPIO_RESET) | 54 | #define IRQ_GPIO_PALMT5_GPIO_RESET PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_GPIO_RESET) |
55 | 55 | ||
56 | /** HERE ARE INIT VALUES **/ | 56 | /** HERE ARE INIT VALUES **/ |
57 | 57 | ||
diff --git a/arch/arm/mach-pxa/include/mach/palmtc.h b/arch/arm/mach-pxa/include/mach/palmtc.h index 3f9dd3fd4638..c383a21680b6 100644 --- a/arch/arm/mach-pxa/include/mach/palmtc.h +++ b/arch/arm/mach-pxa/include/mach/palmtc.h | |||
@@ -52,8 +52,8 @@ | |||
52 | #define GPIO_NR_PALMTC_IR_DISABLE 45 | 52 | #define GPIO_NR_PALMTC_IR_DISABLE 45 |
53 | 53 | ||
54 | /* IRQs */ | 54 | /* IRQs */ |
55 | #define IRQ_GPIO_PALMTC_SD_DETECT_N IRQ_GPIO(GPIO_NR_PALMTC_SD_DETECT_N) | 55 | #define IRQ_GPIO_PALMTC_SD_DETECT_N PXA_GPIO_TO_IRQ(GPIO_NR_PALMTC_SD_DETECT_N) |
56 | #define IRQ_GPIO_PALMTC_WLAN_READY IRQ_GPIO(GPIO_NR_PALMTC_WLAN_READY) | 56 | #define IRQ_GPIO_PALMTC_WLAN_READY PXA_GPIO_TO_IRQ(GPIO_NR_PALMTC_WLAN_READY) |
57 | 57 | ||
58 | /* UCB1400 GPIOs */ | 58 | /* UCB1400 GPIOs */ |
59 | #define GPIO_NR_PALMTC_POWER_DETECT (0x80 | 0x00) | 59 | #define GPIO_NR_PALMTC_POWER_DETECT (0x80 | 0x00) |
diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h index 7074a6ed46c6..f2e530380253 100644 --- a/arch/arm/mach-pxa/include/mach/palmtx.h +++ b/arch/arm/mach-pxa/include/mach/palmtx.h | |||
@@ -62,10 +62,10 @@ | |||
62 | #define GPIO_NR_PALMTX_NAND_BUFFER_DIR 79 | 62 | #define GPIO_NR_PALMTX_NAND_BUFFER_DIR 79 |
63 | 63 | ||
64 | /* INTERRUPTS */ | 64 | /* INTERRUPTS */ |
65 | #define IRQ_GPIO_PALMTX_SD_DETECT_N IRQ_GPIO(GPIO_NR_PALMTX_SD_DETECT_N) | 65 | #define IRQ_GPIO_PALMTX_SD_DETECT_N PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_SD_DETECT_N) |
66 | #define IRQ_GPIO_PALMTX_WM9712_IRQ IRQ_GPIO(GPIO_NR_PALMTX_WM9712_IRQ) | 66 | #define IRQ_GPIO_PALMTX_WM9712_IRQ PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_WM9712_IRQ) |
67 | #define IRQ_GPIO_PALMTX_USB_DETECT IRQ_GPIO(GPIO_NR_PALMTX_USB_DETECT) | 67 | #define IRQ_GPIO_PALMTX_USB_DETECT PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_USB_DETECT) |
68 | #define IRQ_GPIO_PALMTX_GPIO_RESET IRQ_GPIO(GPIO_NR_PALMTX_GPIO_RESET) | 68 | #define IRQ_GPIO_PALMTX_GPIO_RESET PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_GPIO_RESET) |
69 | 69 | ||
70 | /** HERE ARE INIT VALUES **/ | 70 | /** HERE ARE INIT VALUES **/ |
71 | 71 | ||
diff --git a/arch/arm/mach-pxa/include/mach/pcm027.h b/arch/arm/mach-pxa/include/mach/pcm027.h index 4bac588478a8..6bf28de228bd 100644 --- a/arch/arm/mach-pxa/include/mach/pcm027.h +++ b/arch/arm/mach-pxa/include/mach/pcm027.h | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | /* I2C RTC */ | 35 | /* I2C RTC */ |
36 | #define PCM027_RTC_IRQ_GPIO 0 | 36 | #define PCM027_RTC_IRQ_GPIO 0 |
37 | #define PCM027_RTC_IRQ IRQ_GPIO(PCM027_RTC_IRQ_GPIO) | 37 | #define PCM027_RTC_IRQ PXA_GPIO_TO_IRQ(PCM027_RTC_IRQ_GPIO) |
38 | #define PCM027_RTC_IRQ_EDGE IRQ_TYPE_EDGE_FALLING | 38 | #define PCM027_RTC_IRQ_EDGE IRQ_TYPE_EDGE_FALLING |
39 | #define ADR_PCM027_RTC 0x51 /* I2C address */ | 39 | #define ADR_PCM027_RTC 0x51 /* I2C address */ |
40 | 40 | ||
@@ -43,21 +43,21 @@ | |||
43 | 43 | ||
44 | /* Ethernet chip (SMSC91C111) */ | 44 | /* Ethernet chip (SMSC91C111) */ |
45 | #define PCM027_ETH_IRQ_GPIO 52 | 45 | #define PCM027_ETH_IRQ_GPIO 52 |
46 | #define PCM027_ETH_IRQ IRQ_GPIO(PCM027_ETH_IRQ_GPIO) | 46 | #define PCM027_ETH_IRQ PXA_GPIO_TO_IRQ(PCM027_ETH_IRQ_GPIO) |
47 | #define PCM027_ETH_IRQ_EDGE IRQ_TYPE_EDGE_RISING | 47 | #define PCM027_ETH_IRQ_EDGE IRQ_TYPE_EDGE_RISING |
48 | #define PCM027_ETH_PHYS PXA_CS5_PHYS | 48 | #define PCM027_ETH_PHYS PXA_CS5_PHYS |
49 | #define PCM027_ETH_SIZE (1*1024*1024) | 49 | #define PCM027_ETH_SIZE (1*1024*1024) |
50 | 50 | ||
51 | /* CAN controller SJA1000 (unsupported yet) */ | 51 | /* CAN controller SJA1000 (unsupported yet) */ |
52 | #define PCM027_CAN_IRQ_GPIO 114 | 52 | #define PCM027_CAN_IRQ_GPIO 114 |
53 | #define PCM027_CAN_IRQ IRQ_GPIO(PCM027_CAN_IRQ_GPIO) | 53 | #define PCM027_CAN_IRQ PXA_GPIO_TO_IRQ(PCM027_CAN_IRQ_GPIO) |
54 | #define PCM027_CAN_IRQ_EDGE IRQ_TYPE_EDGE_FALLING | 54 | #define PCM027_CAN_IRQ_EDGE IRQ_TYPE_EDGE_FALLING |
55 | #define PCM027_CAN_PHYS 0x22000000 | 55 | #define PCM027_CAN_PHYS 0x22000000 |
56 | #define PCM027_CAN_SIZE 0x100 | 56 | #define PCM027_CAN_SIZE 0x100 |
57 | 57 | ||
58 | /* SPI GPIO expander (unsupported yet) */ | 58 | /* SPI GPIO expander (unsupported yet) */ |
59 | #define PCM027_EGPIO_IRQ_GPIO 27 | 59 | #define PCM027_EGPIO_IRQ_GPIO 27 |
60 | #define PCM027_EGPIO_IRQ IRQ_GPIO(PCM027_EGPIO_IRQ_GPIO) | 60 | #define PCM027_EGPIO_IRQ PXA_GPIO_TO_IRQ(PCM027_EGPIO_IRQ_GPIO) |
61 | #define PCM027_EGPIO_IRQ_EDGE IRQ_TYPE_EDGE_FALLING | 61 | #define PCM027_EGPIO_IRQ_EDGE IRQ_TYPE_EDGE_FALLING |
62 | #define PCM027_EGPIO_CS 24 | 62 | #define PCM027_EGPIO_CS 24 |
63 | /* | 63 | /* |
diff --git a/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h index 8a4383b776d7..d72791695b26 100644 --- a/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h +++ b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h | |||
@@ -28,14 +28,14 @@ | |||
28 | 28 | ||
29 | /* CPLD's interrupt controller is connected to PCM-027 GPIO 9 */ | 29 | /* CPLD's interrupt controller is connected to PCM-027 GPIO 9 */ |
30 | #define PCM990_CTRL_INT_IRQ_GPIO 9 | 30 | #define PCM990_CTRL_INT_IRQ_GPIO 9 |
31 | #define PCM990_CTRL_INT_IRQ IRQ_GPIO(PCM990_CTRL_INT_IRQ_GPIO) | 31 | #define PCM990_CTRL_INT_IRQ PXA_GPIO_TO_IRQ(PCM990_CTRL_INT_IRQ_GPIO) |
32 | #define PCM990_CTRL_INT_IRQ_EDGE IRQ_TYPE_EDGE_RISING | 32 | #define PCM990_CTRL_INT_IRQ_EDGE IRQ_TYPE_EDGE_RISING |
33 | #define PCM990_CTRL_PHYS PXA_CS1_PHYS /* 16-Bit */ | 33 | #define PCM990_CTRL_PHYS PXA_CS1_PHYS /* 16-Bit */ |
34 | #define PCM990_CTRL_BASE 0xea000000 | 34 | #define PCM990_CTRL_BASE 0xea000000 |
35 | #define PCM990_CTRL_SIZE (1*1024*1024) | 35 | #define PCM990_CTRL_SIZE (1*1024*1024) |
36 | 36 | ||
37 | #define PCM990_CTRL_PWR_IRQ_GPIO 14 | 37 | #define PCM990_CTRL_PWR_IRQ_GPIO 14 |
38 | #define PCM990_CTRL_PWR_IRQ IRQ_GPIO(PCM990_CTRL_PWR_IRQ_GPIO) | 38 | #define PCM990_CTRL_PWR_IRQ PXA_GPIO_TO_IRQ(PCM990_CTRL_PWR_IRQ_GPIO) |
39 | #define PCM990_CTRL_PWR_IRQ_EDGE IRQ_TYPE_EDGE_RISING | 39 | #define PCM990_CTRL_PWR_IRQ_EDGE IRQ_TYPE_EDGE_RISING |
40 | 40 | ||
41 | /* visible CPLD (U7) registers */ | 41 | /* visible CPLD (U7) registers */ |
@@ -132,7 +132,7 @@ | |||
132 | * IDE | 132 | * IDE |
133 | */ | 133 | */ |
134 | #define PCM990_IDE_IRQ_GPIO 13 | 134 | #define PCM990_IDE_IRQ_GPIO 13 |
135 | #define PCM990_IDE_IRQ IRQ_GPIO(PCM990_IDE_IRQ_GPIO) | 135 | #define PCM990_IDE_IRQ PXA_GPIO_TO_IRQ(PCM990_IDE_IRQ_GPIO) |
136 | #define PCM990_IDE_IRQ_EDGE IRQ_TYPE_EDGE_RISING | 136 | #define PCM990_IDE_IRQ_EDGE IRQ_TYPE_EDGE_RISING |
137 | #define PCM990_IDE_PLD_PHYS 0x20000000 /* 16 bit wide */ | 137 | #define PCM990_IDE_PLD_PHYS 0x20000000 /* 16 bit wide */ |
138 | #define PCM990_IDE_PLD_BASE 0xee000000 | 138 | #define PCM990_IDE_PLD_BASE 0xee000000 |
@@ -188,11 +188,11 @@ | |||
188 | * Compact Flash | 188 | * Compact Flash |
189 | */ | 189 | */ |
190 | #define PCM990_CF_IRQ_GPIO 11 | 190 | #define PCM990_CF_IRQ_GPIO 11 |
191 | #define PCM990_CF_IRQ IRQ_GPIO(PCM990_CF_IRQ_GPIO) | 191 | #define PCM990_CF_IRQ PXA_GPIO_TO_IRQ(PCM990_CF_IRQ_GPIO) |
192 | #define PCM990_CF_IRQ_EDGE IRQ_TYPE_EDGE_RISING | 192 | #define PCM990_CF_IRQ_EDGE IRQ_TYPE_EDGE_RISING |
193 | 193 | ||
194 | #define PCM990_CF_CD_GPIO 12 | 194 | #define PCM990_CF_CD_GPIO 12 |
195 | #define PCM990_CF_CD IRQ_GPIO(PCM990_CF_CD_GPIO) | 195 | #define PCM990_CF_CD PXA_GPIO_TO_IRQ(PCM990_CF_CD_GPIO) |
196 | #define PCM990_CF_CD_EDGE IRQ_TYPE_EDGE_RISING | 196 | #define PCM990_CF_CD_EDGE IRQ_TYPE_EDGE_RISING |
197 | 197 | ||
198 | #define PCM990_CF_PLD_PHYS 0x30000000 /* 16 bit wide */ | 198 | #define PCM990_CF_PLD_PHYS 0x30000000 /* 16 bit wide */ |
@@ -258,14 +258,14 @@ | |||
258 | * Wolfson AC97 Touch | 258 | * Wolfson AC97 Touch |
259 | */ | 259 | */ |
260 | #define PCM990_AC97_IRQ_GPIO 10 | 260 | #define PCM990_AC97_IRQ_GPIO 10 |
261 | #define PCM990_AC97_IRQ IRQ_GPIO(PCM990_AC97_IRQ_GPIO) | 261 | #define PCM990_AC97_IRQ PXA_GPIO_TO_IRQ(PCM990_AC97_IRQ_GPIO) |
262 | #define PCM990_AC97_IRQ_EDGE IRQ_TYPE_EDGE_RISING | 262 | #define PCM990_AC97_IRQ_EDGE IRQ_TYPE_EDGE_RISING |
263 | 263 | ||
264 | /* | 264 | /* |
265 | * MMC phyCORE | 265 | * MMC phyCORE |
266 | */ | 266 | */ |
267 | #define PCM990_MMC0_IRQ_GPIO 9 | 267 | #define PCM990_MMC0_IRQ_GPIO 9 |
268 | #define PCM990_MMC0_IRQ IRQ_GPIO(PCM990_MMC0_IRQ_GPIO) | 268 | #define PCM990_MMC0_IRQ PXA_GPIO_TO_IRQ(PCM990_MMC0_IRQ_GPIO) |
269 | #define PCM990_MMC0_IRQ_EDGE IRQ_TYPE_EDGE_FALLING | 269 | #define PCM990_MMC0_IRQ_EDGE IRQ_TYPE_EDGE_FALLING |
270 | 270 | ||
271 | /* | 271 | /* |
diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h index 83d1cfd00fc9..763fdc4f2b4b 100644 --- a/arch/arm/mach-pxa/include/mach/poodle.h +++ b/arch/arm/mach-pxa/include/mach/poodle.h | |||
@@ -47,18 +47,18 @@ | |||
47 | #define POODLE_GPIO_DISCHARGE_ON (42) /* Enable battery discharge */ | 47 | #define POODLE_GPIO_DISCHARGE_ON (42) /* Enable battery discharge */ |
48 | 48 | ||
49 | /* PXA GPIOs */ | 49 | /* PXA GPIOs */ |
50 | #define POODLE_IRQ_GPIO_ON_KEY IRQ_GPIO(0) | 50 | #define POODLE_IRQ_GPIO_ON_KEY PXA_GPIO_TO_IRQ(0) |
51 | #define POODLE_IRQ_GPIO_AC_IN IRQ_GPIO(1) | 51 | #define POODLE_IRQ_GPIO_AC_IN PXA_GPIO_TO_IRQ(1) |
52 | #define POODLE_IRQ_GPIO_HP_IN IRQ_GPIO(4) | 52 | #define POODLE_IRQ_GPIO_HP_IN PXA_GPIO_TO_IRQ(4) |
53 | #define POODLE_IRQ_GPIO_CO IRQ_GPIO(16) | 53 | #define POODLE_IRQ_GPIO_CO PXA_GPIO_TO_IRQ(16) |
54 | #define POODLE_IRQ_GPIO_TP_INT IRQ_GPIO(5) | 54 | #define POODLE_IRQ_GPIO_TP_INT PXA_GPIO_TO_IRQ(5) |
55 | #define POODLE_IRQ_GPIO_WAKEUP IRQ_GPIO(11) | 55 | #define POODLE_IRQ_GPIO_WAKEUP PXA_GPIO_TO_IRQ(11) |
56 | #define POODLE_IRQ_GPIO_GA_INT IRQ_GPIO(10) | 56 | #define POODLE_IRQ_GPIO_GA_INT PXA_GPIO_TO_IRQ(10) |
57 | #define POODLE_IRQ_GPIO_CF_IRQ IRQ_GPIO(17) | 57 | #define POODLE_IRQ_GPIO_CF_IRQ PXA_GPIO_TO_IRQ(17) |
58 | #define POODLE_IRQ_GPIO_CF_CD IRQ_GPIO(14) | 58 | #define POODLE_IRQ_GPIO_CF_CD PXA_GPIO_TO_IRQ(14) |
59 | #define POODLE_IRQ_GPIO_nSD_INT IRQ_GPIO(8) | 59 | #define POODLE_IRQ_GPIO_nSD_INT PXA_GPIO_TO_IRQ(8) |
60 | #define POODLE_IRQ_GPIO_nSD_DETECT IRQ_GPIO(9) | 60 | #define POODLE_IRQ_GPIO_nSD_DETECT PXA_GPIO_TO_IRQ(9) |
61 | #define POODLE_IRQ_GPIO_MAIN_BAT_LOW IRQ_GPIO(13) | 61 | #define POODLE_IRQ_GPIO_MAIN_BAT_LOW PXA_GPIO_TO_IRQ(13) |
62 | 62 | ||
63 | /* SCOOP GPIOs */ | 63 | /* SCOOP GPIOs */ |
64 | #define POODLE_SCOOP_CHARGE_ON SCOOP_GPCR_PA11 | 64 | #define POODLE_SCOOP_CHARGE_ON SCOOP_GPCR_PA11 |
diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h index 685749a51c42..273381a5c497 100644 --- a/arch/arm/mach-pxa/include/mach/spitz.h +++ b/arch/arm/mach-pxa/include/mach/spitz.h | |||
@@ -164,23 +164,23 @@ | |||
164 | 164 | ||
165 | /* Spitz IRQ Definitions */ | 165 | /* Spitz IRQ Definitions */ |
166 | 166 | ||
167 | #define SPITZ_IRQ_GPIO_KEY_INT IRQ_GPIO(SPITZ_GPIO_KEY_INT) | 167 | #define SPITZ_IRQ_GPIO_KEY_INT PXA_GPIO_TO_IRQ(SPITZ_GPIO_KEY_INT) |
168 | #define SPITZ_IRQ_GPIO_AC_IN IRQ_GPIO(SPITZ_GPIO_AC_IN) | 168 | #define SPITZ_IRQ_GPIO_AC_IN PXA_GPIO_TO_IRQ(SPITZ_GPIO_AC_IN) |
169 | #define SPITZ_IRQ_GPIO_AK_INT IRQ_GPIO(SPITZ_GPIO_AK_INT) | 169 | #define SPITZ_IRQ_GPIO_AK_INT PXA_GPIO_TO_IRQ(SPITZ_GPIO_AK_INT) |
170 | #define SPITZ_IRQ_GPIO_HP_IN IRQ_GPIO(SPITZ_GPIO_HP_IN) | 170 | #define SPITZ_IRQ_GPIO_HP_IN PXA_GPIO_TO_IRQ(SPITZ_GPIO_HP_IN) |
171 | #define SPITZ_IRQ_GPIO_TP_INT IRQ_GPIO(SPITZ_GPIO_TP_INT) | 171 | #define SPITZ_IRQ_GPIO_TP_INT PXA_GPIO_TO_IRQ(SPITZ_GPIO_TP_INT) |
172 | #define SPITZ_IRQ_GPIO_SYNC IRQ_GPIO(SPITZ_GPIO_SYNC) | 172 | #define SPITZ_IRQ_GPIO_SYNC PXA_GPIO_TO_IRQ(SPITZ_GPIO_SYNC) |
173 | #define SPITZ_IRQ_GPIO_ON_KEY IRQ_GPIO(SPITZ_GPIO_ON_KEY) | 173 | #define SPITZ_IRQ_GPIO_ON_KEY PXA_GPIO_TO_IRQ(SPITZ_GPIO_ON_KEY) |
174 | #define SPITZ_IRQ_GPIO_SWA IRQ_GPIO(SPITZ_GPIO_SWA) | 174 | #define SPITZ_IRQ_GPIO_SWA PXA_GPIO_TO_IRQ(SPITZ_GPIO_SWA) |
175 | #define SPITZ_IRQ_GPIO_SWB IRQ_GPIO(SPITZ_GPIO_SWB) | 175 | #define SPITZ_IRQ_GPIO_SWB PXA_GPIO_TO_IRQ(SPITZ_GPIO_SWB) |
176 | #define SPITZ_IRQ_GPIO_BAT_COVER IRQ_GPIO(SPITZ_GPIO_BAT_COVER) | 176 | #define SPITZ_IRQ_GPIO_BAT_COVER PXA_GPIO_TO_IRQ(SPITZ_GPIO_BAT_COVER) |
177 | #define SPITZ_IRQ_GPIO_FATAL_BAT IRQ_GPIO(SPITZ_GPIO_FATAL_BAT) | 177 | #define SPITZ_IRQ_GPIO_FATAL_BAT PXA_GPIO_TO_IRQ(SPITZ_GPIO_FATAL_BAT) |
178 | #define SPITZ_IRQ_GPIO_CO IRQ_GPIO(SPITZ_GPIO_CO) | 178 | #define SPITZ_IRQ_GPIO_CO PXA_GPIO_TO_IRQ(SPITZ_GPIO_CO) |
179 | #define SPITZ_IRQ_GPIO_CF_IRQ IRQ_GPIO(SPITZ_GPIO_CF_IRQ) | 179 | #define SPITZ_IRQ_GPIO_CF_IRQ PXA_GPIO_TO_IRQ(SPITZ_GPIO_CF_IRQ) |
180 | #define SPITZ_IRQ_GPIO_CF_CD IRQ_GPIO(SPITZ_GPIO_CF_CD) | 180 | #define SPITZ_IRQ_GPIO_CF_CD PXA_GPIO_TO_IRQ(SPITZ_GPIO_CF_CD) |
181 | #define SPITZ_IRQ_GPIO_CF2_IRQ IRQ_GPIO(SPITZ_GPIO_CF2_IRQ) | 181 | #define SPITZ_IRQ_GPIO_CF2_IRQ PXA_GPIO_TO_IRQ(SPITZ_GPIO_CF2_IRQ) |
182 | #define SPITZ_IRQ_GPIO_nSD_INT IRQ_GPIO(SPITZ_GPIO_nSD_INT) | 182 | #define SPITZ_IRQ_GPIO_nSD_INT PXA_GPIO_TO_IRQ(SPITZ_GPIO_nSD_INT) |
183 | #define SPITZ_IRQ_GPIO_nSD_DETECT IRQ_GPIO(SPITZ_GPIO_nSD_DETECT) | 183 | #define SPITZ_IRQ_GPIO_nSD_DETECT PXA_GPIO_TO_IRQ(SPITZ_GPIO_nSD_DETECT) |
184 | 184 | ||
185 | /* | 185 | /* |
186 | * Shared data structures | 186 | * Shared data structures |
diff --git a/arch/arm/mach-pxa/include/mach/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h index 1272c4b56ceb..4653539a2acc 100644 --- a/arch/arm/mach-pxa/include/mach/tosa.h +++ b/arch/arm/mach-pxa/include/mach/tosa.h | |||
@@ -141,30 +141,30 @@ | |||
141 | /* | 141 | /* |
142 | * Interrupts | 142 | * Interrupts |
143 | */ | 143 | */ |
144 | #define TOSA_IRQ_GPIO_WAKEUP IRQ_GPIO(TOSA_GPIO_WAKEUP) | 144 | #define TOSA_IRQ_GPIO_WAKEUP PXA_GPIO_TO_IRQ(TOSA_GPIO_WAKEUP) |
145 | #define TOSA_IRQ_GPIO_AC_IN IRQ_GPIO(TOSA_GPIO_AC_IN) | 145 | #define TOSA_IRQ_GPIO_AC_IN PXA_GPIO_TO_IRQ(TOSA_GPIO_AC_IN) |
146 | #define TOSA_IRQ_GPIO_RECORD_BTN IRQ_GPIO(TOSA_GPIO_RECORD_BTN) | 146 | #define TOSA_IRQ_GPIO_RECORD_BTN PXA_GPIO_TO_IRQ(TOSA_GPIO_RECORD_BTN) |
147 | #define TOSA_IRQ_GPIO_SYNC IRQ_GPIO(TOSA_GPIO_SYNC) | 147 | #define TOSA_IRQ_GPIO_SYNC PXA_GPIO_TO_IRQ(TOSA_GPIO_SYNC) |
148 | #define TOSA_IRQ_GPIO_USB_IN IRQ_GPIO(TOSA_GPIO_USB_IN) | 148 | #define TOSA_IRQ_GPIO_USB_IN PXA_GPIO_TO_IRQ(TOSA_GPIO_USB_IN) |
149 | #define TOSA_IRQ_GPIO_JACKET_DETECT IRQ_GPIO(TOSA_GPIO_JACKET_DETECT) | 149 | #define TOSA_IRQ_GPIO_JACKET_DETECT PXA_GPIO_TO_IRQ(TOSA_GPIO_JACKET_DETECT) |
150 | #define TOSA_IRQ_GPIO_nSD_INT IRQ_GPIO(TOSA_GPIO_nSD_INT) | 150 | #define TOSA_IRQ_GPIO_nSD_INT PXA_GPIO_TO_IRQ(TOSA_GPIO_nSD_INT) |
151 | #define TOSA_IRQ_GPIO_nSD_DETECT IRQ_GPIO(TOSA_GPIO_nSD_DETECT) | 151 | #define TOSA_IRQ_GPIO_nSD_DETECT PXA_GPIO_TO_IRQ(TOSA_GPIO_nSD_DETECT) |
152 | #define TOSA_IRQ_GPIO_BAT1_CRG IRQ_GPIO(TOSA_GPIO_BAT1_CRG) | 152 | #define TOSA_IRQ_GPIO_BAT1_CRG PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT1_CRG) |
153 | #define TOSA_IRQ_GPIO_CF_CD IRQ_GPIO(TOSA_GPIO_CF_CD) | 153 | #define TOSA_IRQ_GPIO_CF_CD PXA_GPIO_TO_IRQ(TOSA_GPIO_CF_CD) |
154 | #define TOSA_IRQ_GPIO_BAT0_CRG IRQ_GPIO(TOSA_GPIO_BAT0_CRG) | 154 | #define TOSA_IRQ_GPIO_BAT0_CRG PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT0_CRG) |
155 | #define TOSA_IRQ_GPIO_TC6393XB_INT IRQ_GPIO(TOSA_GPIO_TC6393XB_INT) | 155 | #define TOSA_IRQ_GPIO_TC6393XB_INT PXA_GPIO_TO_IRQ(TOSA_GPIO_TC6393XB_INT) |
156 | #define TOSA_IRQ_GPIO_BAT0_LOW IRQ_GPIO(TOSA_GPIO_BAT0_LOW) | 156 | #define TOSA_IRQ_GPIO_BAT0_LOW PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT0_LOW) |
157 | #define TOSA_IRQ_GPIO_EAR_IN IRQ_GPIO(TOSA_GPIO_EAR_IN) | 157 | #define TOSA_IRQ_GPIO_EAR_IN PXA_GPIO_TO_IRQ(TOSA_GPIO_EAR_IN) |
158 | #define TOSA_IRQ_GPIO_CF_IRQ IRQ_GPIO(TOSA_GPIO_CF_IRQ) | 158 | #define TOSA_IRQ_GPIO_CF_IRQ PXA_GPIO_TO_IRQ(TOSA_GPIO_CF_IRQ) |
159 | #define TOSA_IRQ_GPIO_ON_KEY IRQ_GPIO(TOSA_GPIO_ON_KEY) | 159 | #define TOSA_IRQ_GPIO_ON_KEY PXA_GPIO_TO_IRQ(TOSA_GPIO_ON_KEY) |
160 | #define TOSA_IRQ_GPIO_VGA_LINE IRQ_GPIO(TOSA_GPIO_VGA_LINE) | 160 | #define TOSA_IRQ_GPIO_VGA_LINE PXA_GPIO_TO_IRQ(TOSA_GPIO_VGA_LINE) |
161 | #define TOSA_IRQ_GPIO_TP_INT IRQ_GPIO(TOSA_GPIO_TP_INT) | 161 | #define TOSA_IRQ_GPIO_TP_INT PXA_GPIO_TO_IRQ(TOSA_GPIO_TP_INT) |
162 | #define TOSA_IRQ_GPIO_JC_CF_IRQ IRQ_GPIO(TOSA_GPIO_JC_CF_IRQ) | 162 | #define TOSA_IRQ_GPIO_JC_CF_IRQ PXA_GPIO_TO_IRQ(TOSA_GPIO_JC_CF_IRQ) |
163 | #define TOSA_IRQ_GPIO_BAT_LOCKED IRQ_GPIO(TOSA_GPIO_BAT_LOCKED) | 163 | #define TOSA_IRQ_GPIO_BAT_LOCKED PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT_LOCKED) |
164 | #define TOSA_IRQ_GPIO_BAT1_LOW IRQ_GPIO(TOSA_GPIO_BAT1_LOW) | 164 | #define TOSA_IRQ_GPIO_BAT1_LOW PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT1_LOW) |
165 | #define TOSA_IRQ_GPIO_KEY_SENSE(a) IRQ_GPIO(69+(a)) | 165 | #define TOSA_IRQ_GPIO_KEY_SENSE(a) PXA_GPIO_TO_IRQ(69+(a)) |
166 | 166 | ||
167 | #define TOSA_IRQ_GPIO_MAIN_BAT_LOW IRQ_GPIO(TOSA_GPIO_MAIN_BAT_LOW) | 167 | #define TOSA_IRQ_GPIO_MAIN_BAT_LOW PXA_GPIO_TO_IRQ(TOSA_GPIO_MAIN_BAT_LOW) |
168 | 168 | ||
169 | #define TOSA_KEY_SYNC KEY_102ND /* ??? */ | 169 | #define TOSA_KEY_SYNC KEY_102ND /* ??? */ |
170 | 170 | ||
diff --git a/arch/arm/mach-pxa/include/mach/trizeps4.h b/arch/arm/mach-pxa/include/mach/trizeps4.h index 903e1a2e6641..d2ca01053f69 100644 --- a/arch/arm/mach-pxa/include/mach/trizeps4.h +++ b/arch/arm/mach-pxa/include/mach/trizeps4.h | |||
@@ -43,30 +43,30 @@ | |||
43 | 43 | ||
44 | /* Ethernet Controller Davicom DM9000 */ | 44 | /* Ethernet Controller Davicom DM9000 */ |
45 | #define GPIO_DM9000 101 | 45 | #define GPIO_DM9000 101 |
46 | #define TRIZEPS4_ETH_IRQ IRQ_GPIO(GPIO_DM9000) | 46 | #define TRIZEPS4_ETH_IRQ PXA_GPIO_TO_IRQ(GPIO_DM9000) |
47 | 47 | ||
48 | /* UCB1400 audio / TS-controller */ | 48 | /* UCB1400 audio / TS-controller */ |
49 | #define GPIO_UCB1400 1 | 49 | #define GPIO_UCB1400 1 |
50 | #define TRIZEPS4_UCB1400_IRQ IRQ_GPIO(GPIO_UCB1400) | 50 | #define TRIZEPS4_UCB1400_IRQ PXA_GPIO_TO_IRQ(GPIO_UCB1400) |
51 | 51 | ||
52 | /* PCMCIA socket Compact Flash */ | 52 | /* PCMCIA socket Compact Flash */ |
53 | #define GPIO_PCD 11 /* PCMCIA Card Detect */ | 53 | #define GPIO_PCD 11 /* PCMCIA Card Detect */ |
54 | #define TRIZEPS4_CD_IRQ IRQ_GPIO(GPIO_PCD) | 54 | #define TRIZEPS4_CD_IRQ PXA_GPIO_TO_IRQ(GPIO_PCD) |
55 | #define GPIO_PRDY 13 /* READY / nINT */ | 55 | #define GPIO_PRDY 13 /* READY / nINT */ |
56 | #define TRIZEPS4_READY_NINT IRQ_GPIO(GPIO_PRDY) | 56 | #define TRIZEPS4_READY_NINT PXA_GPIO_TO_IRQ(GPIO_PRDY) |
57 | 57 | ||
58 | /* MMC socket */ | 58 | /* MMC socket */ |
59 | #define GPIO_MMC_DET 12 | 59 | #define GPIO_MMC_DET 12 |
60 | #define TRIZEPS4_MMC_IRQ IRQ_GPIO(GPIO_MMC_DET) | 60 | #define TRIZEPS4_MMC_IRQ PXA_GPIO_TO_IRQ(GPIO_MMC_DET) |
61 | 61 | ||
62 | /* DOC NAND chip */ | 62 | /* DOC NAND chip */ |
63 | #define GPIO_DOC_LOCK 94 | 63 | #define GPIO_DOC_LOCK 94 |
64 | #define GPIO_DOC_IRQ 93 | 64 | #define GPIO_DOC_IRQ 93 |
65 | #define TRIZEPS4_DOC_IRQ IRQ_GPIO(GPIO_DOC_IRQ) | 65 | #define TRIZEPS4_DOC_IRQ PXA_GPIO_TO_IRQ(GPIO_DOC_IRQ) |
66 | 66 | ||
67 | /* SPI interface */ | 67 | /* SPI interface */ |
68 | #define GPIO_SPI 53 | 68 | #define GPIO_SPI 53 |
69 | #define TRIZEPS4_SPI_IRQ IRQ_GPIO(GPIO_SPI) | 69 | #define TRIZEPS4_SPI_IRQ PXA_GPIO_TO_IRQ(GPIO_SPI) |
70 | 70 | ||
71 | /* LEDS using tx2 / rx2 */ | 71 | /* LEDS using tx2 / rx2 */ |
72 | #define GPIO_SYS_BUSY_LED 46 | 72 | #define GPIO_SYS_BUSY_LED 46 |
@@ -74,7 +74,7 @@ | |||
74 | 74 | ||
75 | /* Off-module PIC on ConXS board */ | 75 | /* Off-module PIC on ConXS board */ |
76 | #define GPIO_PIC 0 | 76 | #define GPIO_PIC 0 |
77 | #define TRIZEPS4_PIC_IRQ IRQ_GPIO(GPIO_PIC) | 77 | #define TRIZEPS4_PIC_IRQ PXA_GPIO_TO_IRQ(GPIO_PIC) |
78 | 78 | ||
79 | #ifdef CONFIG_MACH_TRIZEPS_CONXS | 79 | #ifdef CONFIG_MACH_TRIZEPS_CONXS |
80 | /* for CONXS base board define these registers */ | 80 | /* for CONXS base board define these registers */ |