diff options
-rw-r--r-- | arch/arm/mach-pxa/balloon3.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-pxa/cm-x270.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 27 | ||||
-rw-r--r-- | arch/arm/mach-pxa/magician.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 20 | ||||
-rw-r--r-- | arch/arm/mach-pxa/palmld.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-pxa/palmt5.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-pxa/palmtreo.c | 20 | ||||
-rw-r--r-- | arch/arm/mach-pxa/palmtx.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-pxa/palmz72.c | 22 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 20 | ||||
-rw-r--r-- | arch/arm/mach-pxa/trizeps4.c | 21 |
14 files changed, 41 insertions, 257 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index b8cd07ca9380..6f813aa4c79c 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c | |||
@@ -140,26 +140,7 @@ static void balloon3_backlight_power(int on) | |||
140 | 140 | ||
141 | static unsigned long balloon3_lcd_pin_config[] = { | 141 | static unsigned long balloon3_lcd_pin_config[] = { |
142 | /* LCD - 16bpp Active TFT */ | 142 | /* LCD - 16bpp Active TFT */ |
143 | GPIO58_LCD_LDD_0, | 143 | GPIOxx_LCD_TFT_16BPP, |
144 | GPIO59_LCD_LDD_1, | ||
145 | GPIO60_LCD_LDD_2, | ||
146 | GPIO61_LCD_LDD_3, | ||
147 | GPIO62_LCD_LDD_4, | ||
148 | GPIO63_LCD_LDD_5, | ||
149 | GPIO64_LCD_LDD_6, | ||
150 | GPIO65_LCD_LDD_7, | ||
151 | GPIO66_LCD_LDD_8, | ||
152 | GPIO67_LCD_LDD_9, | ||
153 | GPIO68_LCD_LDD_10, | ||
154 | GPIO69_LCD_LDD_11, | ||
155 | GPIO70_LCD_LDD_12, | ||
156 | GPIO71_LCD_LDD_13, | ||
157 | GPIO72_LCD_LDD_14, | ||
158 | GPIO73_LCD_LDD_15, | ||
159 | GPIO74_LCD_FCLK, | ||
160 | GPIO75_LCD_LCLK, | ||
161 | GPIO76_LCD_PCLK, | ||
162 | GPIO77_LCD_BIAS, | ||
163 | 144 | ||
164 | GPIO99_GPIO, /* Backlight */ | 145 | GPIO99_GPIO, /* Backlight */ |
165 | }; | 146 | }; |
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index eea78b6c2bc5..425efbc94d8e 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c | |||
@@ -71,26 +71,7 @@ static unsigned long cmx270_pin_config[] = { | |||
71 | GPIO111_MMC_DAT_3, | 71 | GPIO111_MMC_DAT_3, |
72 | 72 | ||
73 | /* LCD */ | 73 | /* LCD */ |
74 | GPIO58_LCD_LDD_0, | 74 | GPIOxx_LCD_TFT_16BPP, |
75 | GPIO59_LCD_LDD_1, | ||
76 | GPIO60_LCD_LDD_2, | ||
77 | GPIO61_LCD_LDD_3, | ||
78 | GPIO62_LCD_LDD_4, | ||
79 | GPIO63_LCD_LDD_5, | ||
80 | GPIO64_LCD_LDD_6, | ||
81 | GPIO65_LCD_LDD_7, | ||
82 | GPIO66_LCD_LDD_8, | ||
83 | GPIO67_LCD_LDD_9, | ||
84 | GPIO68_LCD_LDD_10, | ||
85 | GPIO69_LCD_LDD_11, | ||
86 | GPIO70_LCD_LDD_12, | ||
87 | GPIO71_LCD_LDD_13, | ||
88 | GPIO72_LCD_LDD_14, | ||
89 | GPIO73_LCD_LDD_15, | ||
90 | GPIO74_LCD_FCLK, | ||
91 | GPIO75_LCD_LCLK, | ||
92 | GPIO76_LCD_PCLK, | ||
93 | GPIO77_LCD_BIAS, | ||
94 | 75 | ||
95 | /* I2C */ | 76 | /* I2C */ |
96 | GPIO117_I2C_SCL, | 77 | GPIO117_I2C_SCL, |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index c8a01bc85fde..aab04f33e49b 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -109,26 +109,7 @@ static unsigned long common_pin_config[] = { | |||
109 | GPIO111_MMC_DAT_3, | 109 | GPIO111_MMC_DAT_3, |
110 | 110 | ||
111 | /* LCD */ | 111 | /* LCD */ |
112 | GPIO58_LCD_LDD_0, | 112 | GPIOxx_LCD_TFT_16BPP, |
113 | GPIO59_LCD_LDD_1, | ||
114 | GPIO60_LCD_LDD_2, | ||
115 | GPIO61_LCD_LDD_3, | ||
116 | GPIO62_LCD_LDD_4, | ||
117 | GPIO63_LCD_LDD_5, | ||
118 | GPIO64_LCD_LDD_6, | ||
119 | GPIO65_LCD_LDD_7, | ||
120 | GPIO66_LCD_LDD_8, | ||
121 | GPIO67_LCD_LDD_9, | ||
122 | GPIO68_LCD_LDD_10, | ||
123 | GPIO69_LCD_LDD_11, | ||
124 | GPIO70_LCD_LDD_12, | ||
125 | GPIO71_LCD_LDD_13, | ||
126 | GPIO72_LCD_LDD_14, | ||
127 | GPIO73_LCD_LDD_15, | ||
128 | GPIO74_LCD_FCLK, | ||
129 | GPIO75_LCD_LCLK, | ||
130 | GPIO76_LCD_PCLK, | ||
131 | GPIO77_LCD_BIAS, | ||
132 | 113 | ||
133 | /* QCI */ | 114 | /* QCI */ |
134 | GPIO84_CIF_FV, | 115 | GPIO84_CIF_FV, |
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h index 6543c05f47ed..ec0f0b0b6744 100644 --- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | |||
@@ -434,5 +434,32 @@ | |||
434 | #define GPIO112_nMSINS MFP_CFG_IN(GPIO112, AF2) | 434 | #define GPIO112_nMSINS MFP_CFG_IN(GPIO112, AF2) |
435 | #define GPIO32_MSSCLK MFP_CFG_OUT(GPIO32, AF1, DRIVE_LOW) | 435 | #define GPIO32_MSSCLK MFP_CFG_OUT(GPIO32, AF1, DRIVE_LOW) |
436 | 436 | ||
437 | /* commonly used pin configurations */ | ||
438 | #define GPIOxx_LCD_16BPP \ | ||
439 | GPIO58_LCD_LDD_0, \ | ||
440 | GPIO59_LCD_LDD_1, \ | ||
441 | GPIO60_LCD_LDD_2, \ | ||
442 | GPIO61_LCD_LDD_3, \ | ||
443 | GPIO62_LCD_LDD_4, \ | ||
444 | GPIO63_LCD_LDD_5, \ | ||
445 | GPIO64_LCD_LDD_6, \ | ||
446 | GPIO65_LCD_LDD_7, \ | ||
447 | GPIO66_LCD_LDD_8, \ | ||
448 | GPIO67_LCD_LDD_9, \ | ||
449 | GPIO68_LCD_LDD_10, \ | ||
450 | GPIO69_LCD_LDD_11, \ | ||
451 | GPIO70_LCD_LDD_12, \ | ||
452 | GPIO71_LCD_LDD_13, \ | ||
453 | GPIO72_LCD_LDD_14, \ | ||
454 | GPIO73_LCD_LDD_15 | ||
455 | |||
456 | #define GPIOxx_LCD_TFT_16BPP \ | ||
457 | GPIOxx_LCD_16BPP, \ | ||
458 | GPIO74_LCD_FCLK, \ | ||
459 | GPIO75_LCD_LCLK, \ | ||
460 | GPIO76_LCD_PCLK, \ | ||
461 | GPIO77_LCD_BIAS | ||
462 | |||
463 | |||
437 | extern int keypad_set_wake(unsigned int on); | 464 | extern int keypad_set_wake(unsigned int on); |
438 | #endif /* __ASM_ARCH_MFP_PXA27X_H */ | 465 | #endif /* __ASM_ARCH_MFP_PXA27X_H */ |
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 189f330719a2..e81dd0c8e40d 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
@@ -88,26 +88,7 @@ static unsigned long magician_pin_config[] __initdata = { | |||
88 | GPIO112_MMC_CMD, | 88 | GPIO112_MMC_CMD, |
89 | 89 | ||
90 | /* LCD */ | 90 | /* LCD */ |
91 | GPIO58_LCD_LDD_0, | 91 | GPIOxx_LCD_TFT_16BPP, |
92 | GPIO59_LCD_LDD_1, | ||
93 | GPIO60_LCD_LDD_2, | ||
94 | GPIO61_LCD_LDD_3, | ||
95 | GPIO62_LCD_LDD_4, | ||
96 | GPIO63_LCD_LDD_5, | ||
97 | GPIO64_LCD_LDD_6, | ||
98 | GPIO65_LCD_LDD_7, | ||
99 | GPIO66_LCD_LDD_8, | ||
100 | GPIO67_LCD_LDD_9, | ||
101 | GPIO68_LCD_LDD_10, | ||
102 | GPIO69_LCD_LDD_11, | ||
103 | GPIO70_LCD_LDD_12, | ||
104 | GPIO71_LCD_LDD_13, | ||
105 | GPIO72_LCD_LDD_14, | ||
106 | GPIO73_LCD_LDD_15, | ||
107 | GPIO74_LCD_FCLK, | ||
108 | GPIO75_LCD_LCLK, | ||
109 | GPIO76_LCD_PCLK, | ||
110 | GPIO77_LCD_BIAS, | ||
111 | 92 | ||
112 | /* QCI */ | 93 | /* QCI */ |
113 | GPIO12_CIF_DD_7, | 94 | GPIO12_CIF_DD_7, |
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index a8674aacd347..36370392abe1 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
@@ -60,26 +60,7 @@ static unsigned long mainstone_pin_config[] = { | |||
60 | GPIO15_nCS_1, | 60 | GPIO15_nCS_1, |
61 | 61 | ||
62 | /* LCD - 16bpp Active TFT */ | 62 | /* LCD - 16bpp Active TFT */ |
63 | GPIO58_LCD_LDD_0, | 63 | GPIOxx_LCD_TFT_16BPP, |
64 | GPIO59_LCD_LDD_1, | ||
65 | GPIO60_LCD_LDD_2, | ||
66 | GPIO61_LCD_LDD_3, | ||
67 | GPIO62_LCD_LDD_4, | ||
68 | GPIO63_LCD_LDD_5, | ||
69 | GPIO64_LCD_LDD_6, | ||
70 | GPIO65_LCD_LDD_7, | ||
71 | GPIO66_LCD_LDD_8, | ||
72 | GPIO67_LCD_LDD_9, | ||
73 | GPIO68_LCD_LDD_10, | ||
74 | GPIO69_LCD_LDD_11, | ||
75 | GPIO70_LCD_LDD_12, | ||
76 | GPIO71_LCD_LDD_13, | ||
77 | GPIO72_LCD_LDD_14, | ||
78 | GPIO73_LCD_LDD_15, | ||
79 | GPIO74_LCD_FCLK, | ||
80 | GPIO75_LCD_LCLK, | ||
81 | GPIO76_LCD_PCLK, | ||
82 | GPIO77_LCD_BIAS, | ||
83 | GPIO16_PWM0_OUT, /* Backlight */ | 64 | GPIO16_PWM0_OUT, /* Backlight */ |
84 | 65 | ||
85 | /* MMC */ | 66 | /* MMC */ |
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 2466a44d8fda..ca47ee19248b 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -86,25 +86,7 @@ static unsigned long mioa701_pin_config[] = { | |||
86 | MIO_CFG_OUT(GPIO22_USB_ENABLE, AF0, DRIVE_LOW), | 86 | MIO_CFG_OUT(GPIO22_USB_ENABLE, AF0, DRIVE_LOW), |
87 | 87 | ||
88 | /* LCD */ | 88 | /* LCD */ |
89 | GPIO58_LCD_LDD_0, | 89 | GPIOxx_LCD_TFT_16BPP, |
90 | GPIO59_LCD_LDD_1, | ||
91 | GPIO60_LCD_LDD_2, | ||
92 | GPIO61_LCD_LDD_3, | ||
93 | GPIO62_LCD_LDD_4, | ||
94 | GPIO63_LCD_LDD_5, | ||
95 | GPIO64_LCD_LDD_6, | ||
96 | GPIO65_LCD_LDD_7, | ||
97 | GPIO66_LCD_LDD_8, | ||
98 | GPIO67_LCD_LDD_9, | ||
99 | GPIO68_LCD_LDD_10, | ||
100 | GPIO69_LCD_LDD_11, | ||
101 | GPIO70_LCD_LDD_12, | ||
102 | GPIO71_LCD_LDD_13, | ||
103 | GPIO72_LCD_LDD_14, | ||
104 | GPIO73_LCD_LDD_15, | ||
105 | GPIO74_LCD_FCLK, | ||
106 | GPIO75_LCD_LCLK, | ||
107 | GPIO76_LCD_PCLK, | ||
108 | 90 | ||
109 | /* QCI */ | 91 | /* QCI */ |
110 | GPIO12_CIF_DD_7, | 92 | GPIO12_CIF_DD_7, |
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c index e100af78b166..f70c75b38769 100644 --- a/arch/arm/mach-pxa/palmld.c +++ b/arch/arm/mach-pxa/palmld.c | |||
@@ -83,26 +83,7 @@ static unsigned long palmld_pin_config[] __initdata = { | |||
83 | GPIO105_KP_MKOUT_2, | 83 | GPIO105_KP_MKOUT_2, |
84 | 84 | ||
85 | /* LCD */ | 85 | /* LCD */ |
86 | GPIO58_LCD_LDD_0, | 86 | GPIOxx_LCD_TFT_16BPP, |
87 | GPIO59_LCD_LDD_1, | ||
88 | GPIO60_LCD_LDD_2, | ||
89 | GPIO61_LCD_LDD_3, | ||
90 | GPIO62_LCD_LDD_4, | ||
91 | GPIO63_LCD_LDD_5, | ||
92 | GPIO64_LCD_LDD_6, | ||
93 | GPIO65_LCD_LDD_7, | ||
94 | GPIO66_LCD_LDD_8, | ||
95 | GPIO67_LCD_LDD_9, | ||
96 | GPIO68_LCD_LDD_10, | ||
97 | GPIO69_LCD_LDD_11, | ||
98 | GPIO70_LCD_LDD_12, | ||
99 | GPIO71_LCD_LDD_13, | ||
100 | GPIO72_LCD_LDD_14, | ||
101 | GPIO73_LCD_LDD_15, | ||
102 | GPIO74_LCD_FCLK, | ||
103 | GPIO75_LCD_LCLK, | ||
104 | GPIO76_LCD_PCLK, | ||
105 | GPIO77_LCD_BIAS, | ||
106 | 87 | ||
107 | /* PWM */ | 88 | /* PWM */ |
108 | GPIO16_PWM0_OUT, | 89 | GPIO16_PWM0_OUT, |
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index 8fe3ec27568f..d902a813aae3 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c | |||
@@ -87,26 +87,7 @@ static unsigned long palmt5_pin_config[] __initdata = { | |||
87 | GPIO105_KP_MKOUT_2, | 87 | GPIO105_KP_MKOUT_2, |
88 | 88 | ||
89 | /* LCD */ | 89 | /* LCD */ |
90 | GPIO58_LCD_LDD_0, | 90 | GPIOxx_LCD_TFT_16BPP, |
91 | GPIO59_LCD_LDD_1, | ||
92 | GPIO60_LCD_LDD_2, | ||
93 | GPIO61_LCD_LDD_3, | ||
94 | GPIO62_LCD_LDD_4, | ||
95 | GPIO63_LCD_LDD_5, | ||
96 | GPIO64_LCD_LDD_6, | ||
97 | GPIO65_LCD_LDD_7, | ||
98 | GPIO66_LCD_LDD_8, | ||
99 | GPIO67_LCD_LDD_9, | ||
100 | GPIO68_LCD_LDD_10, | ||
101 | GPIO69_LCD_LDD_11, | ||
102 | GPIO70_LCD_LDD_12, | ||
103 | GPIO71_LCD_LDD_13, | ||
104 | GPIO72_LCD_LDD_14, | ||
105 | GPIO73_LCD_LDD_15, | ||
106 | GPIO74_LCD_FCLK, | ||
107 | GPIO75_LCD_LCLK, | ||
108 | GPIO76_LCD_PCLK, | ||
109 | GPIO77_LCD_BIAS, | ||
110 | 91 | ||
111 | /* PWM */ | 92 | /* PWM */ |
112 | GPIO16_PWM0_OUT, | 93 | GPIO16_PWM0_OUT, |
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c index b433bb496711..d8b4469607a1 100644 --- a/arch/arm/mach-pxa/palmtreo.c +++ b/arch/arm/mach-pxa/palmtreo.c | |||
@@ -99,25 +99,7 @@ static unsigned long treo_pin_config[] __initdata = { | |||
99 | GPIO93_KP_DKIN_0 | WAKEUP_ON_LEVEL_HIGH, /* Hotsync button */ | 99 | GPIO93_KP_DKIN_0 | WAKEUP_ON_LEVEL_HIGH, /* Hotsync button */ |
100 | 100 | ||
101 | /* LCD */ | 101 | /* LCD */ |
102 | GPIO58_LCD_LDD_0, | 102 | GPIOxx_LCD_TFT_16BPP, |
103 | GPIO59_LCD_LDD_1, | ||
104 | GPIO60_LCD_LDD_2, | ||
105 | GPIO61_LCD_LDD_3, | ||
106 | GPIO62_LCD_LDD_4, | ||
107 | GPIO63_LCD_LDD_5, | ||
108 | GPIO64_LCD_LDD_6, | ||
109 | GPIO65_LCD_LDD_7, | ||
110 | GPIO66_LCD_LDD_8, | ||
111 | GPIO67_LCD_LDD_9, | ||
112 | GPIO68_LCD_LDD_10, | ||
113 | GPIO69_LCD_LDD_11, | ||
114 | GPIO70_LCD_LDD_12, | ||
115 | GPIO71_LCD_LDD_13, | ||
116 | GPIO72_LCD_LDD_14, | ||
117 | GPIO73_LCD_LDD_15, | ||
118 | GPIO74_LCD_FCLK, | ||
119 | GPIO75_LCD_LCLK, | ||
120 | GPIO76_LCD_PCLK, | ||
121 | 103 | ||
122 | /* Quick Capture Interface */ | 104 | /* Quick Capture Interface */ |
123 | GPIO84_CIF_FV, | 105 | GPIO84_CIF_FV, |
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index b37a025c0b7b..007b58c11f8d 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
@@ -110,26 +110,7 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
110 | GPIO105_KP_MKOUT_2, | 110 | GPIO105_KP_MKOUT_2, |
111 | 111 | ||
112 | /* LCD */ | 112 | /* LCD */ |
113 | GPIO58_LCD_LDD_0, | 113 | GPIOxx_LCD_TFT_16BPP, |
114 | GPIO59_LCD_LDD_1, | ||
115 | GPIO60_LCD_LDD_2, | ||
116 | GPIO61_LCD_LDD_3, | ||
117 | GPIO62_LCD_LDD_4, | ||
118 | GPIO63_LCD_LDD_5, | ||
119 | GPIO64_LCD_LDD_6, | ||
120 | GPIO65_LCD_LDD_7, | ||
121 | GPIO66_LCD_LDD_8, | ||
122 | GPIO67_LCD_LDD_9, | ||
123 | GPIO68_LCD_LDD_10, | ||
124 | GPIO69_LCD_LDD_11, | ||
125 | GPIO70_LCD_LDD_12, | ||
126 | GPIO71_LCD_LDD_13, | ||
127 | GPIO72_LCD_LDD_14, | ||
128 | GPIO73_LCD_LDD_15, | ||
129 | GPIO74_LCD_FCLK, | ||
130 | GPIO75_LCD_LCLK, | ||
131 | GPIO76_LCD_PCLK, | ||
132 | GPIO77_LCD_BIAS, | ||
133 | 114 | ||
134 | /* FFUART */ | 115 | /* FFUART */ |
135 | GPIO34_FFUART_RXD, | 116 | GPIO34_FFUART_RXD, |
diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c index 1c5d68a94511..3a7925ca3944 100644 --- a/arch/arm/mach-pxa/palmz72.c +++ b/arch/arm/mach-pxa/palmz72.c | |||
@@ -95,26 +95,8 @@ static unsigned long palmz72_pin_config[] __initdata = { | |||
95 | GPIO105_KP_MKOUT_2, | 95 | GPIO105_KP_MKOUT_2, |
96 | 96 | ||
97 | /* LCD */ | 97 | /* LCD */ |
98 | GPIO58_LCD_LDD_0, | 98 | GPIOxx_LCD_TFT_16BPP, |
99 | GPIO59_LCD_LDD_1, | 99 | |
100 | GPIO60_LCD_LDD_2, | ||
101 | GPIO61_LCD_LDD_3, | ||
102 | GPIO62_LCD_LDD_4, | ||
103 | GPIO63_LCD_LDD_5, | ||
104 | GPIO64_LCD_LDD_6, | ||
105 | GPIO65_LCD_LDD_7, | ||
106 | GPIO66_LCD_LDD_8, | ||
107 | GPIO67_LCD_LDD_9, | ||
108 | GPIO68_LCD_LDD_10, | ||
109 | GPIO69_LCD_LDD_11, | ||
110 | GPIO70_LCD_LDD_12, | ||
111 | GPIO71_LCD_LDD_13, | ||
112 | GPIO72_LCD_LDD_14, | ||
113 | GPIO73_LCD_LDD_15, | ||
114 | GPIO74_LCD_FCLK, | ||
115 | GPIO75_LCD_LCLK, | ||
116 | GPIO76_LCD_PCLK, | ||
117 | GPIO77_LCD_BIAS, | ||
118 | GPIO20_GPIO, /* bl power */ | 100 | GPIO20_GPIO, /* bl power */ |
119 | GPIO21_GPIO, /* LCD border switch */ | 101 | GPIO21_GPIO, /* LCD border switch */ |
120 | GPIO22_GPIO, /* LCD border color */ | 102 | GPIO22_GPIO, /* LCD border color */ |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 28352c0b8c34..19b5109d9808 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -56,25 +56,7 @@ static unsigned long spitz_pin_config[] __initdata = { | |||
56 | GPIO80_nCS_4, /* SCOOP #1 */ | 56 | GPIO80_nCS_4, /* SCOOP #1 */ |
57 | 57 | ||
58 | /* LCD - 16bpp Active TFT */ | 58 | /* LCD - 16bpp Active TFT */ |
59 | GPIO58_LCD_LDD_0, | 59 | GPIOxx_LCD_TFT_16BPP, |
60 | GPIO59_LCD_LDD_1, | ||
61 | GPIO60_LCD_LDD_2, | ||
62 | GPIO61_LCD_LDD_3, | ||
63 | GPIO62_LCD_LDD_4, | ||
64 | GPIO63_LCD_LDD_5, | ||
65 | GPIO64_LCD_LDD_6, | ||
66 | GPIO65_LCD_LDD_7, | ||
67 | GPIO66_LCD_LDD_8, | ||
68 | GPIO67_LCD_LDD_9, | ||
69 | GPIO68_LCD_LDD_10, | ||
70 | GPIO69_LCD_LDD_11, | ||
71 | GPIO70_LCD_LDD_12, | ||
72 | GPIO71_LCD_LDD_13, | ||
73 | GPIO72_LCD_LDD_14, | ||
74 | GPIO73_LCD_LDD_15, | ||
75 | GPIO74_LCD_FCLK, | ||
76 | GPIO75_LCD_LCLK, | ||
77 | GPIO76_LCD_PCLK, | ||
78 | 60 | ||
79 | /* PC Card */ | 61 | /* PC Card */ |
80 | GPIO48_nPOE, | 62 | GPIO48_nPOE, |
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index 0aa858ebc573..441600845a72 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c | |||
@@ -73,26 +73,7 @@ static unsigned long trizeps4_pin_config[] __initdata = { | |||
73 | GPIO0_GPIO | WAKEUP_ON_EDGE_RISE, /* Logic irq */ | 73 | GPIO0_GPIO | WAKEUP_ON_EDGE_RISE, /* Logic irq */ |
74 | 74 | ||
75 | /* LCD - 16bpp Active TFT */ | 75 | /* LCD - 16bpp Active TFT */ |
76 | GPIO58_LCD_LDD_0, | 76 | GPIOxx_LCD_TFT_16BPP, |
77 | GPIO59_LCD_LDD_1, | ||
78 | GPIO60_LCD_LDD_2, | ||
79 | GPIO61_LCD_LDD_3, | ||
80 | GPIO62_LCD_LDD_4, | ||
81 | GPIO63_LCD_LDD_5, | ||
82 | GPIO64_LCD_LDD_6, | ||
83 | GPIO65_LCD_LDD_7, | ||
84 | GPIO66_LCD_LDD_8, | ||
85 | GPIO67_LCD_LDD_9, | ||
86 | GPIO68_LCD_LDD_10, | ||
87 | GPIO69_LCD_LDD_11, | ||
88 | GPIO70_LCD_LDD_12, | ||
89 | GPIO71_LCD_LDD_13, | ||
90 | GPIO72_LCD_LDD_14, | ||
91 | GPIO73_LCD_LDD_15, | ||
92 | GPIO74_LCD_FCLK, | ||
93 | GPIO75_LCD_LCLK, | ||
94 | GPIO76_LCD_PCLK, | ||
95 | GPIO77_LCD_BIAS, | ||
96 | 77 | ||
97 | /* UART */ | 78 | /* UART */ |
98 | GPIO9_FFUART_CTS, | 79 | GPIO9_FFUART_CTS, |