r1221 - trunk/src/target/kernel/patches

laforge at sita.openmoko.org laforge at sita.openmoko.org
Fri Mar 2 18:47:54 CET 2007


Author: laforge
Date: 2007-03-02 18:47:53 +0100 (Fri, 02 Mar 2007)
New Revision: 1221

Modified:
   trunk/src/target/kernel/patches/gta01-core.patch
   trunk/src/target/kernel/patches/gta01-pcf50606.patch
Log:
* move 'gta01-pm-gps' and 'gta01-pm-bt' to the pcf50606 driver, where
  they can be put into the correct place in the device tree for suspend/resume
* declare them as static in that process


Modified: trunk/src/target/kernel/patches/gta01-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-core.patch	2007-03-02 16:35:58 UTC (rev 1220)
+++ trunk/src/target/kernel/patches/gta01-core.patch	2007-03-02 17:47:53 UTC (rev 1221)
@@ -1,10 +1,10 @@
 This patch adds support for the FIC GTA01 machine type to the ARM port of
 the linux kernel.
 
-Index: linux-2.6.20/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.20.1/arch/arm/mach-s3c2410/Kconfig
 ===================================================================
---- linux-2.6.20.orig/arch/arm/mach-s3c2410/Kconfig	2007-02-20 18:43:31.000000000 +0100
-+++ linux-2.6.20/arch/arm/mach-s3c2410/Kconfig	2007-02-20 18:56:10.000000000 +0100
+--- linux-2.6.20.1.orig/arch/arm/mach-s3c2410/Kconfig	2007-03-02 18:23:34.000000000 +0100
++++ linux-2.6.20.1/arch/arm/mach-s3c2410/Kconfig	2007-03-02 18:39:51.000000000 +0100
 @@ -86,6 +86,14 @@
  	help
  	   Say Y here if you are using the Armzone QT2410
@@ -20,10 +20,10 @@
  config ARCH_S3C2440
  	bool "SMDK2440"
  	select CPU_S3C2440
-Index: linux-2.6.20/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6.20.1/arch/arm/mach-s3c2410/Makefile
 ===================================================================
---- linux-2.6.20.orig/arch/arm/mach-s3c2410/Makefile	2007-02-20 18:43:31.000000000 +0100
-+++ linux-2.6.20/arch/arm/mach-s3c2410/Makefile	2007-02-20 18:43:31.000000000 +0100
+--- linux-2.6.20.1.orig/arch/arm/mach-s3c2410/Makefile	2007-03-02 18:23:34.000000000 +0100
++++ linux-2.6.20.1/arch/arm/mach-s3c2410/Makefile	2007-03-02 18:39:51.000000000 +0100
 @@ -89,5 +89,6 @@
  obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
  obj-$(CONFIG_MACH_VSTMS)	+= mach-vstms.o
@@ -31,11 +31,11 @@
 +obj-$(CONFIG_MACH_GTA01)	+= mach-gta01.o
  
  obj-$(CONFIG_MACH_SMDK)		+= common-smdk.o
