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. r3959 - trunk/src/host/qemu-neo1973/openmoko
([EMAIL PROTECTED])
2. r3960 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3961 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
4. r3962 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: andrew
Date: 2008-01-26 17:37:38 +0100 (Sat, 26 Jan 2008)
New Revision: 3959
Modified:
trunk/src/host/qemu-neo1973/openmoko/env
Log:
Update buildhost image download path... again.
Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env 2008-01-26 00:02:07 UTC (rev
3958)
+++ trunk/src/host/qemu-neo1973/openmoko/env 2008-01-26 16:37:38 UTC (rev
3959)
@@ -24,9 +24,9 @@
# We don't want the "-latest" symlinks to match
kernel_wildcard="uImage-2.6.*-neo1973.bin"
-rootfs_wildcard="OpenMoko-openmoko-*image*.rootfs.jffs2"
+rootfs_wildcard="OpenMoko-openmoko-*image*01.rootfs.jffs2"
uboot_wildcard="u-boot-gta01bv4-1*.bin"
-download_dir="http://buildhost.openmoko.org/daily/tmp/deploy/glibc/images/neo1973/";
+download_dir="http://buildhost.openmoko.org/daily/neo1973/deploy/glibc/images/neo1973/";
dev_download_dir="http://buildhost.openmoko.org/snapshots/2007.08/images/";
backup_download_dir="http://buildhost.automated.it/OM2007.2/";
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-26 18:56:20 +0100 (Sat, 26 Jan 2008)
New Revision: 3960
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch
Log:
Yet another "quilt fold" miss :-(
gta02-acc.patch:
- arch/arm/mach-s3c2440/mach-gta02.c (spi_acc_cs): one hunk from
s3c-gpio-spi-allow-multi-cs.patch wasn't applied yet. Fixed.
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch 2008-01-26
16:37:38 UTC (rev 3959)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch 2008-01-26
17:56:20 UTC (rev 3960)
@@ -1,7 +1,7 @@
-Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
+Index: linux-2.6.24/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2440/mach-gta02.c
-+++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
+--- linux-2.6.24.orig/arch/arm/mach-s3c2440/mach-gta02.c
++++ linux-2.6.24/arch/arm/mach-s3c2440/mach-gta02.c
@@ -374,8 +374,6 @@
&s3c_device_usbgadget,
&s3c_device_nand,
@@ -45,7 +45,7 @@
},
};
-@@ -522,26 +519,74 @@
+@@ -522,26 +519,75 @@
.modalias = "lis302dl",
.platform_data = &lis302_pdata[0],
.irq = GTA02_IRQ_GSENSOR_1,
@@ -71,17 +71,18 @@
-static struct s3c2410_spi_info gta02_spi_acc_cfg = {
- .set_cs = gta02_spi_acc_set_cs,
-+static void spi_acc_cs(struct s3c2410_spigpio_info *spigpio_info, int cs)
++static void spi_acc_cs(struct s3c2410_spigpio_info *spigpio_info,
++ int csid, int cs)
+{
+ struct lis302dl_platform_data * plat_data =
+ (struct lis302dl_platform_data *)spigpio_info->
+ board_info->platform_data;
+ switch (cs) {
+ case BITBANG_CS_ACTIVE:
-+ s3c2410_gpio_setpin(plat_data->pin_chip_select, 0);
++ s3c2410_gpio_setpin(plat_data[csid].pin_chip_select, 0);
+ break;
+ case BITBANG_CS_INACTIVE:
-+ s3c2410_gpio_setpin(plat_data->pin_chip_select, 1);
++ s3c2410_gpio_setpin(plat_data[csid].pin_chip_select, 1);
+ break;
+ }
+}
@@ -126,7 +127,7 @@
};
static struct resource gta02_led_resources[] = {
-@@ -784,7 +829,6 @@
+@@ -784,7 +830,6 @@
s3c_device_usb.dev.platform_data = >a02_usb_info;
s3c_device_nand.dev.platform_data = >a02_nand_info;
s3c_device_sdi.dev.platform_data = >a02_mmc_cfg;
@@ -134,7 +135,7 @@
/* Only GTA02v1 has a SD_DETECT GPIO. Since the slot is not
* hot-pluggable, this is not required anyway */
-@@ -796,6 +840,12 @@
+@@ -796,6 +841,12 @@
break;
}
@@ -147,7 +148,7 @@
INIT_WORK(>a02_udc_vbus_drawer.work, __gta02_udc_vbus_draw);
s3c24xx_udc_set_platdata(>a02_udc_cfg);
set_s3c2410ts_info(>a02_ts_cfg);
-@@ -824,6 +874,7 @@
+@@ -824,6 +875,7 @@
break;
}
@@ -155,10 +156,10 @@
platform_device_register(>a01_button_dev);
platform_device_register(>a01_pm_gsm_dev);
-Index: linux-2.6.24-rc8/drivers/input/misc/lis302dl.c
+Index: linux-2.6.24/drivers/input/misc/lis302dl.c
===================================================================
---- linux-2.6.24-rc8.orig/drivers/input/misc/lis302dl.c
-+++ linux-2.6.24-rc8/drivers/input/misc/lis302dl.c
+--- linux-2.6.24.orig/drivers/input/misc/lis302dl.c
++++ linux-2.6.24/drivers/input/misc/lis302dl.c
@@ -84,6 +84,7 @@
enum lis302dl_reg_ctrl3 {
@@ -439,10 +440,10 @@
dev_set_drvdata(&spi->dev, NULL);
kfree(lis);
-Index: linux-2.6.24-rc8/drivers/spi/spi_s3c24xx_gpio.c
+Index: linux-2.6.24/drivers/spi/spi_s3c24xx_gpio.c
===================================================================
---- linux-2.6.24-rc8.orig/drivers/spi/spi_s3c24xx_gpio.c
-+++ linux-2.6.24-rc8/drivers/spi/spi_s3c24xx_gpio.c
+--- linux-2.6.24.orig/drivers/spi/spi_s3c24xx_gpio.c
++++ linux-2.6.24/drivers/spi/spi_s3c24xx_gpio.c
@@ -91,7 +91,7 @@
struct s3c2410_spigpio *sg = spidev_to_sg(dev);
@@ -484,10 +485,10 @@
}
return 0;
-Index: linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/spi-gpio.h
+Index: linux-2.6.24/include/asm-arm/arch-s3c2410/spi-gpio.h
===================================================================
---- linux-2.6.24-rc8.orig/include/asm-arm/arch-s3c2410/spi-gpio.h
-+++ linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/spi-gpio.h
+--- linux-2.6.24.orig/include/asm-arm/arch-s3c2410/spi-gpio.h
++++ linux-2.6.24/include/asm-arm/arch-s3c2410/spi-gpio.h
@@ -22,11 +22,12 @@
unsigned long pin_miso;
@@ -502,10 +503,10 @@
};
-Index: linux-2.6.24-rc8/include/linux/lis302dl.h
+Index: linux-2.6.24/include/linux/lis302dl.h
===================================================================
---- linux-2.6.24-rc8.orig/include/linux/lis302dl.h
-+++ linux-2.6.24-rc8/include/linux/lis302dl.h
+--- linux-2.6.24.orig/include/linux/lis302dl.h
++++ linux-2.6.24/include/linux/lis302dl.h
@@ -5,6 +5,7 @@
struct lis302dl_platform_data {
@@ -514,10 +515,10 @@
};
#endif /* _LINUX_LIS302DL_H */
-Index: linux-2.6.24-rc8/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6.24/arch/arm/mach-s3c2410/mach-gta01.c
===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2410/mach-gta01.c
-+++ linux-2.6.24-rc8/arch/arm/mach-s3c2410/mach-gta01.c
+--- linux-2.6.24.orig/arch/arm/mach-s3c2410/mach-gta01.c
++++ linux-2.6.24/arch/arm/mach-s3c2410/mach-gta01.c
@@ -521,7 +521,7 @@
},
};
@@ -527,10 +528,10 @@
{
switch (cs) {
case BITBANG_CS_ACTIVE:
-Index: linux-2.6.24-rc8/arch/arm/mach-s3c2410/mach-qt2410.c
+Index: linux-2.6.24/arch/arm/mach-s3c2410/mach-qt2410.c
===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2410/mach-qt2410.c
-+++ linux-2.6.24-rc8/arch/arm/mach-s3c2410/mach-qt2410.c
+--- linux-2.6.24.orig/arch/arm/mach-s3c2410/mach-qt2410.c
++++ linux-2.6.24/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -217,7 +217,7 @@
/* SPI */
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-26 19:17:18 +0100 (Sat, 26 Jan 2008)
New Revision: 3961
Modified:
branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
Log:
adjust-glamo-intl-timings-back.patch
From: warmcat <[EMAIL PROTECTED]>
smedia-glamo.patch:
- drivers/mfd/glamo/glamo-core.c (glamo_init_script): restored timing values to
avoid frame buffer bitrot
Modified: branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
2008-01-26 17:56:20 UTC (rev 3960)
+++ branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
2008-01-26 18:17:18 UTC (rev 3961)
@@ -3,10 +3,10 @@
Signedo-off-by: Harald Welte <[EMAIL PROTECTED]>
-Index: linux-2.6.24-rc7/drivers/mfd/Kconfig
+Index: linux-2.6.24/drivers/mfd/Kconfig
===================================================================
---- linux-2.6.24-rc7.orig/drivers/mfd/Kconfig
-+++ linux-2.6.24-rc7/drivers/mfd/Kconfig
+--- linux-2.6.24.orig/drivers/mfd/Kconfig
++++ linux-2.6.24/drivers/mfd/Kconfig
@@ -15,6 +15,8 @@
interface. The device may be connected by PCI or local bus with
varying functions enabled.
@@ -16,10 +16,10 @@
endmenu
menu "Multimedia Capabilities Port drivers"
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/Makefile
+Index: linux-2.6.24/drivers/mfd/glamo/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/Makefile
++++ linux-2.6.24/drivers/mfd/glamo/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the Smedia Glamo framebuffer driver
@@ -32,10 +32,10 @@
+obj-$(CONFIG_MFD_GLAMO_FB) += glamo-fb.o
+obj-$(CONFIG_MFD_GLAMO_SPI_FB) += glamo-lcm-spi.o
+
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-regs.h
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-regs.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-regs.h
++++ linux-2.6.24/drivers/mfd/glamo/glamo-regs.h
@@ -0,0 +1,477 @@
+#ifndef _GLAMO_REGS_H
+#define _GLAMO_REGS_H
@@ -514,10 +514,10 @@
+};
+
+#endif /* _GLAMO_REGS_H */
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-core.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-core.c
@@ -0,0 +1,1097 @@
+/* Smedia Glamo 336x/337x driver
+ *
@@ -1133,7 +1133,7 @@
+ { GLAMO_REG_CLOCK_RISC1, 0x1000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x3000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x3000 },
-+ { GLAMO_REG_CLOCK_MPROC, 0x1000 },
++ { GLAMO_REG_CLOCK_MPROC, 0x100f },
+ { 0xfffe, 1 },
+ { GLAMO_REG_CLOCK_HOST, 0x0000 },
+ { GLAMO_REG_CLOCK_MEMORY, 0x0000 },
@@ -1151,12 +1151,12 @@
+ { GLAMO_REG_CLOCK_RISC1, 0x0000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x0000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x0000 },
-+ { GLAMO_REG_CLOCK_MPROC, 0x0000 },
++#endif
++ { GLAMO_REG_CLOCK_MPROC, 0x000f },
+ { 0xfffe, 1 },
-+#endif
+ { GLAMO_REG_PLL_GEN1, 0x05db }, /* 48MHz */
+ { GLAMO_REG_PLL_GEN3, 0x09c3 }, /* 80MHz */
-+ { 0xfffe, 30 },
++ { 0xfffe, 50 },
+ /*
+ * b9 of this register MUST be zero to get any interrupts on INT#
+ * the other set bits enable all the engine interrupt sources
@@ -1166,29 +1166,29 @@
+ { GLAMO_REG_CLOCK_GEN7, 0x0101 },
+ { GLAMO_REG_CLOCK_GEN8, 0x0100 },
+ { GLAMO_REG_CLOCK_HOST, 0x000d },
-+ { 0x200, 0x0cf0 /* 0x0ef0 */ },
-+ { 0x202, 0x0298 /* 0x07ff */ },
++ { 0x200, 0x0ef0 },
++ { 0x202, 0x07ff },
+ { 0x212, 0x0000 },
+ { 0x214, 0x4000 },
+ { 0x216, 0xf00e },
+ { GLAMO_REG_MEM_TYPE, 0x0874 }, /* 8MB, 16 word pg wr+rd */
-+ { GLAMO_REG_MEM_GEN, 0xbfbf }, /* 63 grants min + max */
++ { GLAMO_REG_MEM_GEN, 0xafaf }, /* 63 grants min + max */
+ /*
+ * the register below originally 0x0108 makes unreliable Glamo MMC
+ * write operations. Cranked to 0x05ad to add a wait state, the
+ * unreliability is not seen after 4GB of write / read testing
+ */
-+ { GLAMO_REG_MEM_TIMING1, 0x05ad },
-+ { GLAMO_REG_MEM_TIMING2, 0x0011 }, /* Taa = 3 MCLK */
++ { GLAMO_REG_MEM_TIMING1, 0x0108 },
++ { GLAMO_REG_MEM_TIMING2, 0x0010 }, /* Taa = 3 MCLK */
+ { GLAMO_REG_MEM_TIMING3, 0x0000 },
+ { GLAMO_REG_MEM_TIMING4, 0x0000 }, /* CE1# delay fall/rise */
+ { GLAMO_REG_MEM_TIMING5, 0x0000 }, /* UB# LB# */
+ { GLAMO_REG_MEM_TIMING6, 0x0000 }, /* OE# */
+ { GLAMO_REG_MEM_TIMING7, 0x0000 }, /* WE# */
-+ { GLAMO_REG_MEM_TIMING8, 0x1008 }, /* MCLK delay, was 0x1000 */
-+ { GLAMO_REG_MEM_TIMING9, 0x6000 },
++ { GLAMO_REG_MEM_TIMING8, 0x1002 }, /* MCLK delay, was 0x1000 */
++ { GLAMO_REG_MEM_TIMING9, 0x6006 },
+ { GLAMO_REG_MEM_TIMING10, 0x00ff },
-+ { GLAMO_REG_MEM_TIMING11, 0x0000 },
++ { GLAMO_REG_MEM_TIMING11, 0x0001 },
+ { GLAMO_REG_MEM_POWER1, 0x0020 },
+ { GLAMO_REG_MEM_POWER2, 0x0000 },
+ { GLAMO_REG_MEM_DRAM1, 0x0000 },
@@ -1196,8 +1196,8 @@
+ { GLAMO_REG_MEM_DRAM1, 0xc100 },
+ { 0xfffe, 1 },
+ { GLAMO_REG_MEM_DRAM1, 0xe100 },
-+ { GLAMO_REG_MEM_DRAM2, 0x0155 },
-+ { GLAMO_REG_CLOCK_MEMORY, 0x000f },
++ { GLAMO_REG_MEM_DRAM2, 0x01d6 },
++ { GLAMO_REG_CLOCK_MEMORY, 0x000b },
+};
+
+
@@ -1616,10 +1616,10 @@
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x core/resource driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.24-rc7/include/asm-arm/arch-s3c2410/irqs.h
+Index: linux-2.6.24/include/asm-arm/arch-s3c2410/irqs.h
===================================================================
---- linux-2.6.24-rc7.orig/include/asm-arm/arch-s3c2410/irqs.h
-+++ linux-2.6.24-rc7/include/asm-arm/arch-s3c2410/irqs.h
+--- linux-2.6.24.orig/include/asm-arm/arch-s3c2410/irqs.h
++++ linux-2.6.24/include/asm-arm/arch-s3c2410/irqs.h
@@ -155,9 +155,37 @@
#define IRQ_S3C2443_AC97 S3C2410_IRQSUB(28)
@@ -1660,10 +1660,10 @@
+#define IRQ_GLAMO_RISC IRQ_GLAMO(8)
+
#endif /* __ASM_ARCH_IRQ_H */
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-fb.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-fb.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-fb.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-fb.c
@@ -0,0 +1,822 @@
+/* Smedia Glamo 336x/337x driver
+ *
@@ -2487,10 +2487,10 @@
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x framebuffer driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.24-rc7/include/linux/glamofb.h
+Index: linux-2.6.24/include/linux/glamofb.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/glamofb.h
++++ linux-2.6.24/include/linux/glamofb.h
@@ -0,0 +1,39 @@
+#ifndef _LINUX_GLAMOFB_H
+#define _LINUX_GLAMOFB_H
@@ -2531,10 +2531,10 @@
+int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
+
+#endif
-Index: linux-2.6.24-rc7/include/linux/spi/glamo.h
+Index: linux-2.6.24/include/linux/spi/glamo.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/spi/glamo.h
++++ linux-2.6.24/include/linux/spi/glamo.h
@@ -0,0 +1,28 @@
+#ifndef __GLAMO_SPI_H
+#define __GLAMO_SPI_H
@@ -2564,10 +2564,10 @@
+
+
+#endif
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.h
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-core.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.h
++++ linux-2.6.24/drivers/mfd/glamo/glamo-core.h
@@ -0,0 +1,91 @@
+#ifndef __GLAMO_CORE_H
+#define __GLAMO_CORE_H
@@ -2660,10 +2660,10 @@
+ enum glamo_engine engine, int ps);
+
+#endif /* __GLAMO_CORE_H */
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-gpio.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-gpio.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-gpio.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-gpio.c
@@ -0,0 +1,62 @@
+
+#include <linux/kernel.h>
@@ -2727,10 +2727,10 @@
+}
+EXPORT_SYMBOL(glamo_gpio_cfgpin);
+
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-lcm-spi.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-lcm-spi.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-lcm-spi.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-lcm-spi.c
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2007 OpenMoko, Inc.
@@ -2973,10 +2973,10 @@
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>")
+MODULE_LICENSE("GPL");
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-spi-gpio.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-spi-gpio.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-spi-gpio.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-spi-gpio.c
@@ -0,0 +1,256 @@
+/*
+ * Copyright (C) 2007 OpenMoko, Inc.
@@ -3234,10 +3234,10 @@
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>")
+MODULE_LICENSE("GPL");
-Index: linux-2.6.24-rc7/include/linux/glamo-gpio.h
+Index: linux-2.6.24/include/linux/glamo-gpio.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/glamo-gpio.h
++++ linux-2.6.24/include/linux/glamo-gpio.h
@@ -0,0 +1,99 @@
+#ifndef __GLAMO_GPIO_H
+#define __GLAMO_GPIO_H
@@ -3338,10 +3338,10 @@
+
+
+#endif /* _GLAMO_GPIO */
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/Kconfig
+Index: linux-2.6.24/drivers/mfd/glamo/Kconfig
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/Kconfig
++++ linux-2.6.24/drivers/mfd/glamo/Kconfig
@@ -0,0 +1,35 @@
+config MFD_GLAMO
+ bool "Smedia Glamo 336x/337x support"
@@ -3378,10 +3378,10 @@
+ control channel. This SPI interface is frequently used to
+ interconnect the LCM control interface.
+
-Index: linux-2.6.24-rc7/drivers/mfd/Makefile
+Index: linux-2.6.24/drivers/mfd/Makefile
===================================================================
---- linux-2.6.24-rc7.orig/drivers/mfd/Makefile
-+++ linux-2.6.24-rc7/drivers/mfd/Makefile
+--- linux-2.6.24.orig/drivers/mfd/Makefile
++++ linux-2.6.24/drivers/mfd/Makefile
@@ -3,6 +3,7 @@
#
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-26 19:25:09 +0100 (Sat, 26 Jan 2008)
New Revision: 3962
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
Log:
fix-initdata-mismatch.patch
Fix linker warnings of this type:
WARNING: vmlinux.o(.data+0x3be4): Section mismatch: reference to .init.data:
(between 'glamo_spigpio_cfg' and 'gta02_nor_flash_data')
Signed-off-by: warmcat <[EMAIL PROTECTED]>
gta01-core.patch:
- arch/arm/mach-s3c2410/mach-gta01.c (gta01_spi_board_info): it's referenced by
spi_gpio_cfg, which in turn is used after initialization, so don't make it
__initdata
gta02-core.patch:
- arch/arm/mach-s3c2440/mach-gta02.c (gta02_spi_board_info): it's referenced by
glamo_spi_cfg and glamo_spigpio_cfg, which in turn is used after
initialization, so don't make it __initdata
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
2008-01-26 18:17:18 UTC (rev 3961)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2008-01-26 18:25:09 UTC (rev 3962)
@@ -3,10 +3,10 @@
Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
-Index: linux-2.6/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.24/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6/arch/arm/mach-s3c2410/Kconfig
+--- linux-2.6.24.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6.24/arch/arm/mach-s3c2410/Kconfig
@@ -110,5 +110,13 @@
help
Say Y here if you are using the Armzone QT2410
@@ -21,19 +21,19 @@
+
endmenu
-Index: linux-2.6/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6.24/arch/arm/mach-s3c2410/Makefile
===================================================================
---- linux-2.6.orig/arch/arm/mach-s3c2410/Makefile
-+++ linux-2.6/arch/arm/mach-s3c2410/Makefile
+--- linux-2.6.24.orig/arch/arm/mach-s3c2410/Makefile
++++ linux-2.6.24/arch/arm/mach-s3c2410/Makefile
@@ -29,3 +29,4 @@
obj-$(CONFIG_BAST_PC104_IRQ) += bast-irq.o
obj-$(CONFIG_MACH_VR1000) += mach-vr1000.o usb-simtec.o
obj-$(CONFIG_MACH_QT2410) += mach-qt2410.o
+obj-$(CONFIG_MACH_NEO1973_GTA01)+= mach-gta01.o
-Index: linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6.24/arch/arm/mach-s3c2410/mach-gta01.c
===================================================================
--- /dev/null
-+++ linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
++++ linux-2.6.24/arch/arm/mach-s3c2410/mach-gta01.c
@@ -0,0 +1,658 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
@@ -473,7 +473,7 @@
+
+/* SPI */
+
-+static struct spi_board_info gta01_spi_board_info[] __initdata = {
++static struct spi_board_info gta01_spi_board_info[] = {
+ {
+ .modalias = "jbt6k74",
+ /* platform_data */
@@ -693,10 +693,10 @@
+ .init_machine = gta01_machine_init,
+ .timer = &s3c24xx_timer,
+MACHINE_END
-Index: linux-2.6/include/asm-arm/arch-s3c2410/gta01.h
+Index: linux-2.6.24/include/asm-arm/arch-s3c2410/gta01.h
===================================================================
--- /dev/null
-+++ linux-2.6/include/asm-arm/arch-s3c2410/gta01.h
++++ linux-2.6.24/include/asm-arm/arch-s3c2410/gta01.h
@@ -0,0 +1,70 @@
+#ifndef _GTA01_H
+#define _GTA01_H
@@ -768,11 +768,11 @@
+#define GTA01Bv4_IRQ_PCF50606 IRQ_EINT9
+
+#endif /* _GTA01_H */
-Index: linux-2.6/MAINTAINERS
+Index: linux-2.6.24/MAINTAINERS
===================================================================
---- linux-2.6.orig/MAINTAINERS
-+++ linux-2.6/MAINTAINERS
-@@ -1530,6 +1530,14 @@
+--- linux-2.6.24.orig/MAINTAINERS
++++ linux-2.6.24/MAINTAINERS
+@@ -1536,6 +1536,14 @@
M: [EMAIL PROTECTED]
S: Supported
@@ -787,10 +787,10 @@
FRAMEBUFFER LAYER
P: Antonino Daplas
M: [EMAIL PROTECTED]
-Index: linux-2.6/arch/arm/plat-s3c24xx/Kconfig
+Index: linux-2.6.24/arch/arm/plat-s3c24xx/Kconfig
===================================================================
---- linux-2.6.orig/arch/arm/plat-s3c24xx/Kconfig
-+++ linux-2.6/arch/arm/plat-s3c24xx/Kconfig
+--- linux-2.6.24.orig/arch/arm/plat-s3c24xx/Kconfig
++++ linux-2.6.24/arch/arm/plat-s3c24xx/Kconfig
@@ -46,4 +46,9 @@
help
Common machine code for SMDK2410 and SMDK2440
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-26 18:17:18 UTC (rev 3961)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2008-01-26 18:25:09 UTC (rev 3962)
@@ -1,7 +1,7 @@
-Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
+Index: linux-2.6.24/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
++++ linux-2.6.24/arch/arm/mach-s3c2440/mach-gta02.c
@@ -0,0 +1,821 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
@@ -467,7 +467,7 @@
+
+/* SPI */
+
-+static struct spi_board_info gta02_spi_board_info[] __initdata = {
++static struct spi_board_info gta02_spi_board_info[] = {
+ {
+ .modalias = "jbt6k74",
+ /* platform_data */
@@ -824,10 +824,10 @@
+ .init_machine = gta02_machine_init,
+ .timer = &s3c24xx_timer,
+MACHINE_END
-Index: linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/gta02.h
+Index: linux-2.6.24/include/asm-arm/arch-s3c2410/gta02.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/gta02.h
++++ linux-2.6.24/include/asm-arm/arch-s3c2410/gta02.h
@@ -0,0 +1,97 @@
+#ifndef _GTA02_H
+#define _GTA02_H
@@ -926,10 +926,10 @@
+#define GTA02v3_IRQ_nGSM_OC IRQ_EINT19 /* v3 + v4 only */
+
+#endif /* _GTA02_H */
-Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/Kconfig
+Index: linux-2.6.24/arch/arm/mach-s3c2440/Kconfig
===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/Kconfig
+--- linux-2.6.24.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6.24/arch/arm/mach-s3c2440/Kconfig
@@ -74,5 +74,20 @@
help
Say Y here if you are using the FIC Neo1973 GSM Phone
@@ -951,19 +951,19 @@
+
endmenu
-Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6.24/arch/arm/mach-s3c2440/Makefile
===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/Makefile
+--- linux-2.6.24.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6.24/arch/arm/mach-s3c2440/Makefile
@@ -22,3 +22,4 @@
obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
obj-$(CONFIG_MACH_HXD8) += mach-hxd8.o
+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-Index: linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+Index: linux-2.6.24/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+--- linux-2.6.24.orig/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
++++ linux-2.6.24/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
@@ -19,7 +19,9 @@
#include <linux/pcf50606.h>
@@ -1081,10 +1081,10 @@
/* we pull reset to low to make sure that the chip doesn't
* drain power through the reset line */
s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-Index: linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+Index: linux-2.6.24/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+--- 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 @@
#include <linux/errno.h>
@@ -1193,10 +1193,10 @@
return sysfs_create_group(&pdev->dev.kobj, >a01_gsm_attr_group);
}
-Index: linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
+Index: linux-2.6.24/drivers/leds/leds-neo1973-vibrator.c
===================================================================
---- linux-2.6.24-rc8.orig/drivers/leds/leds-neo1973-vibrator.c
-+++ linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
+--- linux-2.6.24.orig/drivers/leds/leds-neo1973-vibrator.c
++++ linux-2.6.24/drivers/leds/leds-neo1973-vibrator.c
@@ -113,7 +113,7 @@
struct resource *r;
int rc;
@@ -1206,10 +1206,10 @@
return -EIO;
r = platform_get_resource(pdev, 0, 0);
-Index: linux-2.6.24-rc8/sound/soc/s3c24xx/neo1973_wm8753.c
+Index: linux-2.6.24/sound/soc/s3c24xx/neo1973_wm8753.c
===================================================================
---- linux-2.6.24-rc8.orig/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ linux-2.6.24-rc8/sound/soc/s3c24xx/neo1973_wm8753.c
+--- linux-2.6.24.orig/sound/soc/s3c24xx/neo1973_wm8753.c
++++ linux-2.6.24/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -672,6 +672,12 @@
{
int ret;
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
