Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [1077] linux4palm/linux/trunk
|
From: <hap...@us...> - 2007-06-26 10:48:59
|
Revision: 1077
http://svn.sourceforge.net/hackndev/?rev=1077&view=rev
Author: happy-slapin
Date: 2007-06-26 03:48:55 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
PXA270+OV9640: moving platform code out
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/Kconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/gpio_map.txt
linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c
linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c
linux4palm/linux/trunk/drivers/i2c/chips/i2c-ov9640.c
linux4palm/linux/trunk/drivers/i2c/chips/i2c-ov9640.h
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/Kconfig 2007-06-26 10:15:26 UTC (rev 1076)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/Kconfig 2007-06-26 10:48:55 UTC (rev 1077)
@@ -15,6 +15,7 @@
config PALMZ72_BATTERY
tristate "Palm Zire 72 Battery support"
select TOUCHSCREEN_WM97XX
+ select POWER_SUPPLY
depends on MACH_PALMZ72
default m
help
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/gpio_map.txt
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/gpio_map.txt 2007-06-26 10:15:26 UTC (rev 1076)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/gpio_map.txt 2007-06-26 10:48:55 UTC (rev 1077)
@@ -111,7 +111,7 @@
GPIO109 0 O 00
GPIO110 0 O 00
GPIO111 0 O 00
-GPIO112 0 O 00
+GPIO112 0 O 00 CAMERA?
GPIO113 1 O 00
GPIO114 1 O 00
GPIO115 0 I 00
@@ -119,4 +119,4 @@
GPIO117 1 O 01 SCL
GPIO118 1 O 01 SDA
GPIO119 0 O 00
-GPIO120 0 O 00
+GPIO120 0 O 00 CAMERA?
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c 2007-06-26 10:15:26 UTC (rev 1076)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c 2007-06-26 10:48:55 UTC (rev 1077)
@@ -447,6 +447,42 @@
platform_add_devices( devices, ARRAY_SIZE(devices) );
}
+/***********************************************************************
+ *
+ * OV9640 Functions
+ *
+ ***********************************************************************/
+void ov9640_gpio_init(void)
+{
+ set_GPIO_mode(81 | GPIO_ALT_FN_2_IN); /* CIF_DD[0] */
+ set_GPIO_mode(55 | GPIO_ALT_FN_1_IN); /* CIF_DD[1] */
+ set_GPIO_mode(51 | GPIO_ALT_FN_1_IN); /* CIF_DD[2] */
+ set_GPIO_mode(50 | GPIO_ALT_FN_1_IN); /* CIF_DD[3] */
+ set_GPIO_mode(52 | GPIO_ALT_FN_1_IN); /* CIF_DD[4] */
+ set_GPIO_mode(48 | GPIO_ALT_FN_1_IN); /* CIF_DD[5] */
+ set_GPIO_mode(93 | GPIO_ALT_FN_1_IN); /* CIF_DD[6] */
+ set_GPIO_mode(108 | GPIO_ALT_FN_1_IN); /* CIF_DD[7] */
+ set_GPIO_mode(53 | GPIO_ALT_FN_2_OUT); /* CIF_MCLK */
+ set_GPIO_mode(54 | GPIO_ALT_FN_3_IN); /* CIF_PCLK */
+ set_GPIO_mode(85 | GPIO_ALT_FN_3_IN); /* CIF_LV */
+ set_GPIO_mode(84 | GPIO_ALT_FN_3_IN); /* CIF_FV */
+
+#if 0
+ set_GPIO_mode(50 | GPIO_OUT); /*CIF_PD */
+ set_GPIO_mode(19 | GPIO_IN); /*CIF_RST */
+#endif
+
+ return;
+}
+
+EXPORT_SYMBOL_GPL(ov9640_gpio_init)
+/***********************************************************************
+ *
+ * end of OV9640 Functions
+ *
+ ***********************************************************************/
+
+
MACHINE_START(PALMZ72, "Palm Zire 72")
/********************************************************/
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c 2007-06-26 10:15:26 UTC (rev 1076)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c 2007-06-26 10:48:55 UTC (rev 1077)
@@ -15,6 +15,7 @@
#include <linux/pm.h>
#include <linux/fb.h>
#include <linux/platform_device.h>
+#include <linux/delay.h>
#include <asm/mach-types.h>
#include <asm/hardware.h>
@@ -52,6 +53,9 @@
/* Turn off USB power */
SET_PALMZ72_GPIO(USB_POWER,0);
+ SET_PALMZ72_GPIO(BL_POWER, 0);
+ mdelay(50);
+
/* disable GPIO reset - DO NOT REMOVE! */
PCFR &= PCFR_GPR_EN;
@@ -77,6 +81,9 @@
SET_PALMZ72_GPIO(SCREEN,1);
/* Turn on USB power */
SET_PALMZ72_GPIO(USB_POWER,1);
+ /* Hack - something seems to switch it off in-between */
+ SET_PALMZ72_GPIO(BL_POWER, 1);
+ mdelay(50);
return 0;
}
Modified: linux4palm/linux/trunk/drivers/i2c/chips/i2c-ov9640.c
===================================================================
--- linux4palm/linux/trunk/drivers/i2c/chips/i2c-ov9640.c 2007-06-26 10:15:26 UTC (rev 1076)
+++ linux4palm/linux/trunk/drivers/i2c/chips/i2c-ov9640.c 2007-06-26 10:48:55 UTC (rev 1077)
@@ -337,41 +337,6 @@
mdelay(100);
}
-/***********************************************************************
- *
- * OV9640 Functions
- *
- ***********************************************************************/
-static void ov9640_gpio_init()
-{
-
- set_GPIO_mode(27 | GPIO_ALT_FN_3_IN); /* CIF_DD[0] */
- set_GPIO_mode(114 | GPIO_ALT_FN_1_IN); /* CIF_DD[1] */
- set_GPIO_mode(51 | GPIO_ALT_FN_1_IN); /* CIF_DD[2] */
- set_GPIO_mode(115 | GPIO_ALT_FN_2_IN); /* CIF_DD[3] */
- set_GPIO_mode(95 | GPIO_ALT_FN_2_IN); /* CIF_DD[4] */
- set_GPIO_mode(94 | GPIO_ALT_FN_2_IN); /* CIF_DD[5] */
- set_GPIO_mode(17 | GPIO_ALT_FN_2_IN); /* CIF_DD[6] */
- set_GPIO_mode(108 | GPIO_ALT_FN_1_IN); /* CIF_DD[7] */
- set_GPIO_mode(23 | GPIO_ALT_FN_1_OUT); /* CIF_MCLK */
- set_GPIO_mode(54 | GPIO_ALT_FN_3_IN); /* CIF_PCLK */
- set_GPIO_mode(85 | GPIO_ALT_FN_3_IN); /* CIF_LV */
- set_GPIO_mode(84 | GPIO_ALT_FN_3_IN); /* CIF_FV */
- set_GPIO_mode(50 | GPIO_OUT); /*CIF_PD */
- set_GPIO_mode(19 | GPIO_IN); /*CIF_RST */
-
-
- return;
-
-}
-
-/***********************************************************************
- *
- * end of OV9640 Functions
- *
- ***********************************************************************/
-
-
int i2c_ov9640_init(void)
{
int res;
Modified: linux4palm/linux/trunk/drivers/i2c/chips/i2c-ov9640.h
===================================================================
--- linux4palm/linux/trunk/drivers/i2c/chips/i2c-ov9640.h 2007-06-26 10:15:26 UTC (rev 1076)
+++ linux4palm/linux/trunk/drivers/i2c/chips/i2c-ov9640.h 2007-06-26 10:48:55 UTC (rev 1077)
@@ -40,5 +40,7 @@
int blockaddr; /* current using block address. */
unsigned long last_updated; /* In jiffies */
};
+void ov9640_gpio_init(void);
+
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
