1 files changed, 0 insertions, 117 deletions
diff --git a/include/asm-arm/arch-pxa/magician.h b/include/asm-arm/arch-pxa/magician.h
deleted file mode 100644
index 169b374f9921..000000000000
--- a/include/asm-arm/arch-pxa/magician.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * GPIO and IRQ definitions for HTC Magician PDA phones
- *
- * Copyright (c) 2007 Philipp Zabel
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-#ifndef _MAGICIAN_H_
-#define _MAGICIAN_H_
-#include <asm/arch/irqs.h>
-/*
- * PXA GPIOs
- */
-#define GPIO0_MAGICIAN_KEY_POWER                0
-#define GPIO9_MAGICIAN_UNKNOWN                  9
-#define GPIO10_MAGICIAN_GSM_IRQ                 10
-#define GPIO11_MAGICIAN_GSM_OUT1                11
-#define GPIO13_MAGICIAN_CPLD_IRQ                13
-#define GPIO18_MAGICIAN_UNKNOWN                 18
-#define GPIO22_MAGICIAN_VIBRA_EN                22
-#define GPIO26_MAGICIAN_GSM_POWER               26
-#define GPIO27_MAGICIAN_USBC_PUEN               27
-#define GPIO30_MAGICIAN_nCHARGE_EN              30
-#define GPIO37_MAGICIAN_KEY_HANGUP              37
-#define GPIO38_MAGICIAN_KEY_CONTACTS            38
-#define GPIO40_MAGICIAN_GSM_OUT2                40
-#define GPIO48_MAGICIAN_UNKNOWN                 48
-#define GPIO56_MAGICIAN_UNKNOWN                 56
-#define GPIO57_MAGICIAN_CAM_RESET               57
-#define GPIO75_MAGICIAN_SAMSUNG_POWER           75
-#define GPIO83_MAGICIAN_nIR_EN                  83
-#define GPIO86_MAGICIAN_GSM_RESET               86
-#define GPIO87_MAGICIAN_GSM_SELECT              87
-#define GPIO90_MAGICIAN_KEY_CALENDAR            90
-#define GPIO91_MAGICIAN_KEY_CAMERA              91
-#define GPIO93_MAGICIAN_KEY_UP                  93
-#define GPIO94_MAGICIAN_KEY_DOWN                94
-#define GPIO95_MAGICIAN_KEY_LEFT                95
-#define GPIO96_MAGICIAN_KEY_RIGHT               96
-#define GPIO97_MAGICIAN_KEY_ENTER               97
-#define GPIO98_MAGICIAN_KEY_RECORD              98
-#define GPIO99_MAGICIAN_HEADPHONE_IN            99
-#define GPIO100_MAGICIAN_KEY_VOL_UP             100
-#define GPIO101_MAGICIAN_KEY_VOL_DOWN           101
-#define GPIO102_MAGICIAN_KEY_PHONE              102
-#define GPIO103_MAGICIAN_LED_KP                 103
-#define GPIO104_MAGICIAN_LCD_POWER_1            104
-#define GPIO105_MAGICIAN_LCD_POWER_2            105
-#define GPIO106_MAGICIAN_LCD_POWER_3            106
-#define GPIO107_MAGICIAN_DS1WM_IRQ              107
-#define GPIO108_MAGICIAN_GSM_READY              108
-#define GPIO114_MAGICIAN_UNKNOWN                114
-#define GPIO115_MAGICIAN_nPEN_IRQ               115
-#define GPIO116_MAGICIAN_nCAM_EN                116
-#define GPIO119_MAGICIAN_UNKNOWN                119
-#define GPIO120_MAGICIAN_UNKNOWN                120
-/*
- * CPLD IRQs
- */
-#define IRQ_MAGICIAN_SD         (IRQ_BOARD_START + 0)
-#define IRQ_MAGICIAN_EP         (IRQ_BOARD_START + 1)
-#define IRQ_MAGICIAN_BT         (IRQ_BOARD_START + 2)
-#define IRQ_MAGICIAN_AC         (IRQ_BOARD_START + 3)
-/*
- * CPLD EGPIOs
- */
-#define MAGICIAN_EGPIO_BASE                     0x80 /* GPIO_BOARD_START */
-#define MAGICIAN_EGPIO(reg,bit) \
-        (MAGICIAN_EGPIO_BASE + 8*reg + bit)
-/* output */
-#define EGPIO_MAGICIAN_TOPPOLY_POWER            MAGICIAN_EGPIO(0, 2)
-#define EGPIO_MAGICIAN_LED_POWER                MAGICIAN_EGPIO(0, 5)
-#define EGPIO_MAGICIAN_GSM_RESET                MAGICIAN_EGPIO(0, 6)
-#define EGPIO_MAGICIAN_LCD_POWER                MAGICIAN_EGPIO(0, 7)
-#define EGPIO_MAGICIAN_SPK_POWER                MAGICIAN_EGPIO(1, 0)
-#define EGPIO_MAGICIAN_EP_POWER                 MAGICIAN_EGPIO(1, 1)
-#define EGPIO_MAGICIAN_IN_SEL0                  MAGICIAN_EGPIO(1, 2)
-#define EGPIO_MAGICIAN_IN_SEL1                  MAGICIAN_EGPIO(1, 3)
-#define EGPIO_MAGICIAN_MIC_POWER                MAGICIAN_EGPIO(1, 4)
-#define EGPIO_MAGICIAN_CODEC_RESET              MAGICIAN_EGPIO(1, 5)
-#define EGPIO_MAGICIAN_CODEC_POWER              MAGICIAN_EGPIO(1, 6)
-#define EGPIO_MAGICIAN_BL_POWER                 MAGICIAN_EGPIO(1, 7)
-#define EGPIO_MAGICIAN_SD_POWER                 MAGICIAN_EGPIO(2, 0)
-#define EGPIO_MAGICIAN_CARKIT_MIC               MAGICIAN_EGPIO(2, 1)
-#define EGPIO_MAGICIAN_UNKNOWN_WAVEDEV_DLL      MAGICIAN_EGPIO(2, 2)
-#define EGPIO_MAGICIAN_FLASH_VPP                MAGICIAN_EGPIO(2, 3)
-#define EGPIO_MAGICIAN_BL_POWER2                MAGICIAN_EGPIO(2, 4)
-#define EGPIO_MAGICIAN_CHARGE_EN                MAGICIAN_EGPIO(2, 5)
-#define EGPIO_MAGICIAN_GSM_POWER                MAGICIAN_EGPIO(2, 7)
-/* input */
-#define EGPIO_MAGICIAN_CABLE_STATE_AC           MAGICIAN_EGPIO(4, 0)
-#define EGPIO_MAGICIAN_CABLE_STATE_USB          MAGICIAN_EGPIO(4, 1)
-#define EGPIO_MAGICIAN_BOARD_ID0                MAGICIAN_EGPIO(5, 0)
-#define EGPIO_MAGICIAN_BOARD_ID1                MAGICIAN_EGPIO(5, 1)
-#define EGPIO_MAGICIAN_BOARD_ID2                MAGICIAN_EGPIO(5, 2)
-#define EGPIO_MAGICIAN_LCD_SELECT               MAGICIAN_EGPIO(5, 3)
-#define EGPIO_MAGICIAN_nSD_READONLY             MAGICIAN_EGPIO(5, 4)
-#define EGPIO_MAGICIAN_EP_INSERT                MAGICIAN_EGPIO(6, 1)
-#endif /* _MAGICIAN_H_ */

