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. r3731 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
2. r3732 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3733 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
4. r3734 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-12-25 15:37:35 +0100 (Tue, 25 Dec 2007)
New Revision: 3731
Modified:
trunk/src/target/kernel/patches/pcf50633.patch
Log:
fix pcf50633_gpio_{get,set}: use correct register (Sean Chiang)
Modified: trunk/src/target/kernel/patches/pcf50633.patch
===================================================================
--- trunk/src/target/kernel/patches/pcf50633.patch 2007-12-25 00:23:33 UTC
(rev 3730)
+++ trunk/src/target/kernel/patches/pcf50633.patch 2007-12-25 14:37:35 UTC
(rev 3731)
@@ -489,7 +489,7 @@
+void pcf50633_gpio_set(struct pcf50633_data *pcf, enum pcf50633_gpio gpio,
+ int on)
+{
-+ u_int8_t reg = PCF50633_GPIO1-1 + gpio;
++ u_int8_t reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
+
+ if (on)
+ reg_set_bit_mask(pcf, reg, 0x0f, 0x07);
@@ -500,7 +500,7 @@
+
+int pcf50633_gpio_get(struct pcf50633_data *pcf, enum pcf50633_gpio gpio)
+{
-+ u_int8_t reg = PCF50633_GPIO1-1 + gpio;
++ u_int8_t reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
+ u_int8_t val = reg_read(pcf, reg) & 0x0f;
+
+ if (val == PCF50633_GPOCFG_GPOSEL_1 ||
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-25 15:39:12 +0100 (Tue, 25 Dec 2007)
New Revision: 3732
Modified:
branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch
Log:
Fix pcf50633_gpio_{get,set} to use correct register (Sean Chiang)
Modified: branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch 2007-12-25
14:37:35 UTC (rev 3731)
+++ branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch 2007-12-25
14:39:12 UTC (rev 3732)
@@ -489,7 +489,7 @@
+void pcf50633_gpio_set(struct pcf50633_data *pcf, enum pcf50633_gpio gpio,
+ int on)
+{
-+ u_int8_t reg = PCF50633_GPIO1-1 + gpio;
++ u_int8_t reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
+
+ if (on)
+ reg_set_bit_mask(pcf, reg, 0x0f, 0x07);
@@ -500,7 +500,7 @@
+
+int pcf50633_gpio_get(struct pcf50633_data *pcf, enum pcf50633_gpio gpio)
+{
-+ u_int8_t reg = PCF50633_GPIO1-1 + gpio;
++ u_int8_t reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
+ u_int8_t val = reg_read(pcf, reg) & 0x0f;
+
+ if (val == PCF50633_GPOCFG_GPOSEL_1 ||
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-25 23:32:02 +0100 (Tue, 25 Dec 2007)
New Revision: 3733
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
branches/src/target/kernel/2.6.24.x/patches/s3c2410-bbt.patch
Log:
remove CONFIG_MTD_NAND_S3C2410_BBT and turn it into a platform_data flag as
requested by Ben Dooks.
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-25 14:39:12 UTC (rev 3732)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-25 22:32:02 UTC (rev 3733)
@@ -34,7 +34,7 @@
===================================================================
--- /dev/null
+++ linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -0,0 +1,657 @@
+@@ -0,0 +1,658 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
+ *
@@ -405,6 +405,7 @@
+ [0] = {
+ .name = "neo1973-nand",
+ .nr_chips = 1,
++ .flags = S3C2410_NAND_BBT,
+ },
+};
+
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
2007-12-25 14:39:12 UTC (rev 3732)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-25 22:32:02 UTC (rev 3733)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ linux-2.6/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,709 @@
+@@ -0,0 +1,710 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
+ *
@@ -356,6 +356,7 @@
+ [0] = {
+ .name = "neo1973-nand",
+ .nr_chips = 1,
++ .flags = S3C2410_NAND_BBT,
+ },
+};
+
Modified: branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch 2007-12-25
14:39:12 UTC (rev 3732)
+++ branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch 2007-12-25
22:32:02 UTC (rev 3733)
@@ -29,7 +29,7 @@
===================================================================
--- /dev/null
+++ linux-2.6/arch/arm/mach-s3c2440/mach-hxd8.c
-@@ -0,0 +1,378 @@
+@@ -0,0 +1,381 @@
+/* linux/arch/arm/mach-s3c2440/mach-hxd8.c
+ *
+ * S3C2440 Machine Support for the FIC HXD8
@@ -165,14 +165,17 @@
+ [0] = {
+ .name = "hxd8-nand",
+ .nr_chips = 1,
++ .flags = S3C2410_NAND_BBT,
+ },
+ [1] = {
+ .name = "hxd8-nand-1",
+ .nr_chips = 1,
++ .flags = S3C2410_NAND_BBT,
+ },
+ [2] = {
+ .name = "hxd8-nand-2",
+ .nr_chips = 1,
++ .flags = S3C2410_NAND_BBT,
+ },
+};
+
Modified: branches/src/target/kernel/2.6.24.x/patches/s3c2410-bbt.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410-bbt.patch
2007-12-25 14:39:12 UTC (rev 3732)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410-bbt.patch
2007-12-25 22:32:02 UTC (rev 3733)
@@ -5,36 +5,39 @@
Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
-Index: linux-2.6.17.14-fic4.test/drivers/mtd/nand/s3c2410.c
+Index: linux-2.6/drivers/mtd/nand/s3c2410.c
===================================================================
---- linux-2.6.17.14-fic4.test.orig/drivers/mtd/nand/s3c2410.c 2007-02-02
13:02:10.000000000 +0100
-+++ linux-2.6.17.14-fic4.test/drivers/mtd/nand/s3c2410.c 2007-02-02
13:03:52.000000000 +0100
-@@ -524,7 +524,11 @@
+--- linux-2.6.orig/drivers/mtd/nand/s3c2410.c
++++ linux-2.6/drivers/mtd/nand/s3c2410.c
+@@ -612,9 +612,13 @@
chip->select_chip = s3c2410_nand_select_chip;
chip->chip_delay = 50;
chip->priv = nmtd;
-+#ifdef CONFIG_MTD_NAND_S3C2410_BBT
-+ chip->options = NAND_USE_FLASH_BBT;
-+#else
- chip->options = 0;
-+#endif
+- chip->options = 0;
chip->controller = &info->controller;
- if (info->is_s3c2440) {
-Index: linux-2.6.17.14-fic4.test/drivers/mtd/nand/Kconfig
++ if (set->flags & S3C2410_NAND_BBT)
++ chip->options = NAND_USE_FLASH_BBT;
++ else
++ chip->options = 0;
++
+ switch (info->cpu_type) {
+ case TYPE_S3C2410:
+ chip->IO_ADDR_W = regs + S3C2410_NFDATA;
+Index: linux-2.6/include/asm-arm/plat-s3c/nand.h
===================================================================
---- linux-2.6.17.14-fic4.test.orig/drivers/mtd/nand/Kconfig 2007-02-02
13:03:56.000000000 +0100
-+++ linux-2.6.17.14-fic4.test/drivers/mtd/nand/Kconfig 2007-02-02
13:04:47.000000000 +0100
-@@ -90,6 +90,12 @@
- No board specfic support is done by this driver, each board
- must advertise a platform_device for the driver to attach.
+--- linux-2.6.orig/include/asm-arm/plat-s3c/nand.h
++++ linux-2.6/include/asm-arm/plat-s3c/nand.h
+@@ -21,9 +21,12 @@
+ * partitions = mtd partition list
+ */
-+config MTD_NAND_S3C2410_BBT
-+ bool "S3C2410 NAND bad block table"
-+ depends on MTD_NAND_S3C2410
-+ help
-+ Enable bad block table support for S3C2410 NAND driver
++#define S3C2410_NAND_BBT 0x0001
+
- config MTD_NAND_S3C2410_DEBUG
- bool "S3C2410 NAND driver debug"
- depends on MTD_NAND_S3C2410
+ struct s3c2410_nand_set {
+ int nr_chips;
+ int nr_partitions;
++ unsigned int flags;
+ char *name;
+ int *nr_map;
+ struct mtd_partition *partitions;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-25 23:33:12 +0100 (Tue, 25 Dec 2007)
New Revision: 3734
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
fix GSM power switching on GTA02 (Sean Chiang)
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
2007-12-25 22:32:02 UTC (rev 3733)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-25 22:33:12 UTC (rev 3734)
@@ -989,7 +989,7 @@
struct gta01pm_priv {
int gpio_ngsm_en;
struct console *con;
-@@ -70,27 +76,47 @@
+@@ -70,27 +76,51 @@
if (!strcmp(attr->attr.name, "power_on")) {
if (on) {
@@ -1009,6 +1009,8 @@
+ switch (system_rev) {
+#ifdef CONFIG_MACH_NEO1973_GTA02
+ case GTA02v2_SYSTEM_REV:
++ case GTA02v3_SYSTEM_REV:
++ case GTA02v4_SYSTEM_REV:
+ pcf50633_gpio_set(pcf50633_global,
+ PCF50633_GPIO2, 1);
+ break;
@@ -1022,6 +1024,8 @@
+ switch (system_rev) {
+#ifdef CONFIG_MACH_NEO1973_GTA02
+ case GTA02v2_SYSTEM_REV:
++ case GTA02v3_SYSTEM_REV:
++ case GTA02v4_SYSTEM_REV:
+ pcf50633_gpio_set(pcf50633_global,
+ PCF50633_GPIO2, 0);
+ break;
@@ -1043,13 +1047,15 @@
}
} else if (!strcmp(attr->attr.name, "reset")) {
s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-@@ -158,8 +184,14 @@
+@@ -158,8 +188,16 @@
gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
break;
+#ifdef CONFIG_MACH_NEO1973_GTA02
+ case GTA02v1_SYSTEM_REV:
+ case GTA02v2_SYSTEM_REV:
++ case GTA02v3_SYSTEM_REV:
++ case GTA02v4_SYSTEM_REV:
+ gta01_gsm.gpio_ngsm_en = 0;
+ break;
+#endif
@@ -1059,7 +1065,7 @@
"some PM features not available!!!\n",
system_rev);
break;
-@@ -175,9 +207,13 @@
+@@ -175,9 +213,13 @@
break;
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
