Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r3984 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
2. r3985 - trunk/src/target/opkg ([EMAIL PROTECTED])
3. r3986 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
4. r3987 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
5. r3988 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
6. r3989 - in trunk/src/target/gsm: include/libgsmd src/util
([EMAIL PROTECTED])
7. r3990 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2008-01-30 12:34:15 +0100 (Wed, 30 Jan 2008)
New Revision: 3984
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: silence debug output if not wanted (set MOKO_DEBUG environment variable).
closes #1203
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-01-30
10:34:43 UTC (rev 3983)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-01-30
11:34:15 UTC (rev 3984)
@@ -81,6 +81,8 @@
#define BIT_TEST( bitmask, bit ) \
( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) *
8))) )
+static gboolean moko_debug = TRUE;
+
GPollFD input_fd[10];
int max_input_fd = 0;
@@ -286,6 +288,10 @@
if ( error ) g_debug( "gconf error: %s", error->message );
neod_buttonactions_powersave_reset();
+
+ moko_debug = getenv( "MOKO_DEBUG" );
+ g_debug( "setting debug output to %s", moko_debug ? "true" : "false" );
+
return TRUE;
}
@@ -312,7 +318,7 @@
{
struct input_event event;
int size = read( input_fd[i].fd, &event, sizeof( struct
input_event ) );
- if ( getenv( "MOKO_DEBUG" ) )
+ if ( moko_debug )
{
g_debug( "read %d bytes from fd %d", size, input_fd[i].fd );
g_debug( "input event = ( %0x, %0x, %0x )", event.type,
event.code, event.value );
@@ -321,12 +327,12 @@
{
if ( event.value == 1 ) /* pressed */
{
- g_debug( "triggering aux timer" );
+ if ( moko_debug ) g_debug( "triggering aux timer" );
aux_timer = g_timeout_add_seconds( 1, (GSourceFunc)
neod_buttonactions_aux_timeout, (gpointer)1 );
}
else if ( event.value == 0 ) /* released */
{
- g_debug( "resetting aux timer" );
+ if ( moko_debug ) g_debug( "resetting aux timer" );
if ( aux_timer != -1 )
{
g_source_remove( aux_timer );
@@ -340,12 +346,12 @@
{
if ( event.value == 1 ) /* pressed */
{
- g_debug( "triggering power timer" );
+ if ( moko_debug ) g_debug( "triggering power timer" );
power_timer = g_timeout_add_seconds( 1, (GSourceFunc)
neod_buttonactions_power_timeout, (gpointer)1 );
}
else if ( event.value == 0 ) /* released */
{
- g_debug( "resetting power timer" );
+ if ( moko_debug ) g_debug( "resetting power timer" );
if ( power_timer != -1 )
{
g_source_remove( power_timer );
@@ -359,12 +365,12 @@
{
if ( event.value == 1 ) /* pressed */
{
- g_debug( "stylus pressed" );
+ if ( moko_debug ) g_debug( "stylus pressed" );
neod_buttonactions_sound_play( "touchscreen" );
}
else if ( event.value == 0 ) /* released */
{
- g_debug( "stylus released" );
+ if ( moko_debug ) g_debug( "stylus released" );
}
neod_buttonactions_powersave_reset();
if ( power_state != NORMAL )
@@ -378,13 +384,13 @@
{
if ( event.value == 1 ) /* pressed */
{
- g_debug( "charger IN" );
+ if ( moko_debug ) g_debug( "charger IN" );
neod_buttonactions_sound_play( "touchscreen" );
g_spawn_command_line_async( "dbus-send --system
/org/freedesktop/PowerManagement
org.freedesktop.PowerManagement.ChargerConnected", NULL );
}
else if ( event.value == 0 ) /* released */
{
- g_debug( "charger OUT" );
+ if ( moko_debug ) g_debug( "charger OUT" );
g_spawn_command_line_async( "dbus-send --system
/org/freedesktop/PowerManagement
org.freedesktop.PowerManagement.ChargerDisconnected", NULL );
}
neod_buttonactions_powersave_reset();
@@ -399,12 +405,12 @@
{
if ( event.value == 0 ) /* inserted */
{
- g_debug( "headphones IN" );
+ if ( moko_debug ) g_debug( "headphones IN" );
g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Headphones\"", NULL );
}
else if ( event.value == 1 ) /* released */
{
- g_debug( "headphones OUT" );
+ if ( moko_debug ) g_debug( "headphones OUT" );
g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Stereo Speakers\"", NULL );
}
neod_buttonactions_powersave_reset();
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-01-30 17:40:24 +0100 (Wed, 30 Jan 2008)
New Revision: 3985
Modified:
trunk/src/target/opkg/opkg_install.c
trunk/src/target/opkg/pkg.c
trunk/src/target/opkg/pkg.h
trunk/src/target/opkg/pkg_parse.c
Log:
opkg: add a status flag to record if the package was automatically installed to
satisfy a dependency
Modified: trunk/src/target/opkg/opkg_install.c
===================================================================
--- trunk/src/target/opkg/opkg_install.c 2008-01-30 11:34:15 UTC (rev
3984)
+++ trunk/src/target/opkg/opkg_install.c 2008-01-30 16:40:24 UTC (rev
3985)
@@ -413,6 +413,9 @@
&& (dep->state_status != SS_UNPACKED)) {
opkg_message(conf, OPKG_DEBUG2,"Function: %s calling
opkg_install_pkg \n",__FUNCTION__);
err = opkg_install_pkg(conf, dep,0);
+ /* mark this package as having been automatically installed to
+ * satisfy a dependancy */
+ dep->auto_installed = 1;
if (err) {
pkg_vec_free(depends);
return err;
Modified: trunk/src/target/opkg/pkg.c
===================================================================
--- trunk/src/target/opkg/pkg.c 2008-01-30 11:34:15 UTC (rev 3984)
+++ trunk/src/target/opkg/pkg.c 2008-01-30 16:40:24 UTC (rev 3985)
@@ -558,6 +558,13 @@
temp[0]='\0';
snprintf(temp, (strlen(pkg->architecture)+17),
"Architecture: %s\n", pkg->architecture);
}
+ } else if (strcasecmp(field, "Auto-Installed") == 0) {
+ /* Auto-Installed flag */
+ if (pkg->auto_installed) {
+ char * s = "Auto-Installed: yes\n";
+ temp = (char *)realloc(temp, strlen(s) + 1);
+ strcpy (temp, s);
+ }
} else {
goto UNKNOWN_FMT_FIELD;
}
@@ -1017,6 +1024,7 @@
pkg_print_field(pkg, file, "Architecture");
pkg_print_field(pkg, file, "Conffiles");
pkg_print_field(pkg, file, "Installed-Time");
+ pkg_print_field(pkg, file, "Auto-Installed");
fputs("\n", file);
}
Modified: trunk/src/target/opkg/pkg.h
===================================================================
--- trunk/src/target/opkg/pkg.h 2008-01-30 11:34:15 UTC (rev 3984)
+++ trunk/src/target/opkg/pkg.h 2008-01-30 16:40:24 UTC (rev 3985)
@@ -176,6 +176,10 @@
int arch_priority;
/* Adding this flag, to "force" opkg to choose a "provided_by_hand" package,
if there are multiple choice */
int provided_by_hand;
+
+ /* this flag specifies whether the package was installed to satisfy
another
+ * package's dependancies */
+ int auto_installed;
};
pkg_t *pkg_new(void);
Modified: trunk/src/target/opkg/pkg_parse.c
===================================================================
--- trunk/src/target/opkg/pkg_parse.c 2008-01-30 11:34:15 UTC (rev 3984)
+++ trunk/src/target/opkg/pkg_parse.c 2008-01-30 16:40:24 UTC (rev 3985)
@@ -267,6 +267,15 @@
case 'A':
if(isGenericFieldType("Architecture:", *lines))
pkg->architecture = parseGenericFieldType("Architecture",
*lines);
+ else if(isGenericFieldType("Auto-Installed:", *lines)) {
+ char *auto_installed_value;
+ auto_installed_value = parseGenericFieldType("Auto-Installed:",
*lines);
+ if (strcmp(auto_installed_value, "yes") == 0) {
+ pkg->auto_installed = 1;
+ }
+ free(auto_installed_value);
+ pkg->architecture = parseGenericFieldType("Auto-Installed",
*lines);
+ }
break;
case 'F':
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-30 22:53:09 +0100 (Wed, 30 Jan 2008)
New Revision: 3986
Added:
trunk/src/target/u-boot/patches/loadenv.patch
Modified:
trunk/src/target/u-boot/patches/series
Log:
If we have a writeable environment in persistent storage and
CONFIG_CMD_LOADENV is set, add the command "loadenv" to load a new environment.
This is to be used for getting access to the persistent environment stored in
NAND after we've booted the GTA02 from NOR.
This patch also adds a command "defaultenv" that resets the environment to the
hard-coded default settings, which is also useful without "loadenv".
Note that we don't scan the new environment for changes in settings (e.g.,
"stdout"). This is to ensure that we don't accidently cut ourselves off during
environmental surgery.
Signed-off-by: Werner Almesberger <[EMAIL PROTECTED]>
loadenv.patch:
- common/cmd_nvedit.c (do_loadenv): load the environment from persistent
storage (without updating settings derived from the environment)
- common/cmd_nvedit.c (do_defaultenv): reset the environment to default
settings
- include/configs/neo1973_gta02.h: added CONFIG_CMD_LOADENV and
CONFIG_CMD_DEFAULTENV
series: added loadenv.patch and also gta02-bootmenu.patch
Added: trunk/src/target/u-boot/patches/loadenv.patch
===================================================================
--- trunk/src/target/u-boot/patches/loadenv.patch 2008-01-30 16:40:24 UTC
(rev 3985)
+++ trunk/src/target/u-boot/patches/loadenv.patch 2008-01-30 21:53:09 UTC
(rev 3986)
@@ -0,0 +1,101 @@
+If we have a writeable environment in persistent storage and
+CONFIG_CMD_LOADENV is set, add the command "loadenv" to load a new environment.
+
+This is to be used for getting access to the persistent environment stored in
+NAND after we've booted the GTA02 from NOR.
+
+This patch also adds a command "defaultenv" that resets the environment to the
+hard-coded default settings, which is also useful without "loadenv".
+
+Note that we don't scan the new environment for changes in settings (e.g.,
+"stdout"). This is to ensure that we don't accidently cut ourselves off during
+environmental surgery.
+
+Signed-off-by: Werner Almesberger <[EMAIL PROTECTED]>
+
+loadenv.patch:
+- common/cmd_nvedit.c (do_loadenv): load the environment from persistent
+ storage (without updating settings derived from the environment)
+- common/cmd_nvedit.c (do_defaultenv): reset the environment to default
+ settings
+- include/configs/neo1973_gta02.h: added CONFIG_CMD_LOADENV and
+ CONFIG_CMD_DEFAULTENV
+
+Index: u-boot/common/cmd_nvedit.c
+===================================================================
+--- u-boot.orig/common/cmd_nvedit.c
++++ u-boot/common/cmd_nvedit.c
+@@ -563,7 +563,33 @@
+ return (saveenv() ? 1 : 0);
+ }
+
+-#endif
++#ifdef CONFIG_CMD_LOADENV
++int do_loadenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
++{
++ extern char *env_name_spec;
++
++ printf("Loading Environment from %s...\n", env_name_spec);
++
++ if (env_init())
++ return 1;
++ env_relocate();
++ return 0;
++}
++#endif /* CONFIG_CMD_LOADENV */
++
++#endif /* we have a writeable environment */
++
++#ifdef CONFIG_CMD_DEFAULTENV
++int do_defaultenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
++{
++ extern char *env_name_spec;
++
++ printf("Environment reset to default settings ...\n");
++
++ default_env();
++ return 0;
++}
++#endif /* CONFIG_CMD_DEFAULTENV */
+
+
+ /************************************************************************
+@@ -615,7 +641,23 @@
+ NULL
+ );
+
+-#endif
++#ifdef CONFIG_CMD_LOADENV
++U_BOOT_CMD(
++ loadenv, 1, 0, do_loadenv,
++ "loadenv - load environment variables from persistent storage\n",
++ NULL
++);
++#endif /* CONFIG_CMD_LOADENV */
++
++#endif /* we have a writeable environment */
++
++#ifdef CONFIG_CMD_DEFAULTENV
++U_BOOT_CMD(
++ defaultenv, 1, 0, do_defaultenv,
++ "defaultenv - reset environment to default settings\n",
++ NULL
++);
++#endif /* CONFIG_CMD_DEFAULTENV */
+
+ #if defined(CONFIG_CMD_ASKENV)
+
+Index: u-boot/include/configs/neo1973_gta02.h
+===================================================================
+--- u-boot.orig/include/configs/neo1973_gta02.h
++++ u-boot/include/configs/neo1973_gta02.h
+@@ -192,6 +192,9 @@
+ "stderr=usbtty\0stdout=usbtty\0stdin=usbtty\0" \
+ "bootargs_base=rootfstype=jffs2 root=/dev/mtdblock6
console=ttySAC2,115200 console=tty0 loglevel=8\0" \
+ ""
++#define CONFIG_CMD_LOADENV
++#define CONFIG_CMD_DEFAULTENV
++
+
+ /*-----------------------------------------------------------------------
+ * Physical Memory Map
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2008-01-30 16:40:24 UTC (rev
3985)
+++ trunk/src/target/u-boot/patches/series 2008-01-30 21:53:09 UTC (rev
3986)
@@ -73,6 +73,7 @@
usb-vendor.patch
gta02-splash.patch
+gta02-bootmenu.patch
gta02-nor.patch
# need to find out how upstream feels about this one
@@ -88,5 +89,8 @@
# keep this here until we have time to bubble it into the stack
nor-default-env.patch
+# let's see what upstream thinks about this
+loadenv.patch
+
# remove soonish
build-kludge.patch
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-30 23:24:41 +0100 (Wed, 30 Jan 2008)
New Revision: 3987
Modified:
trunk/src/target/u-boot/patches/loadenv.patch
Log:
"quilt refresh" before "svn commit" would help to improve the correctness
of my patches :-(
loadenv.patch:
- common/cmd_nvedit.c (do_loadenv): directly use "env_relocate_spec" and update
gd->env_addr
- common/cmd_nvedit.c (do_defaultenv): nicer progress output
Modified: trunk/src/target/u-boot/patches/loadenv.patch
===================================================================
--- trunk/src/target/u-boot/patches/loadenv.patch 2008-01-30 21:53:09 UTC
(rev 3986)
+++ trunk/src/target/u-boot/patches/loadenv.patch 2008-01-30 22:24:41 UTC
(rev 3987)
@@ -25,7 +25,7 @@
===================================================================
--- u-boot.orig/common/cmd_nvedit.c
+++ u-boot/common/cmd_nvedit.c
-@@ -563,7 +563,33 @@
+@@ -563,7 +563,36 @@
return (saveenv() ? 1 : 0);
}
@@ -33,13 +33,16 @@
+#ifdef CONFIG_CMD_LOADENV
+int do_loadenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
++ extern void env_relocate_spec(void);
+ extern char *env_name_spec;
++ extern env_t *env_ptr;
+
+ printf("Loading Environment from %s...\n", env_name_spec);
+
+ if (env_init())
+ return 1;
-+ env_relocate();
++ env_relocate_spec();
++ gd->env_addr = (ulong) &env_ptr->data;
+ return 0;
+}
+#endif /* CONFIG_CMD_LOADENV */
@@ -51,7 +54,7 @@
+{
+ extern char *env_name_spec;
+
-+ printf("Environment reset to default settings ...\n");
++ printf("Environment reset to default settings\n");
+
+ default_env();
+ return 0;
@@ -60,7 +63,7 @@
/************************************************************************
-@@ -615,7 +641,23 @@
+@@ -615,7 +644,23 @@
NULL
);
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-31 01:54:32 +0100 (Thu, 31 Jan 2008)
New Revision: 3988
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
Add on/off GSM download gpio. If we don't upgrade gsm firmware, we need to
set GPIO output high. It will affect the sound quality, when we set GPIO low.
From: Willie <[EMAIL PROTECTED]>
gta02-core.patch:
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c (gsm_read, gsm_write): added
GTA02-specific handling of the GSM download signal
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c (gta01_gsm_sysfs_entries): added
dev_attr_download
- include/asm-arm/arch-s3c2410/gta02.h (GTA02v4_GPIO_nDL_GSM): renamed to
GTA02_GPIO_nDL_GSM
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2008-01-30 22:24:41 UTC (rev 3987)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2008-01-31 00:54:32 UTC (rev 3988)
@@ -895,7 +895,7 @@
+#define GTA02_GPIO_INT0 S3C2440_GPJ3 /* v2 + v3 + v4 only */
+#define GTA02_GPIO_nGSM_EN S3C2440_GPJ4
+#define GTA02_GPIO_3D_RESET S3C2440_GPJ5
-+#define GTA02v4_GPIO_nDL_GSM S3C2440_GPJ6 /* v4 only */
++#define GTA02_GPIO_nDL_GSM S3C2440_GPJ6 /* v4 + v5 only */
+#define GTA02_GPIO_WLAN_GPIO0 S3C2440_GPJ7
+#define GTA02v1_GPIO_BAT_ID S3C2440_GPJ8
+#define GTA02_GPIO_KEEPACT S3C2440_GPJ8
@@ -1085,7 +1085,7 @@
===================================================================
--- linux-2.6.24.orig/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+++ linux-2.6.24/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -19,8 +19,14 @@
+@@ -19,8 +19,15 @@
#include <linux/errno.h>
#include <asm/hardware.h>
@@ -1095,13 +1095,33 @@
+#ifdef CONFIG_MACH_NEO1973_GTA02
+#include <asm/arch/gta02.h>
+#include <linux/pcf50633.h>
++#include <asm/arch/regs-gpioj.h>
+#endif
+
struct gta01pm_priv {
int gpio_ngsm_en;
struct console *con;
-@@ -70,27 +76,51 @@
+@@ -54,8 +61,16 @@
+ if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
+ goto out_1;
+ } else if (!strcmp(attr->attr.name, "download")) {
+- if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
+- goto out_1;
++#ifdef CONFIG_MACH_NEO1973_GTA01
++ if (machine_is_neo1973_gta01())
++ if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
++ goto out_1;
++#endif
++#ifdef CONFIG_MACH_NEO1973_GTA02
++ if (machine_is_neo1973_gta02())
++ if (s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
++ goto out_1;
++#endif
+ }
+ return strlcpy(buf, "0\n", 3);
+@@ -70,32 +85,63 @@
+
if (!strcmp(attr->attr.name, "power_on")) {
if (on) {
- dev_info(dev, "powering up GSM, thus disconnecting "
@@ -1158,7 +1178,29 @@
}
} else if (!strcmp(attr->attr.name, "reset")) {
s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-@@ -158,8 +188,16 @@
+ } else if (!strcmp(attr->attr.name, "download")) {
+- s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
++#ifdef CONFIG_MACH_NEO1973_GTA01
++ if (machine_is_neo1973_gta01())
++ s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
++#endif
++#ifdef CONFIG_MACH_NEO1973_GTA02
++ if (machine_is_neo1973_gta02())
++ s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, on);
++#endif
+ }
+
+ return count;
+@@ -134,7 +180,7 @@
+ static struct attribute *gta01_gsm_sysfs_entries[] = {
+ &dev_attr_power_on.attr,
+ &dev_attr_reset.attr,
+- NULL,
++ &dev_attr_download.attr,
+ NULL
+ };
+
+@@ -158,8 +204,16 @@
gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
break;
@@ -1176,7 +1218,7 @@
"some PM features not available!!!\n",
system_rev);
break;
-@@ -175,9 +213,13 @@
+@@ -175,9 +229,13 @@
break;
}
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-01-31 08:05:30 +0100 (Thu, 31 Jan 2008)
New Revision: 3989
Modified:
trunk/src/target/gsm/include/libgsmd/misc.h
trunk/src/target/gsm/src/util/shell.c
Log:
gsmd: network registration query status (Paulius Zaleckas)
Modified: trunk/src/target/gsm/include/libgsmd/misc.h
===================================================================
--- trunk/src/target/gsm/include/libgsmd/misc.h 2008-01-31 00:54:32 UTC (rev
3988)
+++ trunk/src/target/gsm/include/libgsmd/misc.h 2008-01-31 07:05:30 UTC (rev
3989)
@@ -41,6 +41,7 @@
extern int lgsm_netreg_register(struct lgsm_handle *lh,
gsmd_oper_numeric oper);
extern int lgsm_netreg_deregister(struct lgsm_handle *lh);
+extern int lgsm_netreg_query(struct lgsm_handle *lh);
enum lgsm_netreg_state {
LGSM_NETREG_ST_NOTREG = 0,
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2008-01-31 00:54:32 UTC (rev
3988)
+++ trunk/src/target/gsm/src/util/shell.c 2008-01-31 07:05:30 UTC (rev
3989)
@@ -527,6 +527,7 @@
"\tN\tPrint current operator in numeric\n"
"\tL\tList available operators\n"
"\tQ\tRead signal quality\n"
+ "\tnr\tQuery network registration\n"
"\tS\tSleep (S[=second], default 5)\n"
"\tT\tSend DTMF Tone\n"
"\tn\tPrint subscriber numbers\n"
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-31 10:06:48 +0100 (Thu, 31 Jan 2008)
New Revision: 3990
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
From: Willie <[EMAIL PROTECTED]>
define_gta02A5.patch
Add GTAv5 system revision.
gta02-core.patch:
- arch/arm/mach-s3c2440/mach-gta02.c (mangle_pmu_pdata_by_system_rev,
gta02_glamo_mmc_set_power), arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
(gsm_write, gta01_gsm_probe): handle GTA02v5_SYSTEM_REV
- include/asm/arch-s3c2410/gta02.h: added definition of GTA02v5_SYSTEM_REV as
0x350
Acked-by: Werner Almesberger <[EMAIL PROTECTED]>
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2008-01-31 07:05:30 UTC (rev 3989)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2008-01-31 09:06:48 UTC (rev 3990)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.24/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,821 @@
+@@ -0,0 +1,822 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
+ *
@@ -259,6 +259,7 @@
+ case GTA02v2_SYSTEM_REV:
+ case GTA02v3_SYSTEM_REV:
+ case GTA02v4_SYSTEM_REV:
++ case GTA02v5_SYSTEM_REV:
+ /* we need to keep the 1.8V going since this is the SDRAM
+ * self-refresh voltage */
+ gta02_pcf_pdata.rails[PCF50633_REGULATOR_DOWN2].flags =
@@ -609,7 +610,7 @@
+ break;
+ case GTA02v3_SYSTEM_REV:
+ case GTA02v4_SYSTEM_REV:
-+/* case GTA02v5_SYSTEM_REV: */
++ case GTA02v5_SYSTEM_REV:
+ /* depend on pcf50633 driver init */
+ if (!pcf50633_global)
+ while (!pcf50633_global)
@@ -828,7 +829,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.24/include/asm-arm/arch-s3c2410/gta02.h
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,98 @@
+#ifndef _GTA02_H
+#define _GTA02_H
+
@@ -840,6 +841,7 @@
+#define GTA02v2_SYSTEM_REV 0x00000320
+#define GTA02v3_SYSTEM_REV 0x00000330
+#define GTA02v4_SYSTEM_REV 0x00000340
++#define GTA02v5_SYSTEM_REV 0x00000350
+
+#define GTA02_GPIO_n3DL_GSM S3C2410_GPA13 /* v1 + v2 + v3 only */
+
@@ -1120,7 +1122,7 @@
}
return strlcpy(buf, "0\n", 3);
-@@ -70,32 +85,63 @@
+@@ -70,32 +85,65 @@
if (!strcmp(attr->attr.name, "power_on")) {
if (on) {
@@ -1142,6 +1144,7 @@
+ case GTA02v2_SYSTEM_REV:
+ case GTA02v3_SYSTEM_REV:
+ case GTA02v4_SYSTEM_REV:
++ case GTA02v5_SYSTEM_REV:
+ pcf50633_gpio_set(pcf50633_global,
+ PCF50633_GPIO2, 1);
+ break;
@@ -1157,6 +1160,7 @@
+ case GTA02v2_SYSTEM_REV:
+ case GTA02v3_SYSTEM_REV:
+ case GTA02v4_SYSTEM_REV:
++ case GTA02v5_SYSTEM_REV:
+ pcf50633_gpio_set(pcf50633_global,
+ PCF50633_GPIO2, 0);
+ break;
@@ -1191,7 +1195,7 @@
}
return count;
-@@ -134,7 +180,7 @@
+@@ -134,7 +182,7 @@
static struct attribute *gta01_gsm_sysfs_entries[] = {
&dev_attr_power_on.attr,
&dev_attr_reset.attr,
@@ -1200,7 +1204,7 @@
NULL
};
-@@ -158,8 +204,16 @@
+@@ -158,8 +206,17 @@
gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
break;
@@ -1209,6 +1213,7 @@
+ case GTA02v2_SYSTEM_REV:
+ case GTA02v3_SYSTEM_REV:
+ case GTA02v4_SYSTEM_REV:
++ case GTA02v5_SYSTEM_REV:
+ gta01_gsm.gpio_ngsm_en = 0;
+ break;
+#endif
@@ -1218,7 +1223,7 @@
"some PM features not available!!!\n",
system_rev);
break;
-@@ -175,9 +229,13 @@
+@@ -175,9 +232,13 @@
break;
}
@@ -1272,3 +1277,15 @@
-MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973");
+MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 GTA01");
MODULE_LICENSE("GPL");
+Index: linux-2.6.24/include/asm/arch-s3c2410/gta02.h
+===================================================================
+--- linux-2.6.24.orig/include/asm/arch-s3c2410/gta02.h
++++ linux-2.6.24/include/asm/arch-s3c2410/gta02.h
+@@ -9,6 +9,7 @@
+ #define GTA02v2_SYSTEM_REV 0x00000320
+ #define GTA02v3_SYSTEM_REV 0x00000330
+ #define GTA02v4_SYSTEM_REV 0x00000340
++#define GTA02v5_SYSTEM_REV 0x00000350
+
+ #define GTA02_GPIO_n3DL_GSM S3C2410_GPA13 /* v1 + v2 + v3 only */
+
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
