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. r3848 - branches/src/target/kernel/2.6.24.x/config
([EMAIL PROTECTED])
2. r3849 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3850 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
4. r3851 - branches/src/target/kernel/2.6.24.x/config
([EMAIL PROTECTED])
5. r3852 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
6. r3853 - in trunk/src/target/gsm: include/gsmd src/gsmd
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-01-15 22:02:05 +0100 (Tue, 15 Jan 2008)
New Revision: 3848
Modified:
branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24-rc7
Log:
Applied most of "wlan-config-changes.patch",
http://git.openmoko.org/?p=kernel.git;a=commit;h=6019b5e4106a916ebaaffaf8d8653e800dd17c2b
defconfig-2.6.24-rc7: enabled CONFIG_WIRELESS_EXT, CONFIG_PNP,
CONFIG_PNP_DEBUG, CONFIG_SDIO, CONFIG_SDIO_S3C24XX, CONFIG_SDIO_S3C24XX_DMA,
CONFIG_SDIO_AR6000_WLAN, and CONFIG_MMC_DEBUG
defconfig-2.6.24-rc7: monolithized CONFIG_MII and CONFIG_USB_USBNET
Modified: branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24-rc7
===================================================================
--- branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24-rc7
2008-01-15 20:52:10 UTC (rev 3847)
+++ branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24-rc7
2008-01-15 21:02:05 UTC (rev 3848)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-rc7
-# Tue Jan 15 05:01:07 2008
+# Tue Jan 15 17:59:37 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -594,7 +594,7 @@
# Wireless
#
# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
+CONFIG_WIRELESS_EXT=y
# CONFIG_MAC80211 is not set
# CONFIG_IEEE80211 is not set
# CONFIG_RFKILL is not set
@@ -708,6 +708,13 @@
#
# CONFIG_MTD_UBI is not set
# CONFIG_PARPORT is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
+
+#
+# Protocols
+#
+# CONFIG_PNPACPI is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
@@ -775,9 +782,10 @@
# CONFIG_EQUALIZER is not set
CONFIG_TUN=m
# CONFIG_VETH is not set
+# CONFIG_NET_SB1000 is not set
# CONFIG_PHYLIB is not set
CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
+CONFIG_MII=y
# CONFIG_AX88796 is not set
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
@@ -804,7 +812,7 @@
CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
+CONFIG_USB_USBNET=y
CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_DM9601=m
@@ -1368,8 +1376,16 @@
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
+
+#
+# SDIO support
+#
+CONFIG_SDIO=y
+CONFIG_SDIO_S3C24XX=y
+CONFIG_SDIO_S3C24XX_DMA=y
+CONFIG_SDIO_AR6000_WLAN=y
CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_DEBUG=y
CONFIG_MMC_UNSAFE_RESUME=y
#
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-15 22:12:26 +0100 (Tue, 15 Jan 2008)
New Revision: 3849
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
Applied most of "mach-gta02_wifi.patch",
http://git.openmoko.org/?p=kernel.git;a=commit;h=2066e0986693a33c77ae214b4d41071c4f556932
gta02-core.patch:
- arch/arm/mach-s3c2440/mach-gta02.c (gta02_sdio_resources, gta02_sdio_dev,
gta02_machine_init): added SDIO resources
- arch/arm/mach-s3c2440/mach-gta02.c (gta02_machine_init): added power up and
reset logic for WLAN
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-15 21:02:05 UTC (rev 3848)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2008-01-15 21:12:26 UTC (rev 3849)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.24-rc7/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,711 @@
+@@ -0,0 +1,753 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
+ *
@@ -338,6 +338,35 @@
+
+
+
++static struct resource gta02_sdio_resources[] = {
++ [0] = {
++ .flags = IORESOURCE_IRQ,
++ .start = IRQ_SDI,
++ .end = IRQ_SDI,
++ },
++ [1] = {
++ .flags = IORESOURCE_MEM,
++ .start = S3C2410_PA_SDI,
++ .end = S3C2410_PA_SDI + S3C24XX_SZ_SDI - 1,
++ },
++ [2] = {
++ .flags = IORESOURCE_DMA,
++ .start = 0, /* Channel 0 for SDI */
++ .end = 0,
++ },
++};
++
++
++static struct platform_device gta02_sdio_dev = {
++ .name = "s3c24xx-sdio",
++ .id = -1,
++ .dev = {
++ .coherent_dma_mask = 0xffffffff,
++ },
++ .resource = gta02_sdio_resources,
++ .num_resources = ARRAY_SIZE(gta02_sdio_resources),
++};
++
+static struct platform_device *gta02_devices[] __initdata = {
+ &s3c_device_usb,
+ &s3c_device_wdt,
@@ -665,14 +694,25 @@
+ set_s3c2410ts_info(>a02_ts_cfg);
+
+ /* FIXME: hardcoded WLAN module power-up */
-+ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
++ s3c2410_gpio_cfgpin(GTA02_CHIP_PWD, S3C2410_GPIO_OUTPUT);
++
++ /* Power is down */
++ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 1);
++ mdelay(100);
++
+ switch (system_rev) {
+ case GTA02v1_SYSTEM_REV:
++ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
+ break;
+ default:
++ s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET,
S3C2410_GPIO_OUTPUT);
++ /* Chip is in reset state */
+ s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
-+ udelay(2000);
-+ udelay(2000);
++ mdelay(100);
++ /* Power is up */
++ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
++ mdelay(100);
++ /* Chip is out of reset */
+ s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
+ break;
+ }
@@ -688,6 +728,8 @@
+ mangle_glamo_res_by_system_rev();
+ platform_device_register(>a02_glamo_dev);
+
++ platform_device_register(>a02_sdio_dev);
++
+ platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
+
+ s3c2410_pm_init();
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-15 22:25:21 +0100 (Tue, 15 Jan 2008)
New Revision: 3850
Added:
branches/src/target/kernel/2.6.24.x/patches/suspend-prelim1.patch
Modified:
branches/src/target/kernel/2.6.24.x/patches/series
Log:
Applied the preliminary power-saving patches for GTA02:
- "matt-suspend-prelim1-pcf50633.patch",
http://git.openmoko.org/?p=kernel.git;a=commit;h=e52762af763ec931a68ced7aeefccf11fc2c802b
- "matt-suspend-prelim1-pm-i2c.patch",
http://git.openmoko.org/?p=kernel.git;a=commit;h=bb908eb228af05fd532b2df7eb6bb50baf725bc2
- "matt-suspend-prelim1-smedia-glamo-interdiff.patch",
http://git.openmoko.org/?p=kernel.git;a=commit;h=e65a28139d23240c780f0ca65caa1147c49bd1ac
From: Matt Hsu <[EMAIL PROTECTED]>
Note: these patches are highly experimental and need cleaning up.
suspend-prelim1.patch:
- drivers/i2c/chips/pcf50633.c (pcf50633_suspend): turn off the backlight
- drivers/i2c/chips/pcf50633.c (pcf50633_resume): enable it again
- drivers/i2c/i2c-core.c (i2c_device_suspend, i2c_device_resume): call device
suspend/resume functions directly
- drivers/mfd/glamo/glamo-core.c (glamo_suspend, glamo_resume): added
suspend/resume support
Modified: branches/src/target/kernel/2.6.24.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/series 2008-01-15 21:12:26 UTC
(rev 3849)
+++ branches/src/target/kernel/2.6.24.x/patches/series 2008-01-15 21:25:21 UTC
(rev 3850)
@@ -62,8 +62,15 @@
# qt2410 local hacks
qt2410-cs8900.patch
s3c2410-qt2410-buttons.patch
+
+# local hack
fail-unless-uimage.patch
+
+# Atheros WLAN driver
pnp_fixes.patch
atheros_2_0_function.patch
atheros_2_0_hcd-patch
atheros_2_0_sdio_stack.patch
+
+# Preliminary suspend/resume power saving improvements
+suspend-prelim1.patch
Added: branches/src/target/kernel/2.6.24.x/patches/suspend-prelim1.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/suspend-prelim1.patch
2008-01-15 21:12:26 UTC (rev 3849)
+++ branches/src/target/kernel/2.6.24.x/patches/suspend-prelim1.patch
2008-01-15 21:25:21 UTC (rev 3850)
@@ -0,0 +1,84 @@
+Index: linux-2.6.24-rc7/drivers/i2c/chips/pcf50633.c
+===================================================================
+--- linux-2.6.24-rc7.orig/drivers/i2c/chips/pcf50633.c
++++ linux-2.6.24-rc7/drivers/i2c/chips/pcf50633.c
+@@ -1615,6 +1615,9 @@
+ }
+ }
+
++ /* turn off the backlight */
++ __reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
++
+ pcf->standby_regs.int1m = __reg_read(pcf, PCF50633_REG_INT1M);
+ pcf->standby_regs.int2m = __reg_read(pcf, PCF50633_REG_INT2M);
+ pcf->standby_regs.int3m = __reg_read(pcf, PCF50633_REG_INT3M);
+@@ -1639,6 +1642,8 @@
+
+ mutex_lock(&pcf->lock);
+
++ __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
++
+ /* Resume all saved registers that don't "survive" standby state */
+ __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
+ __reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
+Index: linux-2.6.24-rc7/drivers/i2c/i2c-core.c
+===================================================================
+--- linux-2.6.24-rc7.orig/drivers/i2c/i2c-core.c
++++ linux-2.6.24-rc7/drivers/i2c/i2c-core.c
+@@ -1,4 +1,3 @@
+-/* i2c-core.c - a device driver for the iic-bus interface */
+ /* -------------------------------------------------------------------------
*/
+ /* Copyright (C) 1995-99 Simon G. Vogl
+
+@@ -136,10 +135,16 @@
+
+ if (!dev->driver)
+ return 0;
++#if 0
+ driver = to_i2c_driver(dev->driver);
+ if (!driver->suspend)
+ return 0;
+ return driver->suspend(to_i2c_client(dev), mesg);
++#else
++ if (!dev->driver->suspend)
++ return 0;
++ return dev->driver->suspend(dev, mesg);
++#endif
+ }
+
+ static int i2c_device_resume(struct device * dev)
+@@ -148,10 +153,16 @@
+
+ if (!dev->driver)
+ return 0;
++#if 0
+ driver = to_i2c_driver(dev->driver);
+ if (!driver->resume)
+ return 0;
+ return driver->resume(to_i2c_client(dev));
++#else
++ if (!dev->driver->resume)
++ return 0;
++ return dev->driver->resume(dev);
++#endif
+ }
+
+ static void i2c_client_release(struct device *dev)
+Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.c
+===================================================================
+--- linux-2.6.24-rc7.orig/drivers/mfd/glamo/glamo-core.c
++++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.c
+@@ -1071,11 +1071,13 @@
+ #ifdef CONFIG_PM
+ static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
+ {
++ glamo_power(glamo_handle, GLAMO_POWER_SUSPEND);
+ return 0;
+ }
+
+ static int glamo_resume(struct platform_device *pdev)
+ {
++ glamo_power(glamo_handle, GLAMO_POWER_ON);
+ return 0;
+ }
+ #else
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-15 22:35:07 +0100 (Tue, 15 Jan 2008)
New Revision: 3851
Modified:
branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24-rc7
Log:
We need CONFIG_PACKET for DHCP to work.
defconfig-2.6.24-rc7: monolithized CONFIG_PACKET
Modified: branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24-rc7
===================================================================
--- branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24-rc7
2008-01-15 21:25:21 UTC (rev 3850)
+++ branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24-rc7
2008-01-15 21:35:07 UTC (rev 3851)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-rc7
-# Tue Jan 15 17:59:37 2008
+# Tue Jan 15 18:34:56 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -320,7 +320,7 @@
#
# Networking options
#
-CONFIG_PACKET=m
+CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_XFRM=y
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-15 23:55:39 +0100 (Tue, 15 Jan 2008)
New Revision: 3852
Added:
branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch
Modified:
branches/src/target/kernel/2.6.24.x/patches/series
Log:
Applied r3799 and r3800 from the 2.6.22.5 tree.
Note that lis302dl.c has moved from drivers/spi/ to drivers/input/misc/
Added: 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-15
21:35:07 UTC (rev 3851)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch 2008-01-15
22:55:39 UTC (rev 3852)
@@ -0,0 +1,205 @@
+Index: linux-2.6.24-rc7/arch/arm/mach-s3c2440/mach-gta02.c
+===================================================================
+--- linux-2.6.24-rc7.orig/arch/arm/mach-s3c2440/mach-gta02.c
++++ linux-2.6.24-rc7/arch/arm/mach-s3c2440/mach-gta02.c
+@@ -372,8 +372,6 @@
+ &s3c_device_usbgadget,
+ &s3c_device_nand,
+ &s3c_device_ts,
+- &s3c_device_spi0,
+- &s3c_device_spi1,
+ >a02_nor_flash,
+ };
+
+@@ -517,11 +515,6 @@
+
+ /* SPI: Accelerometers attached to SPI of s3c244x */
+
+-static void gta02_spi_acc_set_cs(struct s3c2410_spi_info *spi, int cs, int
pol)
+-{
+- s3c2410_gpio_setpin(cs, pol);
+-}
+-
+ static const struct lis302dl_platform_data lis302_pdata[] = {
+ {
+ .name = "lis302-1 (top)"
+@@ -551,10 +544,55 @@
+ },
+ };
+
+-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 *spi, int cs)
++{
++ switch (cs) {
++ case BITBANG_CS_ACTIVE:
++ s3c2410_gpio_setpin(S3C2410_GPD12, 0);
++ break;
++ case BITBANG_CS_INACTIVE:
++ s3c2410_gpio_setpin(S3C2410_GPD12, 1);
++ break;
++ }
++}
++
++static struct s3c2410_spigpio_info spi_gpio_cfg = {
++ .pin_clk = S3C2410_GPG7,
++ .pin_mosi = S3C2410_GPG6,
++ .pin_miso = S3C2410_GPG5,
+ .board_size = ARRAY_SIZE(gta02_spi_acc_bdinfo),
+ .board_info = gta02_spi_acc_bdinfo,
++ .chip_select = &spi_acc_cs,
++};
++
++static struct resource s3c_spi_acc_resource[] = {
++ [0] = {
++ .start = S3C2410_GPG3,
++ .end = S3C2410_GPG3,
++ },
++ [1] = {
++ .start = S3C2410_GPG5,
++ .end = S3C2410_GPG5,
++ },
++ [2] = {
++ .start = S3C2410_GPG6,
++ .end = S3C2410_GPG6,
++ },
++ [3] = {
++ .start = S3C2410_GPG7,
++ .end = S3C2410_GPG7,
++ },
++};
++
++static struct platform_device s3c_device_spi_acc = {
++ .name = "s3c24xx-spi-gpio",
++ .id = 1,
++ .num_resources = ARRAY_SIZE(s3c_spi_acc_resource),
++ .resource = s3c_spi_acc_resource,
++ .dev = {
++ .platform_data = &spi_gpio_cfg,
++ },
+ };
+
+ static struct resource gta02_led_resources[] = {
+@@ -716,7 +754,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;
+- s3c_device_spi1.dev.platform_data = >a02_spi_acc_cfg;
+
+ /* Only GTA02v1 has a SD_DETECT GPIO. Since the slot is not
+ * hot-pluggable, this is not required anyway */
+@@ -756,6 +793,7 @@
+ break;
+ }
+
++ platform_device_register(&s3c_device_spi_acc);
+ platform_device_register(>a01_button_dev);
+ platform_device_register(>a01_pm_gsm_dev);
+
+@@ -777,6 +815,13 @@
+ s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
+ s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
+
++ s3c2410_gpio_cfgpin(S3C2410_GPD12, S3C2410_GPIO_OUTPUT);
++ s3c2410_gpio_setpin(S3C2410_GPD12, 1);
++
++
++ s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
++ s3c2410_gpio_setpin(S3C2410_GPD13, 1);
++
+ /* Make sure the modem can wake us up */
+ set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
+ rc = request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED,
+Index: linux-2.6.24-rc7/drivers/input/misc/lis302dl.c
+===================================================================
+--- linux-2.6.24-rc7.orig/drivers/input/misc/lis302dl.c
++++ linux-2.6.24-rc7/drivers/input/misc/lis302dl.c
+@@ -84,6 +84,7 @@
+
+ enum lis302dl_reg_ctrl3 {
+ LIS302DL_CTRL3_PP_OD = 0x40,
++ LIS302DL_CTRL3_IHL = 0x80,
+ };
+
+ enum lis302dl_reg_status {
+@@ -134,16 +135,17 @@
+
+ /* lowlevel register access functions */
+
+-#define READ_BIT 0x01
+-#define MS_BIT 0x02
+-#define ADDR_SHIFT 2
++#define READ_BIT 0x80
++#define ADDR_MASK 0x3f
+
+ static inline u_int8_t __reg_read(struct lis302dl_info *lis, u_int8_t reg)
+ {
+ int rc;
+ u_int8_t cmd;
+
+- cmd = (reg << ADDR_SHIFT) | READ_BIT;
++ BUG_ON(reg & ~ADDR_MASK);
++
++ cmd = reg | READ_BIT;
+
+ rc = spi_w8r8(lis->spi_dev, cmd);
+
+@@ -165,7 +167,9 @@
+ {
+ u_int8_t buf[2];
+
+- buf[0] = (reg << ADDR_SHIFT);
++ BUG_ON(reg & ~ADDR_MASK);
++
++ buf[0] = reg;
+ buf[1] = val;
+
+ return spi_write(lis->spi_dev, buf, sizeof(buf));
+@@ -218,10 +222,16 @@
+ {
+ struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
+
+- if (int_pin == 1)
++ switch (int_pin) {
++ case 1:
+ reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x07, mode);
+- else if (int_pin == 2)
++ break;
++ case 2:
+ reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x38, mode << 3);
++ break;
++ default:
++ BUG();
++ }
+ }
+
+ static void _report_btn_single(struct input_dev *inp, int btn)
+@@ -388,6 +398,7 @@
+ static struct attribute *lis302dl_sysfs_entries[] = {
+ &dev_attr_sample_rate.attr,
+ &dev_attr_full_scale.attr,
++ NULL
+ };
+
+ static struct attribute_group lis302dl_attr_group = {
+@@ -459,12 +470,15 @@
+ kfree(lis);
+ return -ENODEV;
+ }
++ /* switch interrupt to open collector, active-low */
++ reg_write(lis, LIS302DL_REG_CTRL3,
++ LIS302DL_CTRL3_PP_OD | LIS302DL_CTRL3_IHL);
++ lis302dl_int_mode(spi, 1, LIX302DL_INTMODE_DATA_READY);
++ lis302dl_int_mode(spi, 2, LIX302DL_INTMODE_CLICK);
+
+- /* switch interrupt to open collector */
+- reg_write(lis, LIS302DL_CTRL3_PP_OD, 0x7c);
+-
++ /* Fix me: always interrupt */
+ rc = request_irq(lis->spi_dev->irq, lis302dl_interrupt, IRQF_DISABLED,
+- "lis302dl", NULL);
++ "lis302dl", lis);
+ if (rc < 0) {
+ dev_err(&spi->dev, "error requesting IRQ %d\n",
+ lis->spi_dev->irq);
Modified: branches/src/target/kernel/2.6.24.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/series 2008-01-15 21:35:07 UTC
(rev 3851)
+++ branches/src/target/kernel/2.6.24.x/patches/series 2008-01-15 22:55:39 UTC
(rev 3852)
@@ -49,6 +49,7 @@
gta02-sound.patch
lis302dl.patch
gta02-leds.patch
+gta02-acc.patch
# additional local stuff
yaffs2-20070905.patch
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-01-16 07:44:11 +0100 (Wed, 16 Jan 2008)
New Revision: 3853
Modified:
trunk/src/target/gsm/include/gsmd/usock.h
trunk/src/target/gsm/src/gsmd/sms_pdu.c
Log:
gsmd: update sms pdu len and fix typos (Wang Yanke)
Modified: trunk/src/target/gsm/include/gsmd/usock.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/usock.h 2008-01-15 22:55:39 UTC (rev
3852)
+++ trunk/src/target/gsm/include/gsmd/usock.h 2008-01-16 06:44:11 UTC (rev
3853)
@@ -196,15 +196,15 @@
enum {
MESSAGE_CLASS_CLASS0 = 0x00,
MESSAGE_CLASS_CLASS1 = 0x01,
- MESSAGE_CLASS_CLASS2 = 0x10,
- MESSAGE_CLASS_CLASS3 = 0x11,
+ MESSAGE_CLASS_CLASS2 = 0x02,
+ MESSAGE_CLASS_CLASS3 = 0x03,
};
enum gsmd_sms_alphabet {
ALPHABET_DEFAULT = (0x00<<2),
ALPHABET_8BIT = (0x01<<2),
- ALPHABET_UCS2 = (0x10<<2),
- ALPHABET_RESERVED = (0x11<<2),
+ ALPHABET_UCS2 = (0x02<<2),
+ ALPHABET_RESERVED = (0x03<<2),
};
/* bit 1 & bit0 */
Modified: trunk/src/target/gsm/src/gsmd/sms_pdu.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/sms_pdu.c 2008-01-15 22:55:39 UTC (rev
3852)
+++ trunk/src/target/gsm/src/gsmd/sms_pdu.c 2008-01-16 06:44:11 UTC (rev
3853)
@@ -46,7 +46,7 @@
case ALPHABET_8BIT:
return len;
case ALPHABET_UCS2:
- return len * 2;
+ return len;
}
return 0;
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