diff --git a/include/asm-arm/arch-pxa/magician.h b/include/asm-arm/arch-pxa/magician.h deleted file mode 100644 index 169b374f9921..000000000000 --- a/include/asm-arm/arch-pxa/magician.h +++ /dev/null
@@ -1,117 +0,0 @@
1	/*
2	* GPIO and IRQ definitions for HTC Magician PDA phones
3	*
4	* Copyright (c) 2007 Philipp Zabel
5	*
6	* This program is free software; you can redistribute it and/or modify
7	* it under the terms of the GNU General Public License version 2 as
8	* published by the Free Software Foundation.
9	*
10	*/
11
12	#ifndef _MAGICIAN_H_
13	#define _MAGICIAN_H_
14
15	#include <asm/arch/irqs.h>
16
17	/*
18	* PXA GPIOs
19	*/
20
21	#define GPIO0_MAGICIAN_KEY_POWER 0
22	#define GPIO9_MAGICIAN_UNKNOWN 9
23	#define GPIO10_MAGICIAN_GSM_IRQ 10
24	#define GPIO11_MAGICIAN_GSM_OUT1 11
25	#define GPIO13_MAGICIAN_CPLD_IRQ 13
26	#define GPIO18_MAGICIAN_UNKNOWN 18
27	#define GPIO22_MAGICIAN_VIBRA_EN 22
28	#define GPIO26_MAGICIAN_GSM_POWER 26
29	#define GPIO27_MAGICIAN_USBC_PUEN 27
30	#define GPIO30_MAGICIAN_nCHARGE_EN 30
31	#define GPIO37_MAGICIAN_KEY_HANGUP 37
32	#define GPIO38_MAGICIAN_KEY_CONTACTS 38
33	#define GPIO40_MAGICIAN_GSM_OUT2 40
34	#define GPIO48_MAGICIAN_UNKNOWN 48
35	#define GPIO56_MAGICIAN_UNKNOWN 56
36	#define GPIO57_MAGICIAN_CAM_RESET 57
37	#define GPIO75_MAGICIAN_SAMSUNG_POWER 75
38	#define GPIO83_MAGICIAN_nIR_EN 83
39	#define GPIO86_MAGICIAN_GSM_RESET 86
40	#define GPIO87_MAGICIAN_GSM_SELECT 87
41	#define GPIO90_MAGICIAN_KEY_CALENDAR 90
42	#define GPIO91_MAGICIAN_KEY_CAMERA 91
43	#define GPIO93_MAGICIAN_KEY_UP 93
44	#define GPIO94_MAGICIAN_KEY_DOWN 94
45	#define GPIO95_MAGICIAN_KEY_LEFT 95
46	#define GPIO96_MAGICIAN_KEY_RIGHT 96
47	#define GPIO97_MAGICIAN_KEY_ENTER 97
48	#define GPIO98_MAGICIAN_KEY_RECORD 98
49	#define GPIO99_MAGICIAN_HEADPHONE_IN 99
50	#define GPIO100_MAGICIAN_KEY_VOL_UP 100
51	#define GPIO101_MAGICIAN_KEY_VOL_DOWN 101
52	#define GPIO102_MAGICIAN_KEY_PHONE 102
53	#define GPIO103_MAGICIAN_LED_KP 103
54	#define GPIO104_MAGICIAN_LCD_POWER_1 104
55	#define GPIO105_MAGICIAN_LCD_POWER_2 105
56	#define GPIO106_MAGICIAN_LCD_POWER_3 106
57	#define GPIO107_MAGICIAN_DS1WM_IRQ 107
58	#define GPIO108_MAGICIAN_GSM_READY 108
59	#define GPIO114_MAGICIAN_UNKNOWN 114
60	#define GPIO115_MAGICIAN_nPEN_IRQ 115
61	#define GPIO116_MAGICIAN_nCAM_EN 116
62	#define GPIO119_MAGICIAN_UNKNOWN 119
63	#define GPIO120_MAGICIAN_UNKNOWN 120
64
65	/*
66	* CPLD IRQs
67	*/
68
69	#define IRQ_MAGICIAN_SD (IRQ_BOARD_START + 0)
70	#define IRQ_MAGICIAN_EP (IRQ_BOARD_START + 1)
71	#define IRQ_MAGICIAN_BT (IRQ_BOARD_START + 2)
72	#define IRQ_MAGICIAN_AC (IRQ_BOARD_START + 3)
73
74	/*
75	* CPLD EGPIOs
76	*/
77
78	#define MAGICIAN_EGPIO_BASE 0x80 /* GPIO_BOARD_START */
79	#define MAGICIAN_EGPIO(reg,bit) \
80	(MAGICIAN_EGPIO_BASE + 8*reg + bit)
81
82	/* output */
83
84	#define EGPIO_MAGICIAN_TOPPOLY_POWER MAGICIAN_EGPIO(0, 2)
85	#define EGPIO_MAGICIAN_LED_POWER MAGICIAN_EGPIO(0, 5)
86	#define EGPIO_MAGICIAN_GSM_RESET MAGICIAN_EGPIO(0, 6)
87	#define EGPIO_MAGICIAN_LCD_POWER MAGICIAN_EGPIO(0, 7)
88	#define EGPIO_MAGICIAN_SPK_POWER MAGICIAN_EGPIO(1, 0)
89	#define EGPIO_MAGICIAN_EP_POWER MAGICIAN_EGPIO(1, 1)
90	#define EGPIO_MAGICIAN_IN_SEL0 MAGICIAN_EGPIO(1, 2)
91	#define EGPIO_MAGICIAN_IN_SEL1 MAGICIAN_EGPIO(1, 3)
92	#define EGPIO_MAGICIAN_MIC_POWER MAGICIAN_EGPIO(1, 4)
93	#define EGPIO_MAGICIAN_CODEC_RESET MAGICIAN_EGPIO(1, 5)
94	#define EGPIO_MAGICIAN_CODEC_POWER MAGICIAN_EGPIO(1, 6)
95	#define EGPIO_MAGICIAN_BL_POWER MAGICIAN_EGPIO(1, 7)
96	#define EGPIO_MAGICIAN_SD_POWER MAGICIAN_EGPIO(2, 0)
97	#define EGPIO_MAGICIAN_CARKIT_MIC MAGICIAN_EGPIO(2, 1)
98	#define EGPIO_MAGICIAN_UNKNOWN_WAVEDEV_DLL MAGICIAN_EGPIO(2, 2)
99	#define EGPIO_MAGICIAN_FLASH_VPP MAGICIAN_EGPIO(2, 3)
100	#define EGPIO_MAGICIAN_BL_POWER2 MAGICIAN_EGPIO(2, 4)
101	#define EGPIO_MAGICIAN_CHARGE_EN MAGICIAN_EGPIO(2, 5)
102	#define EGPIO_MAGICIAN_GSM_POWER MAGICIAN_EGPIO(2, 7)
103
104	/* input */
105
106	#define EGPIO_MAGICIAN_CABLE_STATE_AC MAGICIAN_EGPIO(4, 0)
107	#define EGPIO_MAGICIAN_CABLE_STATE_USB MAGICIAN_EGPIO(4, 1)
108
109	#define EGPIO_MAGICIAN_BOARD_ID0 MAGICIAN_EGPIO(5, 0)
110	#define EGPIO_MAGICIAN_BOARD_ID1 MAGICIAN_EGPIO(5, 1)
111	#define EGPIO_MAGICIAN_BOARD_ID2 MAGICIAN_EGPIO(5, 2)
112	#define EGPIO_MAGICIAN_LCD_SELECT MAGICIAN_EGPIO(5, 3)
113	#define EGPIO_MAGICIAN_nSD_READONLY MAGICIAN_EGPIO(5, 4)
114
115	#define EGPIO_MAGICIAN_EP_INSERT MAGICIAN_EGPIO(6, 1)
116
117	#endif /* _MAGICIAN_H_ */