aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/include
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2009-11-27 06:03:52 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 11:52:55 -0500
commit766f0378a745596eae0bb625b9e3f05a7e7be476 (patch)
tree7d247c36f6283378292ceecf0b572ee7860fcc56 /arch/arm/mach-sa1100/include
parent22f9740552b89c9f458f972f881d222b298ab165 (diff)
ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlers
As all users of assign_h3600_egpio now converted to gpiolib, we can safely remove all assign_h3600_egpio handling code and definitions. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/include')
-rw-r--r--arch/arm/mach-sa1100/include/mach/h3600.h23
-rw-r--r--arch/arm/mach-sa1100/include/mach/h3600_gpio.h22
2 files changed, 0 insertions, 45 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/h3600.h b/arch/arm/mach-sa1100/include/mach/h3600.h
index 69f138c55407..19d7fe1b5874 100644
--- a/arch/arm/mach-sa1100/include/mach/h3600.h
+++ b/arch/arm/mach-sa1100/include/mach/h3600.h
@@ -66,27 +66,4 @@
66#define IRQ_GPIO_H3600_OPT_IRQ IRQ_GPIO24 66#define IRQ_GPIO_H3600_OPT_IRQ IRQ_GPIO24
67#define IRQ_GPIO_H3600_COM_CTS IRQ_GPIO25 67#define IRQ_GPIO_H3600_COM_CTS IRQ_GPIO25
68 68
69
70#ifndef __ASSEMBLY__
71
72enum ipaq_egpio_type {
73 IPAQ_EGPIO_LCD_POWER, /* Power to the LCD panel */
74 IPAQ_EGPIO_CODEC_NRESET, /* Clear to reset the audio codec (remember to return high) */
75 IPAQ_EGPIO_AUDIO_ON, /* Audio power */
76 IPAQ_EGPIO_QMUTE, /* Audio muting */
77 IPAQ_EGPIO_OPT_NVRAM_ON, /* Non-volatile RAM on extension sleeves (SPI interface) */
78 IPAQ_EGPIO_OPT_ON, /* Power to extension sleeves */
79 IPAQ_EGPIO_CARD_RESET, /* Reset PCMCIA cards on extension sleeve (???) */
80 IPAQ_EGPIO_OPT_RESET, /* Reset option pack (???) */
81 IPAQ_EGPIO_IR_ON, /* IR sensor/emitter power */
82 IPAQ_EGPIO_IR_FSEL, /* IR speed selection 1->fast, 0->slow */
83 IPAQ_EGPIO_RS232_ON, /* Maxim RS232 chip power */
84 IPAQ_EGPIO_VPP_ON, /* Turn on power to flash programming */
85 IPAQ_EGPIO_LCD_ENABLE, /* Enable/disable LCD controller */
86};
87
88extern void (*assign_h3600_egpio)(enum ipaq_egpio_type x, int level);
89
90#endif /* ASSEMBLY */
91
92#endif /* _INCLUDE_H3600_H_ */ 69#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 ce80f1ae0c1a..6cfbc649f189 100644
--- a/arch/arm/mach-sa1100/include/mach/h3600_gpio.h
+++ b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h
@@ -76,28 +76,6 @@
76#define IRQ_GPIO_H3600_ACTION_BUTTON IRQ_GPIO18 76#define IRQ_GPIO_H3600_ACTION_BUTTON IRQ_GPIO18
77#define IRQ_GPIO_H3600_OPT_DET IRQ_GPIO27 77#define IRQ_GPIO_H3600_OPT_DET IRQ_GPIO27
78 78
79/* H3100 / 3600 EGPIO pins */
80#define EGPIO_H3600_VPP_ON (1 << 0)
81#define EGPIO_H3600_CARD_RESET (1 << 1) /* reset the attached pcmcia/compactflash card. active high. */
82#define EGPIO_H3600_OPT_RESET (1 << 2) /* reset the attached option pack. active high. */
83#define EGPIO_H3600_CODEC_NRESET (1 << 3) /* reset the onboard UDA1341. active low. */
84#define EGPIO_H3600_OPT_NVRAM_ON (1 << 4) /* apply power to optionpack nvram, active high. */
85#define EGPIO_H3600_OPT_ON (1 << 5) /* full power to option pack. active high. */
86#define EGPIO_H3600_LCD_ON (1 << 6) /* enable 3.3V to LCD. active high. */
87#define EGPIO_H3600_RS232_ON (1 << 7) /* UART3 transceiver force on. Active high. */
88
89/* H3600 only EGPIO pins */
90#define EGPIO_H3600_LCD_PCI (1 << 8) /* LCD control IC enable. active high. */
91#define EGPIO_H3600_IR_ON (1 << 9) /* apply power to IR module. active high. */
92#define EGPIO_H3600_AUD_AMP_ON (1 << 10) /* apply power to audio power amp. active high. */
93#define EGPIO_H3600_AUD_PWR_ON (1 << 11) /* apply power to reset of audio circuit. active high. */
94#define EGPIO_H3600_QMUTE (1 << 12) /* mute control for onboard UDA1341. active high. */
95#define EGPIO_H3600_IR_FSEL (1 << 13) /* IR speed select: 1->fast, 0->slow */
96#define EGPIO_H3600_LCD_5V_ON (1 << 14) /* enable 5V to LCD. active high. */
97#define EGPIO_H3600_LVDD_ON (1 << 15) /* enable 9V and -6.5V to LCD. */
98
99
100/* gpiolib versions of EGPIOs */
101 79
102/* H3100 / 3600 EGPIO pins */ 80/* H3100 / 3600 EGPIO pins */
103#define H3XXX_EGPIO_BASE (GPIO_MAX + 1) 81#define H3XXX_EGPIO_BASE (GPIO_MAX + 1)