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. r3143 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
2. r3144 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
3. r3145 - trunk/doc/hardware/GTA02v2 ([EMAIL PROTECTED])
4. r3146 - in
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: . data
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-10-10 18:17:35 +0200 (Wed, 10 Oct 2007)
New Revision: 3143
Modified:
trunk/src/target/kernel/patches/gta02-core.patch
trunk/src/target/kernel/patches/lis302dl.patch
Log:
fix non-fatal kernel oops during gta02 boot (spi bus number 0 was used twice)
Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch 2007-10-10 15:52:10 UTC
(rev 3142)
+++ trunk/src/target/kernel/patches/gta02-core.patch 2007-10-10 16:17:35 UTC
(rev 3143)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,658 @@
+@@ -0,0 +1,600 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
+ *
@@ -315,6 +315,8 @@
+ &s3c_device_usbgadget,
+ &s3c_device_nand,
+ &s3c_device_ts,
++ &s3c_device_spi0,
++ &s3c_device_spi1,
+};
+
+static struct s3c2410_nand_set gta02_nand_sets[] = {
@@ -415,7 +417,7 @@
+ /* controller_data */
+ /* irq */
+ .max_speed_hz = 10 * 1000 * 1000,
-+ .bus_num = 1,
++ .bus_num = 2,
+ /* chip_select */
+ },
+};
@@ -434,66 +436,6 @@
+ .board_info = gta02_spi_board_info,
+};
+
-+#if 0
-+#ifdef SPI_HARD
-+static struct s3c2410_spi_info spi_cfg = {
-+ .pin_cs = S3C2410_GPG3,
-+ .board_size = ARRAY_SIZE(gta01_spi_board_info),
-+ .board_info = gta01_spi_board_info,
-+};
-+#else
-+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
-+{
-+ switch (cs) {
-+ case BITBANG_CS_ACTIVE:
-+ s3c2410_gpio_setpin(S3C2410_GPG3, 0);
-+ break;
-+ case BITBANG_CS_INACTIVE:
-+ s3c2410_gpio_setpin(S3C2410_GPG3, 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(gta01_spi_board_info),
-+ .board_info = gta01_spi_board_info,
-+ .chip_select = &spi_gpio_cs,
-+};
-+
-+static struct resource s3c_spi_lcm_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,
-+ },
-+};
-+
-+struct platform_device s3c_device_spi_lcm = {
-+ .name = "s3c24xx-spi-gpio",
-+ .id = 1,
-+ .num_resources = ARRAY_SIZE(s3c_spi_lcm_resource),
-+ .resource = s3c_spi_lcm_resource,
-+ .dev = {
-+ .platform_data = &spi_gpio_cfg,
-+ },
-+};
-+#endif
-+#endif
-+
+static struct resource gta02_led_resources[] = {
+ [0] = {
+ .start = GTA02_GPIO_VIBRATOR_ON,
Modified: trunk/src/target/kernel/patches/lis302dl.patch
===================================================================
--- trunk/src/target/kernel/patches/lis302dl.patch 2007-10-10 15:52:10 UTC
(rev 3142)
+++ trunk/src/target/kernel/patches/lis302dl.patch 2007-10-10 16:17:35 UTC
(rev 3143)
@@ -14,15 +14,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-@@ -310,6 +311,7 @@
- &s3c_device_usbgadget,
- &s3c_device_nand,
- &s3c_device_ts,
-+ &s3c_device_spi1,
- };
-
- static struct s3c2410_nand_set gta02_nand_sets[] = {
-@@ -437,6 +439,47 @@
+@@ -429,6 +430,47 @@
.board_info = gta02_spi_board_info,
};
@@ -70,7 +62,7 @@
#if 0
#ifdef SPI_HARD
static struct s3c2410_spi_info spi_cfg = {
-@@ -626,6 +669,7 @@
+@@ -618,6 +660,7 @@
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;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-10 18:23:20 +0200 (Wed, 10 Oct 2007)
New Revision: 3144
Modified:
trunk/src/target/kernel/patches/lis302dl.patch
Log:
make lis302dl apply again (fallout from last commit, sorry)
Modified: trunk/src/target/kernel/patches/lis302dl.patch
===================================================================
--- trunk/src/target/kernel/patches/lis302dl.patch 2007-10-10 16:17:35 UTC
(rev 3143)
+++ trunk/src/target/kernel/patches/lis302dl.patch 2007-10-10 16:23:20 UTC
(rev 3144)
@@ -14,10 +14,21 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-@@ -429,6 +430,47 @@
+@@ -403,7 +404,7 @@
+ .oversampling_shift = 5,
+ };
+
+-/* SPI */
++/* SPI: LCM control interface attached to Glamo3362 */
+
+ static struct spi_board_info gta02_spi_board_info[] __initdata = {
+ {
+@@ -431,6 +432,48 @@
.board_info = gta02_spi_board_info,
};
++/* 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);
@@ -58,11 +69,10 @@
+ .board_info = >a02_spi_acc_bdinfo,
+};
+
-+
- #if 0
- #ifdef SPI_HARD
- static struct s3c2410_spi_info spi_cfg = {
-@@ -618,6 +660,7 @@
+ static struct resource gta02_led_resources[] = {
+ [0] = {
+ .start = GTA02_GPIO_VIBRATOR_ON,
+@@ -560,6 +603,7 @@
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;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-10 18:25:31 +0200 (Wed, 10 Oct 2007)
New Revision: 3145
Modified:
trunk/doc/hardware/GTA02v2/gpio.txt
Log:
commit GTA02v2 gpio assignments
Modified: trunk/doc/hardware/GTA02v2/gpio.txt
===================================================================
--- trunk/doc/hardware/GTA02v2/gpio.txt 2007-10-10 16:23:20 UTC (rev 3144)
+++ trunk/doc/hardware/GTA02v2/gpio.txt 2007-10-10 16:25:31 UTC (rev 3145)
@@ -40,6 +40,7 @@
GPB10 O GPB10 NC
GPBCON = 01 0101 0101 0101 1010 1010 = 0x1555aa
+GPBDN =
GPC0 O GPC0 NC
@@ -59,7 +60,8 @@
GPC14 O GPC14 NC
GPC15 O GPC15 NC
-GPCCON = 0101 0101 0101 0101 0001 0001 0101 0101 = 0x55551155
+GPCCON = 0101 0101 0100 0001 0101 0001 0101 0101 = 0x55415155
+GPCDN =
GPD0 O GPD0 NC
@@ -80,6 +82,7 @@
GPD15 O GPD15 NC
GPDCON = 0101 0101 0101 0101 0101 0101 0101 0101 = 0x55555555
+GPDDN =
GPE0 O I2SLRCK I2SLRCK Codec
@@ -100,8 +103,8 @@
GPE15 B IICSDA X_I2C_SDA
GPECON = 1010 1010 1010 1010 1010 1010 1010 1010 - 0xaaaaaaaa
+GPEDN =
-
GPF0 I EINT0 nG1_INT g sensor 1
GPF1 I EINT1 IO1
GPF2 I EINT2 PIO_2 bluetooth wakeup GPIO
@@ -112,26 +115,28 @@
GPF7 I EINT7 HOLD headset
GPFCON = 1010 1010 1010 1010 - 0xaaaa
+GPFDN =
GPG0 I EINT8 nSIM_CD sim card holder
GPG1 I EINT9 nPWR_IRQ PMU
GPG2 O nSS0 nSS0 SPI
GPG3 O nSS1 NC
-GPG4 O GPG4 n3D_INT glamo 3362
+GPG4 I EINT12 n3D_INT glamo 3362
GPG5 I MISO1 SPI_MISO1
GPG6 O MOSI1 SPI_MOSI1
GPG7 O SPICLK SPI_CLK1
-GPG8 O GPG8 nG2_INT g sensor 2
+GPG8 O EINT16 nG2_INT g sensor 2
GPG9 O EINT17 NC
-GPG10 O EINT18 NC
-GPG11 I GPG11 NC
+GPG10 O GPG10 NC
+GPG11 O GPG11 NC
GPG12 O GPG12 NC
GPG13 I GPG13 GPG13
GPG14 I GPG14 GPG14
GPG15 I GPG15 GPG15
-GPGCON = 0000 0001 0011 1101 1111 1101 1111 1010 = 0x013dfdfa
+GPGCON = 0000 0001 0101 0110 1111 1110 0111 1010 = 0x0156fe7a
+GPGDN =
GPH0 O nCTS0 RTS_MODEM GSM
@@ -146,21 +151,23 @@
GPH9 O GPH9 NC
GPH10 O GPH10 NC
-GPHCON = 10 1000 1010 1010 1010 1010 = 0x28aaaa
+GPHCON = 01 0101 1010 1010 1010 1010 = 0x1aaaaa
+GPHDN =
-GPJ0 O GPJ0 BAT_ID
+GPJ0 I GPJ0 BAT_ID
GPJ1 O GPJ1 AMP_SHUT
GPJ2 I GPJ2 HP_IN
GPJ3 O GPJ3 INT0 GSM
GPJ4 O GPJ4 nGSM_EN
GPJ5 O GPJ5 n3D_RST
GPJ6 O GPJ6 NC
-GPJ7 O GPJ7 WLAN_GPIO0
+GPJ7 I GPJ7 WLAN_GPIO0
GPJ8 O GPJ8 KEEPACCT
GPJ9 O GPJ9 nG1_CS
GPJ10 O GPJ10 nG2_CS
GPJ11 O GPJ11 CHIP_PWD
GPJ12 O GPJ12 nWLAN_RESET
-GPJCON = 01 0101 0100 0101 0101 0100 0001 = 0x1545541
+GPJCON = 01 0101 0101 0001 0101 0100 0100 = 0x1551544
+
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-10 18:34:29 +0200 (Wed, 10 Oct 2007)
New Revision: 3146
Modified:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
Log:
* data/gtkrc: Correct ComboBox style
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
2007-10-10 16:25:31 UTC (rev 3145)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
2007-10-10 16:34:29 UTC (rev 3146)
@@ -1,5 +1,9 @@
2007-10-10 Thomas Wood <[EMAIL PROTECTED]>
+ * data/gtkrc: Correct ComboBox style
+
+2007-10-10 Thomas Wood <[EMAIL PROTECTED]>
+
* data/openmoko-dialer: Add keypad style
* ltmain.sh: Remove from SVN
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
2007-10-10 16:25:31 UTC (rev 3145)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
2007-10-10 16:34:29 UTC (rev 3146)
@@ -96,10 +96,12 @@
style "combo-fix" {
bg[NORMAL] = "#ff7d00"
- text[NORMAL] = "white"
- text[PRELIGHT] = "white"
+ text[NORMAL] = "#000"
+
+ bg[PRELIGHT] = "#ff7d00"
+ text[PRELIGHT] = "#000"
}
-class "*Combo*" style "combo-fix"
+widget_class "*Combo*" style "combo-fix"
style "toolbar"
{
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