-Index: linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6.20.1/arch/arm/mach-s3c2410/mach-gta01.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c	2007-02-20 18:57:42.000000000 +0100
-@@ -0,0 +1,520 @@
++++ linux-2.6.20.1/arch/arm/mach-s3c2410/mach-gta01.c	2007-03-02 18:40:31.000000000 +0100
+@@ -0,0 +1,506 @@
 +/*
 + * linux/arch/arm/mach-s3c2410/mach-gta01.c
 + *
@@ -473,18 +473,10 @@
 +	.resource	= gta01_button_resources,
 +};
 +
-+struct platform_device gta01_pm_gsm_dev = {
++static struct platform_device gta01_pm_gsm_dev = {
 +	.name		="gta01-pm-gsm",
 +};
 +
-+struct platform_device gta01_pm_gps_dev = {
-+	.name		="gta01-pm-gps",
-+};
-+
-+struct platform_device gta01_pm_bt_dev = {
-+	.name		="gta01-pm-bt",
-+};
-+
 +/* USB */
 +static struct s3c2410_hcd_info gta01_usb_info = {
 +	.port[0]	= {
@@ -535,14 +527,8 @@
 +	platform_device_register(&gta01_bl_dev);
 +	platform_device_register(&gta01_button_dev);
 +	platform_device_register(&gta01_pm_gsm_dev);
-+	platform_device_register(&gta01_pm_gps_dev);
 +
-+	if (system_rev == GTA01Bv2_SYSTEM_REV ||
-+	    system_rev == GTA01Bv3_SYSTEM_REV)
-+		platform_device_register(&gta01_pm_bt_dev);
-+
 +	s3c2410_pm_init();
-+
 +}
 +
 +MACHINE_START(GTA01, "GTA01")
@@ -556,10 +542,10 @@
 +MACHINE_END
 +
 +
-Index: linux-2.6.20/include/asm-arm/arch-s3c2410/gta01.h
+Index: linux-2.6.20.1/include/asm-arm/arch-s3c2410/gta01.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/include/asm-arm/arch-s3c2410/gta01.h	2007-02-20 18:43:31.000000000 +0100
++++ linux-2.6.20.1/include/asm-arm/arch-s3c2410/gta01.h	2007-03-02 18:39:51.000000000 +0100
 @@ -0,0 +1,60 @@
 +#ifndef _GTA01_H
 +#define _GTA01_H

Modified: trunk/src/target/kernel/patches/gta01-pcf50606.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-pcf50606.patch	2007-03-02 16:35:58 UTC (rev 1220)
+++ trunk/src/target/kernel/patches/gta01-pcf50606.patch	2007-03-02 17:47:53 UTC (rev 1221)
@@ -3,8 +3,8 @@
 Index: linux-2.6.20.1/drivers/i2c/chips/pcf50606.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/drivers/i2c/chips/pcf50606.c	2007-03-01 18:43:27.000000000 +0100
-@@ -0,0 +1,1590 @@
++++ linux-2.6.20.1/drivers/i2c/chips/pcf50606.c	2007-03-02 18:41:31.000000000 +0100
+@@ -0,0 +1,1613 @@
 +/* Philips PCF50606 Power Management Unit (PMU) driver
 + *
 + * (C) 2006 by OpenMoko, Inc.
@@ -48,6 +48,7 @@
 +#include <linux/miscdevice.h>
 +#include <linux/input.h>
 +#include <linux/sched.h>
++#include <linux/platform_device.h>
 +#include <linux/pcf50606.h>
 +
 +#include <asm/apm.h>
@@ -1329,6 +1330,18 @@
 + * Input device
 + ***********************************************************************/
 +
++#ifdef CONFIG_MACH_GTA01
++/* We currently place those platform devices here to make sure the device
++ * suspend/resume order is correct */
++static struct platform_device gta01_pm_gps_dev = {
++	.name		="gta01-pm-gps",
++};
++
++static struct platform_device gta01_pm_bt_dev = {
++	.name		="gta01-pm-bt",
++};
++#endif
++
 +static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
 +{
 +	struct i2c_client *new_client;
@@ -1436,6 +1449,16 @@
 +
 +	apm_get_power_status = pcf50606_get_power_status;
 +
++#ifdef CONFIG_MACH_GTA01
++	gta01_pm_bt_dev.dev.parent = &new_client->dev;
++	gta01_pm_gps_dev.dev.parent = &new_client->dev;
++	if (system_rev == GTA01Bv2_SYSTEM_REV ||
++	    system_rev == GTA01Bv3_SYSTEM_REV)
++		platform_device_register(&gta01_pm_bt_dev);
++
++	platform_device_register(&gta01_pm_gps_dev);
++#endif
++
 +	return 0;
 +exit_misc:
 +	misc_deregister(&pcf50606_wdt_miscdev);
@@ -1598,7 +1621,7 @@
 Index: linux-2.6.20.1/drivers/i2c/chips/pcf50606.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/drivers/i2c/chips/pcf50606.h	2007-02-26 00:46:55.000000000 +0100
++++ linux-2.6.20.1/drivers/i2c/chips/pcf50606.h	2007-03-02 17:33:25.000000000 +0100
 @@ -0,0 +1,259 @@
 +#ifndef _PCF50606_H
 +#define _PCF50606_H
@@ -1861,8 +1884,8 @@
 +
 Index: linux-2.6.20.1/drivers/i2c/chips/Kconfig
 ===================================================================
---- linux-2.6.20.1.orig/drivers/i2c/chips/Kconfig	2007-02-26 00:46:47.000000000 +0100
-+++ linux-2.6.20.1/drivers/i2c/chips/Kconfig	2007-02-26 00:46:56.000000000 +0100
+--- linux-2.6.20.1.orig/drivers/i2c/chips/Kconfig	2007-03-02 17:32:22.000000000 +0100
++++ linux-2.6.20.1/drivers/i2c/chips/Kconfig	2007-03-02 17:33:25.000000000 +0100
 @@ -36,6 +36,17 @@
  	  This driver can also be built as a module.  If so, the module
  	  will be called eeprom.
@@ -1883,8 +1906,8 @@
  	depends on I2C && EXPERIMENTAL
 Index: linux-2.6.20.1/drivers/i2c/chips/Makefile
 ===================================================================
---- linux-2.6.20.1.orig/drivers/i2c/chips/Makefile	2007-02-26 00:46:47.000000000 +0100
-+++ linux-2.6.20.1/drivers/i2c/chips/Makefile	2007-02-26 00:46:56.000000000 +0100
+--- linux-2.6.20.1.orig/drivers/i2c/chips/Makefile	2007-03-02 17:32:22.000000000 +0100
++++ linux-2.6.20.1/drivers/i2c/chips/Makefile	2007-03-02 17:33:25.000000000 +0100
 @@ -8,6 +8,7 @@
  obj-$(CONFIG_SENSORS_MAX6875)	+= max6875.o
  obj-$(CONFIG_SENSORS_M41T00)	+= m41t00.o
@@ -1895,8 +1918,8 @@
  obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o
 Index: linux-2.6.20.1/include/linux/i2c-id.h
 ===================================================================
---- linux-2.6.20.1.orig/include/linux/i2c-id.h	2007-02-26 00:46:55.000000000 +0100
-+++ linux-2.6.20.1/include/linux/i2c-id.h	2007-02-26 00:46:56.000000000 +0100
+--- linux-2.6.20.1.orig/include/linux/i2c-id.h	2007-03-02 17:33:24.000000000 +0100
++++ linux-2.6.20.1/include/linux/i2c-id.h	2007-03-02 17:33:25.000000000 +0100
 @@ -159,6 +159,7 @@
  #define I2C_DRIVERID_FSCHER 1046
  #define I2C_DRIVERID_W83L785TS 1047
@@ -1908,7 +1931,7 @@
 Index: linux-2.6.20.1/include/linux/pcf50606.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/include/linux/pcf50606.h	2007-02-26 00:46:56.000000000 +0100
++++ linux-2.6.20.1/include/linux/pcf50606.h	2007-03-02 17:33:25.000000000 +0100
 @@ -0,0 +1,55 @@
 +#ifndef _LINUX_PCF50606_H
 +#define _LINUX_PCF50606_H





More information about the commitlog mailing list