summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Doucet <todd.doucet@timesys.com>2010-02-08 13:18:32 -0500
committerTodd Doucet <todd.doucet@timesys.com>2010-02-08 13:18:32 -0500
commit7e407c346b8c197f73e88aea4c6ca3de19710aa1 (patch)
treeb56342da652228fed95b04a80c3ccb3d45587449
parent064c79d62ecc028cdb5e552ea7854c4a39204fd7 (diff)
Cleaned up debugging code related to LCD display.
-rw-r--r--arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c34
1 files changed, 4 insertions, 30 deletions
diff --git a/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c b/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c
index bc156e9dc41c..01659b3d3507 100644
--- a/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c
+++ b/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c
@@ -207,13 +207,12 @@ static struct mxc_iomux_pin_cfg __initdata ccwmx51_iomux_usbh1_pins[] = {
#if defined(CONFIG_FB_MXC_SYNC_PANEL) || defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE)
static struct mxc_iomux_pin_cfg __initdata ccwmx51_iomux_video1_pins[] = {
- // ttd: setting up pins for our lcd panel
+ // This pin is necessary to enable the Digi LCD panel on the P1
+ // connector.
{
MX51_PIN_DI1_PIN11, IOMUX_CONFIG_ALT4,
(PAD_CTL_HYS_NONE | PAD_CTL_DRV_LOW | PAD_CTL_SRE_FAST),
},
- // ttd: end of experimental sections
-
{ /* DISP1 DAT0 */
MX51_PIN_DISP1_DAT0, IOMUX_CONFIG_ALT0,
(PAD_CTL_HYS_NONE | PAD_CTL_DRV_LOW | PAD_CTL_SRE_FAST),
@@ -427,16 +426,9 @@ void __init ccwmx51_io_init(void)
#endif
#if defined(CONFIG_FB_MXC_SYNC_PANEL) || defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE)
- printk("ttd: setting up video gpio mappings\n");
for (i = 0; i < ARRAY_SIZE(ccwmx51_iomux_video1_pins); i++) {
-// ttd: debug
- int r = mxc_request_iomux(ccwmx51_iomux_video1_pins[i].pin,
+ mxc_request_iomux(ccwmx51_iomux_video1_pins[i].pin,
ccwmx51_iomux_video1_pins[i].mux_mode);
-// ttd: debug
- if (r){
- printk("ttd: mxc_request_iomux() for video failed, pin %d\n",
- ccwmx51_iomux_video1_pins[i].pin);
- }
if (ccwmx51_iomux_video1_pins[i].pad_cfg)
mxc_iomux_set_pad(ccwmx51_iomux_video1_pins[i].pin,
ccwmx51_iomux_video1_pins[i].pad_cfg);
@@ -485,28 +477,10 @@ void __init ccwmx51_io_init(void)
#endif
}
-// ttd: experimental for lcd
-
void gpio_lcd_active(void)
{
-// ttd: testing...
-#if 1
- int r;
- printk("ttd: gpio_lcd_active\n");
-// r = gpio_request(IOMUX_TO_GPIO(MX51_PIN_DI1_PIN11), "di1_pin11");
-// printk(" ttd: gpio_request() returns %d\n", r);
-
-
-
-// The last one that is required. I don't quite understand the
-// inter-related semantics of the gpio_direction_output and the
-// underlying chip->direction method, and the chip->request.
- r = gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_DI1_PIN11), 0);
-
- printk(" ttd: gpio_set_direction_output() returns %d\n", r);
-// gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_DI1_PIN11), 0);
-#endif
+ gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_DI1_PIN11), 0);
}