|
From: <hap...@us...> - 2007-06-30 15:52:47
|
Revision: 1098
http://svn.sourceforge.net/hackndev/?rev=1098&view=rev
Author: happy-slapin
Date: 2007-06-30 08:52:40 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
z72: making stuff work for now
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c
linux4palm/linux/trunk/drivers/media/video/pxa_camera_ioctl.c
linux4palm/linux/trunk/drivers/usb/storage/sddr55.c
linux4palm/linux/trunk/drivers/usb/storage/sddr55.h
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c 2007-06-30 12:03:02 UTC (rev 1097)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c 2007-06-30 15:52:40 UTC (rev 1098)
@@ -406,7 +406,7 @@
.reset_gpio = 34,
.power_gpio = 32,
};
-
+#if 0
static struct platform_device ov9640 = {
.name = "ov96xx",
.id = -1,
@@ -414,8 +414,8 @@
.platform_data = &ov9640_data,
},
};
+#endif
-
/****************
* Init Machine *
****************/
@@ -430,7 +430,9 @@
#endif
&palmz72_led_device,
&bcm2035_bt,
+#if 0
&ov9640,
+#endif
};
/***********************************************************************
@@ -453,40 +455,22 @@
pxa_gpio_mode(85 | GPIO_ALT_FN_3_IN); /* CIF_LV */
pxa_gpio_mode(84 | GPIO_ALT_FN_3_IN); /* CIF_FV */
+#if 0
pxa_gpio_mode(32 | GPIO_OUT);
pxa_gpio_mode(34 | GPIO_OUT);
-#if 0
set_GPIO_mode(50 | GPIO_OUT); /*CIF_PD */
set_GPIO_mode(19 | GPIO_IN); /*CIF_RST */
#endif
-
- return;
}
-#if 0
-void ov9640_set_powerdown_gpio(void)
-{
- /* Not implemented */
-}
-void ov9640_clear_powerdown_gpio(void)
-{
- /* Not implemented */
-}
-EXPORT_SYMBOL_GPL(ov9640_gpio_init);
-EXPORT_SYMBOL_GPL(ov9640_set_powerdown_gpio);
-EXPORT_SYMBOL_GPL(ov9640_clear_powerdown_gpio);
/***********************************************************************
*
* end of OV9640 Functions
*
***********************************************************************/
-#endif
-
static void __init palmz72_init(void)
{
- GCR &= ~GCR_PRIRDY_IEN;
-
// disable interrupt to prevent WM9712 constantly interrupting the CPU
// and preventing the boot process to complete (Thanx Alex & Shadowmite!)
Modified: linux4palm/linux/trunk/drivers/media/video/pxa_camera_ioctl.c
===================================================================
--- linux4palm/linux/trunk/drivers/media/video/pxa_camera_ioctl.c 2007-06-30 12:03:02 UTC (rev 1097)
+++ linux4palm/linux/trunk/drivers/media/video/pxa_camera_ioctl.c 2007-06-30 15:52:40 UTC (rev 1098)
@@ -104,6 +104,7 @@
}
return 0;
}
+
static int pxa_camera_VIDIOCGWIN(p_camera_context_t cam_ctx, void * param)
{
struct video_window vw;
@@ -116,6 +117,7 @@
}
return 0;
}
+
static int pxa_camera_VIDIOCSWIN(p_camera_context_t cam_ctx, void * param)
{
struct video_window vw;
@@ -147,6 +149,7 @@
return camera_set_capture_format(cam_ctx);
}
+
static int pxa_camera_VIDIOCSPICT(p_camera_context_t cam_ctx, void * param)
{
struct video_picture vp;
Modified: linux4palm/linux/trunk/drivers/usb/storage/sddr55.c
===================================================================
--- linux4palm/linux/trunk/drivers/usb/storage/sddr55.c 2007-06-30 12:03:02 UTC (rev 1097)
+++ linux4palm/linux/trunk/drivers/usb/storage/sddr55.c 2007-06-30 15:52:40 UTC (rev 1098)
@@ -1,6 +1,6 @@
/* Driver for SanDisk SDDR-55 SmartMedia reader
*
- * $Id:$
+ * $Id$
*
* SDDR55 driver v0.1:
*
Modified: linux4palm/linux/trunk/drivers/usb/storage/sddr55.h
===================================================================
--- linux4palm/linux/trunk/drivers/usb/storage/sddr55.h 2007-06-30 12:03:02 UTC (rev 1097)
+++ linux4palm/linux/trunk/drivers/usb/storage/sddr55.h 2007-06-30 15:52:40 UTC (rev 1098)
@@ -1,7 +1,7 @@
/* Driver for SanDisk SDDR-55 SmartMedia reader
* Header File
*
- * $Id:$
+ * $Id$
*
* Current development and maintenance by:
* (c) 2002 Simon Munton
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|