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. r2920 - in trunk/src/host/qemu-neo1973: gnokiigsm hw
([EMAIL PROTECTED])
2. r2921 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
3. r2922 -
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0
([EMAIL PROTECTED])
4. r2923 - trunk/src/host/qemu-neo1973 ([EMAIL PROTECTED])
5. r2924 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
6. r2925 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
7. r2926 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
8. r2927 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
9. r2928 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: andrew
Date: 2007-09-05 17:33:37 +0200 (Wed, 05 Sep 2007)
New Revision: 2920
Modified:
trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.h
trunk/src/host/qemu-neo1973/hw/neo1973.c
trunk/src/host/qemu-neo1973/hw/s3c.h
trunk/src/host/qemu-neo1973/hw/s3c2410.c
Log:
Scale the S3C ADC readings to natural values from a GTA01, fixes bug #736.
Take AT error constants from the specs.
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.h
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.h 2007-09-05 14:34:37 UTC
(rev 2919)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.h 2007-09-05 15:33:37 UTC
(rev 2920)
@@ -84,15 +84,14 @@
/* Definition of modem result codes - these are returned to "terminal"
numerically or as a string depending on the setting of S12 */
- /* FIX ME - Numeric values for everything except OK and ERROR
- are guesses as I've not got an AT reference handy. HAB */
-
#define MR_OK (0)
+#define MR_CONNECT (1)
#define MR_RING (2)
#define MR_NOCARRIER (3)
#define MR_ERROR (4)
-#define MR_CARRIER (5) /* guess */
-#define MR_CONNECT (6) /* guess */
+#define MR_CARRIER (5)
+#define MR_NODIALTONE (6)
#define MR_BUSY (7)
+#define MR_NOANSWER (8)
#endif /* _gnokii_data_at_emulator_h */
Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-09-05 14:34:37 UTC (rev
2919)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-09-05 15:33:37 UTC (rev
2920)
@@ -404,6 +404,12 @@
pcf_exton_set(s->pmu, 1);
}
+/* Typical touchscreen calibration values */
+static const int gta01_ts_scale[6] = {
+ 0, (90 - 960) * 256 / 1021, -90 * 256 * 32,
+ (940 - 75) * 256 / 1021, 0, 75 * 256 * 32,
+};
+
/* Board init. */
static void neo_init(int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
@@ -443,6 +449,8 @@
if (usb_enabled)
usb_device_attach(usb_bt_init(local_piconet));
+ s3c_adc_setscale(s->cpu->adc, gta01_ts_scale);
+
/* Setup initial (reset) machine state */
qemu_register_reset(neo_reset, s);
#if 0
Modified: trunk/src/host/qemu-neo1973/hw/s3c.h
===================================================================
--- trunk/src/host/qemu-neo1973/hw/s3c.h 2007-09-05 14:34:37 UTC (rev
2919)
+++ trunk/src/host/qemu-neo1973/hw/s3c.h 2007-09-05 15:33:37 UTC (rev
2920)
@@ -124,6 +124,7 @@
struct s3c_adc_state_s;
struct s3c_adc_state_s *s3c_adc_init(target_phys_addr_t base, qemu_irq irq,
qemu_irq tcirq);
+void s3c_adc_setscale(struct s3c_adc_state_s *adc, const int m[]);
struct s3c_i2c_state_s;
struct s3c_i2c_state_s *s3c_i2c_init(target_phys_addr_t base, qemu_irq irq);
Modified: trunk/src/host/qemu-neo1973/hw/s3c2410.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/s3c2410.c 2007-09-05 14:34:37 UTC (rev
2919)
+++ trunk/src/host/qemu-neo1973/hw/s3c2410.c 2007-09-05 15:33:37 UTC (rev
2920)
@@ -1643,6 +1643,7 @@
int input[8];
int in_idx;
int noise;
+ int scale[6];
uint16_t control;
uint16_t ts;
@@ -1680,12 +1681,16 @@
static void s3c_adc_tick(void *opaque)
{
struct s3c_adc_state_s *s = (struct s3c_adc_state_s *) opaque;
+ int sx, sy;
+
if (s->down) {
if ((s->ts & 3) == 3 && s->enable)
qemu_irq_raise(s->tcirq);
else if (s->enable && ((s->ts & (1 << 2)) || (s->ts & 3))) {
- s->xdata = (s->x >> 5) | (1 << 14) | ((s->ts & 3) << 12);
- s->ydata = (s->y >> 5) | (1 << 14) | ((s->ts & 3) << 12);
+ sx = s->x * s->scale[0] + s->y * s->scale[1] + s->scale[2];
+ sy = s->x * s->scale[3] + s->y * s->scale[4] + s->scale[5];
+ s->xdata = ((sx >> 13) & 0xfff) | (1 << 14) | ((s->ts & 3) << 12);
+ s->ydata = ((sy >> 13) & 0xfff) | (1 << 14) | ((s->ts & 3) << 12);
s->xdata ^= s->noise >> 1;
s->ydata ^= s->noise >> 2;
qemu_irq_raise(s->irq);
@@ -1846,6 +1851,11 @@
return s;
}
+void s3c_adc_setscale(struct s3c_adc_state_s *adc, const int m[])
+{
+ memcpy(adc->scale, m, 6 * sizeof(int));
+}
+
/* IIC-bus serial interface */
struct s3c_i2c_state_s {
i2c_slave slave;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-09-05 17:37:28 +0200 (Wed, 05 Sep 2007)
New Revision: 2921
Modified:
trunk/src/target/kernel/patches/gta02-core.patch
Log:
Implement GTA02 bluetooth power switching
Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch 2007-09-05 15:33:37 UTC
(rev 2920)
+++ trunk/src/target/kernel/patches/gta02-core.patch 2007-09-05 15:37:28 UTC
(rev 2921)
@@ -675,7 +675,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/gta02.h
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,28 @@
+#ifndef _GTA02_H
+#define _GTA02_H
+
@@ -694,6 +694,7 @@
+#define GTA02_GPIO_HOLD_KEY S3C2410_GPF7
+#define GTA02_GPIO_AUX_KEY S3C2410_GPF6
+#define GTA02_GPIO_JACK_INSERT S3C2410_GPF4
++#define GTA02_GPIO_BT_EN S3C2410_GPB6
+
+#define GTA02_IRQ_MODEM IRQ_EINT1
+#define GTA02_IRQ_3D IRQ_EINT12
@@ -733,15 +734,18 @@
===================================================================
--- linux-2.6.22.5-moko.orig/arch/arm/common/gta01_pm_bt.c
+++ linux-2.6.22.5-moko/arch/arm/common/gta01_pm_bt.c
-@@ -19,6 +19,7 @@
+@@ -19,22 +19,40 @@
#include <linux/pcf50606.h>
#include <asm/hardware.h>
+#include <asm/mach-types.h>
#include <asm/arch/gta01.h>
++#include <asm/arch/gta02.h>
- #define DRVMSG "FIC GTA01 (Neo1973) Bluetooth Power Management"
-@@ -27,11 +28,18 @@
+-#define DRVMSG "FIC GTA01 (Neo1973) Bluetooth Power Management"
++#define DRVMSG "FIC Neo1973 Bluetooth Power Management"
+
+ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
char *buf)
{
if (!strcmp(attr->attr.name, "power_on")) {
@@ -759,13 +763,27 @@
+ goto out_1;
+ break;
+ case MACH_TYPE_NEO1973_GTA02:
-+ /* FIXME: implementation using PCF50633 */
++ if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN))
++ goto out_1;
+ break;
+ }
} else if (!strcmp(attr->attr.name, "reset")) {
- if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
- goto out_1;
-@@ -48,17 +56,24 @@
+- if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
+- goto out_1;
++ switch (machine_arch_type) {
++ case MACH_TYPE_NEO1973_GTA01:
++ if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
++ goto out_1;
++ break;
++ case MACH_TYPE_NEO1973_GTA02:
++ if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN) == 0)
++ goto out_1;
++ break;
++ }
+ }
+
+ return strlcpy(buf, "0\n", 3);
+@@ -48,20 +66,37 @@
unsigned long on = simple_strtoul(buf, NULL, 10);
if (!strcmp(attr->attr.name, "power_on")) {
@@ -791,7 +809,10 @@
+ s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
+ break;
+ case MACH_TYPE_NEO1973_GTA02:
-+ /* FIXME: implementation */
++ if (on)
++ s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
++ else
++ s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 1);
+ break;
}
- pcf50606_onoff_set(pcf50606_global,
@@ -799,8 +820,19 @@
- s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
} else if (!strcmp(attr->attr.name, "reset")) {
/* reset is low-active, so we need to invert */
- s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1 );
-@@ -107,9 +122,16 @@
+- s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1 );
++ switch (machine_arch_type) {
++ case MACH_TYPE_NEO1973_GTA01:
++ s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1 );
++ break;
++ case MACH_TYPE_NEO1973_GTA02:
++ s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1 );
++ break;
++ }
+ }
+
+ return count;
+@@ -107,9 +142,16 @@
{
dev_info(&pdev->dev, DRVMSG ": starting\n");
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-09-05 17:40:50 +0200 (Wed, 05 Sep 2007)
New Revision: 2922
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
Log:
* Set taku-icon size to 32x32
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
2007-09-05 15:37:28 UTC (rev 2921)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
2007-09-05 15:40:50 UTC (rev 2922)
@@ -1,4 +1,4 @@
-gtk-icon-sizes =
"gtk-button=16,16:gtk-small-toolbar=24,24:gtk-large-toolbar=24,24"
+gtk-icon-sizes =
"gtk-button=16,16:gtk-small-toolbar=24,24:gtk-large-toolbar=24,24:taku-icon=32,32"
gtk_button_images = 0
gtk_menu_images = 0
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-09-05 18:09:53 +0200 (Wed, 05 Sep 2007)
New Revision: 2923
Modified:
trunk/src/host/qemu-neo1973/monitor.c
trunk/src/host/qemu-neo1973/readline.c
trunk/src/host/qemu-neo1973/vl.h
Log:
An old patch for persistent monitor commands history.
Modified: trunk/src/host/qemu-neo1973/monitor.c
===================================================================
--- trunk/src/host/qemu-neo1973/monitor.c 2007-09-05 15:40:50 UTC (rev
2922)
+++ trunk/src/host/qemu-neo1973/monitor.c 2007-09-05 16:09:53 UTC (rev
2923)
@@ -2511,6 +2511,14 @@
readline_start("(qemu) ", 0, monitor_handle_command1, NULL);
}
+static void monitor_init_input(void)
+{
+ readline_history_restore();
+ atexit(readline_history_save);
+
+ monitor_start_input();
+}
+
static void term_event(void *opaque, int event)
{
if (event != CHR_EVENT_RESET)
@@ -2519,7 +2527,7 @@
if (!hide_banner)
term_printf("QEMU %s monitor - type 'help' for more information\n",
QEMU_VERSION);
- monitor_start_input();
+ monitor_init_input();
}
static int is_first_init = 1;
Modified: trunk/src/host/qemu-neo1973/readline.c
===================================================================
--- trunk/src/host/qemu-neo1973/readline.c 2007-09-05 15:40:50 UTC (rev
2922)
+++ trunk/src/host/qemu-neo1973/readline.c 2007-09-05 16:09:53 UTC (rev
2923)
@@ -26,6 +26,7 @@
#define TERM_CMD_BUF_SIZE 4095
#define TERM_MAX_CMDS 64
#define NB_COMPLETIONS_MAX 256
+#define HISTORY_FILENAME ".qemu_history"
#define IS_NORM 0
#define IS_ESC 1
@@ -465,4 +466,65 @@
return term_history[index];
}
+static FILE *readline_open_historyfile(char *modes)
+{
+ char *filename, *home;
+ FILE *ret;
+ home = getenv("HOME");
+ if (!home)
+ return 0;
+
+ filename = qemu_malloc(strlen(home) + 1 + strlen(HISTORY_FILENAME) + 1);
+ if (!filename)
+ return 0;
+
+ sprintf(filename, "%s/" HISTORY_FILENAME, home);
+ ret = fopen(filename, modes);
+ qemu_free(filename);
+
+ return ret;
+}
+
+void readline_history_save(void)
+{
+ int idx;
+ FILE *fd;
+ const char *line;
+
+ fd = readline_open_historyfile("w");
+ if (!fd)
+ return;
+
+ idx = 0;
+ while ((line = readline_get_history(idx ++)))
+ fprintf(fd, "%s\n", line);
+
+ fclose(fd);
+}
+
+void readline_history_restore(void)
+{
+ int idx;
+ FILE *fd;
+ char line[TERM_CMD_BUF_SIZE + 1], *ret;
+
+ fd = readline_open_historyfile("r");
+ if (!fd)
+ return;
+
+ for (idx = 0; idx < TERM_MAX_CMDS; idx ++) {
+ ret = fgets(line, TERM_CMD_BUF_SIZE + 1, fd);
+ if (!ret || *line == 0 || *line == '\n')
+ break;
+
+ ret = strchr(line, '\n');
+ if (ret)
+ *ret = 0;
+
+ term_history[idx] = qemu_strdup(line);
+ }
+
+ fclose(fd);
+}
+/* vim: set ai ts=4 sw=4 et: */
Modified: trunk/src/host/qemu-neo1973/vl.h
===================================================================
--- trunk/src/host/qemu-neo1973/vl.h 2007-09-05 15:40:50 UTC (rev 2922)
+++ trunk/src/host/qemu-neo1973/vl.h 2007-09-05 16:09:53 UTC (rev 2923)
@@ -1681,6 +1681,8 @@
const char *readline_get_history(unsigned int index);
void readline_start(const char *prompt, int is_password,
ReadLineFunc *readline_func, void *opaque);
+void readline_history_save(void);
+void readline_history_restore(void);
void kqemu_record_dump(void);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-09-05 19:25:20 +0200 (Wed, 05 Sep 2007)
New Revision: 2924
Modified:
trunk/src/target/kernel/patches/pcf50633.patch
Log:
work around what seems like a PCF50633 bug: If we ever set the duty cycle
of the backlight LED PWM to '0', we need to first switch off the entire LED
boost converter, and then re-enable it to get any output voltage again.
Modified: trunk/src/target/kernel/patches/pcf50633.patch
===================================================================
--- trunk/src/target/kernel/patches/pcf50633.patch 2007-09-05 16:09:53 UTC
(rev 2923)
+++ trunk/src/target/kernel/patches/pcf50633.patch 2007-09-05 17:25:20 UTC
(rev 2924)
@@ -34,7 +34,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/drivers/i2c/chips/pcf50633.c
-@@ -0,0 +1,1698 @@
+@@ -0,0 +1,1715 @@
+/* Philips PCF50633 Power Management Unit (PMU) driver
+ *
+ * (C) 2006-2007 by OpenMoko, Inc.
@@ -1275,14 +1275,31 @@
+{
+ struct pcf50633_data *pcf = class_get_devdata(&bd->class_dev);
+ int intensity = bd->props.brightness;
++ int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
++ u_int8_t ledena;
++ int ret;
+
+ if (bd->props.power != FB_BLANK_UNBLANK)
+ intensity = 0;
+ if (bd->props.fb_blank != FB_BLANK_UNBLANK)
+ intensity = 0;
+
-+ return reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-+ intensity);
++ /* The PCF50633 seems to have some kind of oddity (bug?) when
++ * the intensity was 0, you need to completely switch it off
++ * and re-enable it, before it produces any output voltage again */
++
++ if (intensity != 0 && old_intensity == 0) {
++ ledena = reg_read(pcf, PCF50633_REG_LEDENA);
++ reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
++ }
++
++ ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
++ intensity);
++
++ if (intensity != 0 && old_intensity == 0)
++ reg_write(pcf, PCF50633_REG_LEDENA, ledena);
++
++ return ret;
+}
+
+static struct backlight_ops pcf50633bl_ops = {
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-09-05 19:40:06 +0200 (Wed, 05 Sep 2007)
New Revision: 2925
Removed:
trunk/src/target/u-boot/patches/ext2load_hex.patch
Modified:
trunk/src/target/u-boot/patches/series
Log:
remove ext2load_hex.patch. this information is stored in the filesize
environment variable anyway
Deleted: trunk/src/target/u-boot/patches/ext2load_hex.patch
===================================================================
--- trunk/src/target/u-boot/patches/ext2load_hex.patch 2007-09-05 17:25:20 UTC
(rev 2924)
+++ trunk/src/target/u-boot/patches/ext2load_hex.patch 2007-09-05 17:40:06 UTC
(rev 2925)
@@ -1,17 +0,0 @@
-This patch adds the hex-printing of the file size read by 'ext2load'
-
-Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
-
-Index: u-boot/common/cmd_ext2.c
-===================================================================
---- u-boot.orig/common/cmd_ext2.c
-+++ u-boot/common/cmd_ext2.c
-@@ -245,7 +245,7 @@
- /* Loading ok, update default load address */
- load_addr = addr;
-
-- printf ("\n%ld bytes read\n", filelen);
-+ printf ("\n%ld (0x%lx) bytes read\n", filelen, filelen);
- sprintf(buf, "%lX", filelen);
- setenv("filesize", buf);
-
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-09-05 17:25:20 UTC (rev
2924)
+++ trunk/src/target/u-boot/patches/series 2007-09-05 17:40:06 UTC (rev
2925)
@@ -1,6 +1,5 @@
# just some local hacks
uboot-machtypes.patch
-ext2load_hex.patch
uboot-mokoversion.patch
# those we want to get mainline
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-09-05 19:40:35 +0200 (Wed, 05 Sep 2007)
New Revision: 2926
Modified:
trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch
Log:
the command is called s3c24xx, not s3c24x0
Modified: trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch 2007-09-05
17:40:06 UTC (rev 2925)
+++ trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch 2007-09-05
17:40:35 UTC (rev 2926)
@@ -171,10 +171,10 @@
+
+U_BOOT_CMD(
+ s3c24xx, 4, 1, do_s3c24xx,
-+ "s3c24x0 - SoC specific commands\n",
++ "s3c24xx - SoC specific commands\n",
+ "speed get - display current PLL speed config\n"
-+ "s3c24x0 speed list - display supporte PLL speed configs\n"
-+ "s3c24x0 speed set - set PLL speed\n"
++ "s3c24xx speed list - display supporte PLL speed configs\n"
++ "s3c24xx speed set - set PLL speed\n"
+);
+
+#endif
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-09-05 19:41:00 +0200 (Wed, 05 Sep 2007)
New Revision: 2927
Modified:
trunk/src/target/u-boot/patches/uboot-serial_terminal.patch
Log:
add serial terminal CMD constant to list of all CMD's
Modified: trunk/src/target/u-boot/patches/uboot-serial_terminal.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-serial_terminal.patch 2007-09-05
17:40:35 UTC (rev 2926)
+++ trunk/src/target/u-boot/patches/uboot-serial_terminal.patch 2007-09-05
17:41:00 UTC (rev 2927)
@@ -121,3 +121,15 @@
+);
+
+#endif /* CONFIG_CMD_TERMINAL */
+Index: u-boot/include/config_cmd_all.h
+===================================================================
+--- u-boot.orig/include/config_cmd_all.h
++++ u-boot/include/config_cmd_all.h
+@@ -72,6 +72,7 @@
+ #define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
+ #define CONFIG_CMD_SNTP /* SNTP support */
+ #define CONFIG_CMD_SPI /* SPI utility */
++#define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */
+ #define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */
+ #define CONFIG_CMD_USB /* USB Support */
+ #define CONFIG_CMD_VFD /* VFD support (TRAB) */
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-09-05 19:41:40 +0200 (Wed, 05 Sep 2007)
New Revision: 2928
Modified:
trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
trunk/src/target/u-boot/patches/uboot-s3c2440.patch
Log:
remove commented-out old code from s3c24xx nand driver
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-09-05
17:41:00 UTC (rev 2927)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-09-05
17:41:40 UTC (rev 2928)
@@ -20,7 +20,7 @@
===================================================================
--- /dev/null
+++ u-boot/cpu/arm920t/s3c24x0/nand.c
-@@ -0,0 +1,225 @@
+@@ -0,0 +1,224 @@
+/*
+ * (C) Copyright 2006 OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -209,7 +209,6 @@
+ cfg |= S3C2410_NFCONF_TWRPH1(twrph1 - 1);
+
+ NFCONF = cfg;
-+ //NFCONF = 0xf842;
+
+ /* initialize nand_chip data structure */
+ nand->IO_ADDR_R = nand->IO_ADDR_W = 0x4e00000c;
Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-09-05 17:41:00 UTC
(rev 2927)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-09-05 17:41:40 UTC
(rev 2928)
@@ -1221,7 +1221,7 @@
break;
}
return;
-@@ -180,16 +218,21 @@
+@@ -180,15 +218,21 @@
/* initialize hardware */
twrph0 = 3; twrph1 = 0; tacls = 0;
@@ -1232,7 +1232,6 @@
cfg |= S3C2410_NFCONF_TWRPH1(twrph1 - 1);
NFCONF = cfg;
-- //NFCONF = 0xf842;
+#elif defined(CONFIG_S3C2440)
+ twrph0 = 7; twrph1 = 7; tacls = 7;
+ NFCONF = (tacls<<12)|(twrph0<<8)|(twrph1<<4)|(0<<0);
@@ -1245,7 +1244,7 @@
/* read_buf and write_buf are default */
/* read_byte and write_byte are default */
-@@ -214,12 +257,23 @@
+@@ -213,12 +257,23 @@
nand->options = 0;
#endif
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
