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. r3565 - trunk/src/host/qemu-neo1973/hw ([EMAIL PROTECTED])
2. r3566 - in trunk/src/host/qemu-neo1973: . hw openmoko
([EMAIL PROTECTED])
3. r3567 - trunk/src/target/gsm/src/libgsmd ([EMAIL PROTECTED])
4. r3568 - branches/src/target/kernel ([EMAIL PROTECTED])
5. r3569 - branches/src/target/kernel/2.6.24.x
([EMAIL PROTECTED])
6. r3570 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: andrew
Date: 2007-12-05 02:42:04 +0100 (Wed, 05 Dec 2007)
New Revision: 3565
Modified:
trunk/src/host/qemu-neo1973/hw/neo1973.c
trunk/src/host/qemu-neo1973/hw/s3c.h
trunk/src/host/qemu-neo1973/hw/s3c2410.c
trunk/src/host/qemu-neo1973/hw/s3c24xx_mmci.c
trunk/src/host/qemu-neo1973/hw/sd.c
Log:
Implement SDIO interrupts in S3C24xx MMCI.
Move MMC/SD/SDIO slot setup to board code.
Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-12-04 17:57:54 UTC (rev
3564)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-12-05 01:42:04 UTC (rev
3565)
@@ -84,6 +84,7 @@
QEMUTimer *modem_timer;
qemu_irq *kbd_pic;
const char *kernel;
+ struct sd_card_s *mmc;
};
/* Handlers for output ports */
@@ -252,9 +253,7 @@
s3c_timers_cmp_handler_set(s->cpu->timers, 0, neo_bl_intensity, s);
- /* MMC/SD host */
- s3c_mmci_handlers(s->cpu->mmci, 0,
- qemu_irq_invert(s3c_gpio_in_get(
+ sd_set_cb(s->mmc, 0, qemu_irq_invert(s3c_gpio_in_get(
s->cpu->io)[GTA01_IRQ_nSD_DETECT]));
}
@@ -423,8 +422,12 @@
{
struct neo_board_s *s = (struct neo_board_s *)
qemu_mallocz(sizeof(struct neo_board_s));
+ int sd_idx = drive_get_index(IF_SD, 0, 0);
+
s->ram = 0x08000000;
s->kernel = kernel_filename;
+ if (sd_idx >= 0)
+ s->mmc = sd_init(drives_table[sd_idx].bdrv, 0);
/* Setup CPU & memory */
if (ram_size < s->ram + S3C_SRAM_SIZE) {
@@ -436,7 +439,7 @@
fprintf(stderr, "This platform requires an ARM920T core\n");
exit(2);
}
- s->cpu = s3c2410_init(s->ram, ds);
+ s->cpu = s3c2410_init(s->ram, ds, s->mmc);
s3c_nand_register(s->cpu, nand_init(NAND_MFR_SAMSUNG, 0x76));
Modified: trunk/src/host/qemu-neo1973/hw/s3c.h
===================================================================
--- trunk/src/host/qemu-neo1973/hw/s3c.h 2007-12-04 17:57:54 UTC (rev
3564)
+++ trunk/src/host/qemu-neo1973/hw/s3c.h 2007-12-05 01:42:04 UTC (rev
3565)
@@ -11,6 +11,7 @@
# include "qemu-common.h"
# include "flash.h"
+# include "sd.h"
/* Interrupt numbers */
# define S3C_PIC_EINT0 0
@@ -157,9 +158,7 @@
/* s3c24xx_mmci.c */
struct s3c_mmci_state_s;
struct s3c_mmci_state_s *s3c_mmci_init(target_phys_addr_t base,
- BlockDriverState *bd, qemu_irq irq, qemu_irq *dma);
-void s3c_mmci_handlers(struct s3c_mmci_state_s *s, qemu_irq readonly_cb,
- qemu_irq coverswitch_cb);
+ struct sd_card_s *mmc, qemu_irq irq, qemu_irq *dma);
void s3c_mmci_reset(struct s3c_mmci_state_s *s);
/* s3c24xx_rtc.c */
@@ -220,7 +219,8 @@
};
/* s3c2410.c */
-struct s3c_state_s *s3c2410_init(unsigned int sdram_size, DisplayState *ds);
+struct s3c_state_s *s3c2410_init(unsigned int sdram_size, DisplayState *ds,
+ struct sd_card_s *mmc);
void s3c_nand_register(struct s3c_state_s *s, struct nand_flash_s *chip);
void s3c_nand_setwp(struct s3c_state_s *s, int wp);
Modified: trunk/src/host/qemu-neo1973/hw/s3c2410.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/s3c2410.c 2007-12-04 17:57:54 UTC (rev
3564)
+++ trunk/src/host/qemu-neo1973/hw/s3c2410.c 2007-12-05 01:42:04 UTC (rev
3565)
@@ -2833,10 +2833,11 @@
}
/* Initialise an S3C2410A microprocessor. */
-struct s3c_state_s *s3c2410_init(unsigned int sdram_size, DisplayState *ds)
+struct s3c_state_s *s3c2410_init(unsigned int sdram_size, DisplayState *ds,
+ struct sd_card_s *mmc)
{
struct s3c_state_s *s;
- int iomemtype, i, sd_idx;
+ int iomemtype, i;
s = (struct s3c_state_s *) qemu_mallocz(sizeof(struct s3c_state_s));
s->env = cpu_init("arm920t");
@@ -2908,11 +2909,7 @@
s->irq[S3C_PIC_SPI0], s->drq[S3C_RQ_SPI0],
s->irq[S3C_PIC_SPI1], s->drq[S3C_RQ_SPI1], s->io);
- sd_idx = drive_get_index(IF_SD, 0, 0);
- if (sd_idx != -1) {
- s->mmci = s3c_mmci_init(0x5a000000, drives_table[sd_idx].bdrv,
- s->irq[S3C_PIC_SDI], s->drq);
- }
+ s->mmci = s3c_mmci_init(0x5a000000, mmc, s->irq[S3C_PIC_SDI], s->drq);
if (usb_enabled) {
usb_ohci_init_memio(0x49000000, 3, -1, s->irq[S3C_PIC_USBH]);
Modified: trunk/src/host/qemu-neo1973/hw/s3c24xx_mmci.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/s3c24xx_mmci.c 2007-12-04 17:57:54 UTC
(rev 3564)
+++ trunk/src/host/qemu-neo1973/hw/s3c24xx_mmci.c 2007-12-05 01:42:04 UTC
(rev 3565)
@@ -41,6 +41,9 @@
void s3c_mmci_reset(struct s3c_mmci_state_s *s)
{
+ if (!s)
+ return;
+
s->blklen = 0;
s->blknum = 0;
s->blklen_cnt = 0;
@@ -357,6 +360,20 @@
s3c_mmci_write,
};
+static void s3c_mmci_cardirq(void *opaque, int line, int level)
+{
+ struct s3c_mmci_state_s *s = (struct s3c_mmci_state_s *) opaque;
+
+ if (~s->control & (1 << 3)) /*
RcvIOInt */
+ return;
+ if (!level)
+ return;
+
+ s->dstatus |= 1 << 9; /* IOIntDet */
+ if (s->mask & (1 << 12)) /* IOIntDet */
+ qemu_irq_raise(s->irq);
+}
+
static void s3c_mmci_save(QEMUFile *f, void *opaque)
{
struct s3c_mmci_state_s *s = (struct s3c_mmci_state_s *) opaque;
@@ -414,16 +431,23 @@
}
struct s3c_mmci_state_s *s3c_mmci_init(target_phys_addr_t base,
- BlockDriverState *bd, qemu_irq irq, qemu_irq *dma)
+ struct sd_card_s *mmc, qemu_irq irq, qemu_irq *dma)
{
int iomemtype;
- struct s3c_mmci_state_s *s = (struct s3c_mmci_state_s *)
+ struct s3c_mmci_state_s *s;
+
+ if (!mmc)
+ return 0;
+
+ s = (struct s3c_mmci_state_s *)
qemu_mallocz(sizeof(struct s3c_mmci_state_s));
-
s->base = base;
s->irq = irq;
s->dma = dma;
+ s->card = mmc;
+ mmc->irq = qemu_allocate_irqs(s3c_mmci_cardirq, s, 1)[0];
+
s3c_mmci_reset(s);
iomemtype = cpu_register_io_memory(0, s3c_mmci_readfn,
@@ -432,14 +456,5 @@
register_savevm("s3c24xx_mmci", 0, 0, s3c_mmci_save, s3c_mmci_load, s);
- /* Instantiate the actual storage */
- s->card = sd_init(bd, 0);
-
return s;
}
-
-void s3c_mmci_handlers(struct s3c_mmci_state_s *s, qemu_irq readonly_cb,
- qemu_irq coverswitch_cb)
-{
- sd_set_cb(s->card, readonly_cb, coverswitch_cb);
-}
Modified: trunk/src/host/qemu-neo1973/hw/sd.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/sd.c 2007-12-04 17:57:54 UTC (rev 3564)
+++ trunk/src/host/qemu-neo1973/hw/sd.c 2007-12-05 01:42:04 UTC (rev 3565)
@@ -1587,8 +1587,13 @@
void sd_set_cb(struct sd_card_s *card, qemu_irq readonly, qemu_irq insert)
{
- SDState *sd = (SDState *) card->opaque;
+ SDState *sd;
+ if (!card)
+ return;
+
+ sd = (SDState *) card->opaque;
+
sd->readonly_cb = readonly;
sd->inserted_cb = insert;
qemu_set_irq(readonly, bdrv_is_read_only(sd->bdrv));
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-12-05 02:54:47 +0100 (Wed, 05 Dec 2007)
New Revision: 3566
Modified:
trunk/src/host/qemu-neo1973/hw/boards.h
trunk/src/host/qemu-neo1973/hw/neo1973.c
trunk/src/host/qemu-neo1973/openmoko/env
trunk/src/host/qemu-neo1973/vl.c
Log:
High time we rename -M neo to -M gta01 and fix the descriptions. External
scripts need updating accordingly.
Modified: trunk/src/host/qemu-neo1973/hw/boards.h
===================================================================
--- trunk/src/host/qemu-neo1973/hw/boards.h 2007-12-05 01:42:04 UTC (rev
3565)
+++ trunk/src/host/qemu-neo1973/hw/boards.h 2007-12-05 01:54:47 UTC (rev
3566)
@@ -74,7 +74,7 @@
extern QEMUMachine terrierpda_machine;
/* neo1973.c */
-extern QEMUMachine neo1973_machine;
+extern QEMUMachine gta01_machine;
/* palm.c */
extern QEMUMachine palmte_machine;
Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-12-05 01:42:04 UTC (rev
3565)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-12-05 01:54:47 UTC (rev
3566)
@@ -1,5 +1,5 @@
/*
- * Neo1973/GTA01 mobile telephone platform emulation.
+ * Neo1973 mobile telephone platforms emulation.
* Detailed information at openmoko.org.
*
* Copyright (c) 2007 OpenMoko, Inc.
@@ -415,7 +415,7 @@
};
/* Board init. */
-static void neo_init(int ram_size, int vga_ram_size, const char *boot_device,
+static void gta01_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char *kernel_filename,
const char *kernel_cmdline, const char *initrd_filename,
const char *cpu_model)
@@ -470,8 +470,8 @@
dpy_resize(ds, 480, 640);
}
-QEMUMachine neo1973_machine = {
- "neo",
- "Neo1973 phone aka FIC GTA01 aka OpenMoko (S3C2410A)",
- neo_init,
+QEMUMachine gta01_machine = {
+ "gta01",
+ "FIC Neo1973 rev GTA01 aka OpenMoko phone (S3C2410A)",
+ gta01_init,
};
Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env 2007-12-05 01:42:04 UTC (rev
3565)
+++ trunk/src/host/qemu-neo1973/openmoko/env 2007-12-05 01:54:47 UTC (rev
3566)
@@ -4,7 +4,7 @@
script_dir_relative=openmoko
script_dir="$src_dir/$script_dir_relative"
uboot_symlink="$src_dir/u-boot.bin"
-qemu_relative="arm-softmmu/qemu-system-arm -M neo -m 130"
+qemu_relative="arm-softmmu/qemu-system-arm -M gta01 -m 130"
qemu="$src_dir/$qemu_relative"
flash_base=openmoko-flash.base
flash_image=openmoko-flash.image
Modified: trunk/src/host/qemu-neo1973/vl.c
===================================================================
--- trunk/src/host/qemu-neo1973/vl.c 2007-12-05 01:42:04 UTC (rev 3565)
+++ trunk/src/host/qemu-neo1973/vl.c 2007-12-05 01:54:47 UTC (rev 3566)
@@ -8071,7 +8071,7 @@
qemu_register_machine(&spitzpda_machine);
qemu_register_machine(&borzoipda_machine);
qemu_register_machine(&terrierpda_machine);
- qemu_register_machine(&neo1973_machine);
+ qemu_register_machine(>a01_machine);
qemu_register_machine(&palmte_machine);
qemu_register_machine(&lm3s811evb_machine);
qemu_register_machine(&lm3s6965evb_machine);
--- End Message ---
--- Begin Message ---
Author: tick
Date: 2007-12-05 04:10:40 +0100 (Wed, 05 Dec 2007)
New Revision: 3567
Modified:
trunk/src/target/gsm/src/libgsmd/libgsmd_passthrough.c
Log:
gsmd: decrease the rx_len for memcpy (Andrzej Zaborowski)
Modified: trunk/src/target/gsm/src/libgsmd/libgsmd_passthrough.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_passthrough.c 2007-12-05
01:54:47 UTC (rev 3566)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_passthrough.c 2007-12-05
03:10:40 UTC (rev 3567)
@@ -83,7 +83,7 @@
if (rc < sizeof(*rgmh) + rgmh->len)
return -EINVAL;
- rx[(*rx_len)-1] = 0;
+ rx[--*rx_len] = 0;
if (rgmh->len < *rx_len)
*rx_len = rgmh->len;
memcpy(rx, rx_buf, *rx_len);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-05 07:28:10 +0100 (Wed, 05 Dec 2007)
New Revision: 3568
Added:
branches/src/target/kernel/2.6.24.x/
Log:
create 2.6.24 directory
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-05 07:29:25 +0100 (Wed, 05 Dec 2007)
New Revision: 3569
Added:
branches/src/target/kernel/2.6.24.x/patches/
Log:
bring forward 2.6.23 patchset into 2.6.24
Copied: branches/src/target/kernel/2.6.24.x/patches (from rev 3568,
branches/src/target/kernel/2.6.23.x/patches)
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-05 07:51:58 +0100 (Wed, 05 Dec 2007)
New Revision: 3570
Removed:
branches/src/target/kernel/2.6.24.x/patches/arm-atag-kexec.patch
branches/src/target/kernel/2.6.24.x/patches/asoc-kconfig-fix.patch
branches/src/target/kernel/2.6.24.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch
branches/src/target/kernel/2.6.24.x/patches/fix-s3c2410fb-register-access.patch
branches/src/target/kernel/2.6.24.x/patches/s3c2410-nand-include-fix.patch
branches/src/target/kernel/2.6.24.x/patches/s3c2410-udc-include-fix.patch
Modified:
branches/src/target/kernel/2.6.24.x/patches/series
Log:
* remove patches that are in 2.6.24-rc4 mainline:
D s3c2410-nand-include-fix.patch
D asoc-kconfig-fix.patch
D asoc-platform-hw_init-pcm_emulation-fix.patch
D arm-atag-kexec.patch
D fix-s3c2410fb-register-access.patch
D s3c2410-udc-include-fix.patch
* comment out s3c2410_fb-truecolor.patch, it is unclear if it is still needed
Deleted: branches/src/target/kernel/2.6.24.x/patches/arm-atag-kexec.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/arm-atag-kexec.patch
2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/arm-atag-kexec.patch
2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,148 +0,0 @@
-This patch resolves a kexec boot failure that can occur because
-no ATAGs are passed in to the kexec'd kernel. Currently the
-newly-kexec'd kernel may fail if it requires specific ATAGs, or
-it may fail because the fixed memory location at which it expects
-to find the ATAGs may contain random data instead of ATAGs.
-
-The patch ensures that any ATAGs passed to the current kernel
-at boot time are copied to a static buffer, and are copied back
-when kexec copies the new kernel into place. Thus the new
-kernel sees the same ATAGs from kexec and the boot loader.
-
-The boot parameters are copied without regard to type, content,
-or length -- this patch's scope is limited soley to saving and
-restoring a fixed-size block of memory containing the kernel's
-boot parameters. Additional functionality to examine, alter, or
-replace the ATAGs (using kexec, for example) can be implemented
-by manipulating the static buffer containing the preserved ATAGs.
-
-Note: the size of the buffer (1.5KB) is selected to comfortably
-hold one of each ATAG type, including a maximum-length command
-line and the maximum number of ATAG_MEM structures currently
-supported by the kernel. Should an ATAG list exceed that limit,
-the list will be silently truncated to that limit (to do other-
-wise at that point in the boot process would make a simple
-problem exceedingly complicated).
-
-Kernel version 2.6.22.5
-
-Signed-off-by: Mike Westerhof <mwester at dls.net>
----
-
-Index: linux-2.6.23/arch/arm/kernel/relocate_kernel.S
-===================================================================
---- linux-2.6.23.orig/arch/arm/kernel/relocate_kernel.S
-+++ linux-2.6.23/arch/arm/kernel/relocate_kernel.S
-@@ -7,6 +7,23 @@
- .globl relocate_new_kernel
- relocate_new_kernel:
-
-+ /* Move boot params back to where the kernel expects them */
-+
-+ ldr r0,kexec_boot_params_address
-+ teq r0,#0
-+ beq 8f
-+
-+ ldr r1,kexec_boot_params_copy
-+ mov r6,#KEXEC_BOOT_PARAMS_SIZE/4
-+7:
-+ ldr r5,[r1],#4
-+ str r5,[r0],#4
-+ subs r6,r6,#1
-+ bne 7b
-+
-+8:
-+ /* Boot params moved, now go on with the kernel */
-+
- ldr r0,kexec_indirection_page
- ldr r1,kexec_start_address
-
-@@ -50,7 +67,7 @@
- mov lr,r1
- mov r0,#0
- ldr r1,kexec_mach_type
-- mov r2,#0
-+ ldr r2,kexec_boot_params_address
- mov pc,lr
-
- .globl kexec_start_address
-@@ -65,6 +82,16 @@
- kexec_mach_type:
- .long 0x0
-
-+ /* phy addr where new kernel will expect to find boot params */
-+ .globl kexec_boot_params_address
-+kexec_boot_params_address:
-+ .long 0x0
-+
-+ /* phy addr where old kernel put a copy of orig boot params */
-+ .globl kexec_boot_params_copy
-+kexec_boot_params_copy:
-+ .long 0x0
-+
- relocate_new_kernel_end:
-
- .globl relocate_new_kernel_size
-Index: linux-2.6.23/arch/arm/kernel/setup.c
-===================================================================
---- linux-2.6.23.orig/arch/arm/kernel/setup.c
-+++ linux-2.6.23/arch/arm/kernel/setup.c
-@@ -24,6 +24,7 @@
- #include <linux/interrupt.h>
- #include <linux/smp.h>
- #include <linux/fs.h>
-+#include <linux/kexec.h>
-
- #include <asm/cpu.h>
- #include <asm/elf.h>
-@@ -770,6 +771,23 @@
- }
- arch_initcall(customize_machine);
-
-+#ifdef CONFIG_KEXEC
-+
-+/* Physical addr of where the boot params should be for this machine */
-+extern unsigned long kexec_boot_params_address;
-+
-+/* Physical addr of the buffer into which the boot params are copied */
-+extern unsigned long kexec_boot_params_copy;
-+
-+/* Pointer to the boot params buffer, for manipulation and display */
-+unsigned long kexec_boot_params;
-+EXPORT_SYMBOL(kexec_boot_params);
-+
-+/* The buffer itself - make sure it is sized correctly */
-+static unsigned long kexec_boot_params_buf[(KEXEC_BOOT_PARAMS_SIZE + 3) / 4];
-+
-+#endif
-+
- void __init setup_arch(char **cmdline_p)
- {
- struct tag *tags = (struct tag *)&init_tags;
-@@ -788,6 +806,13 @@
- else if (mdesc->boot_params)
- tags = phys_to_virt(mdesc->boot_params);
-
-+#ifdef CONFIG_KEXEC
-+ kexec_boot_params_address = mdesc->boot_params;
-+ kexec_boot_params_copy = virt_to_phys(kexec_boot_params_buf);
-+ kexec_boot_params = (unsigned long)kexec_boot_params_buf;
-+ if (mdesc->boot_params)
-+ memcpy((void *)kexec_boot_params, tags, KEXEC_BOOT_PARAMS_SIZE);
-+#endif
- /*
- * If we have the old style parameters, convert them to
- * a tag list.
-Index: linux-2.6.23/include/asm-arm/kexec.h
-===================================================================
---- linux-2.6.23.orig/include/asm-arm/kexec.h
-+++ linux-2.6.23/include/asm-arm/kexec.h
-@@ -14,6 +14,8 @@
-
- #define KEXEC_ARCH KEXEC_ARCH_ARM
-
-+#define KEXEC_BOOT_PARAMS_SIZE 1536
-+
- #ifndef __ASSEMBLY__
-
- struct kimage;
Deleted: branches/src/target/kernel/2.6.24.x/patches/asoc-kconfig-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/asoc-kconfig-fix.patch
2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/asoc-kconfig-fix.patch
2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,17 +0,0 @@
----
- sound/soc/s3c24xx/Kconfig | 2 1 + 1 - 0 !
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6/sound/soc/s3c24xx/Kconfig
-===================================================================
---- linux-2.6.orig/sound/soc/s3c24xx/Kconfig 2007-07-23 10:15:13.000000000
+0200
-+++ linux-2.6/sound/soc/s3c24xx/Kconfig 2007-07-23 10:18:07.000000000
+0200
-@@ -18,7 +18,7 @@ config SND_S3C2443_SOC_AC97
-
- config SND_S3C24XX_SOC_NEO1973_WM8753
- tristate "SoC I2S Audio support for NEO1973 - WM8753"
-- depends on SND_S3C24XX_SOC && MACH_GTA01
-+ depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01
- select SND_S3C24XX_SOC_I2S
- select SND_SOC_WM8753
- help
Deleted:
branches/src/target/kernel/2.6.24.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch
===================================================================
---
branches/src/target/kernel/2.6.24.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch
2007-12-05 06:29:25 UTC (rev 3569)
+++
branches/src/target/kernel/2.6.24.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch
2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,45 +0,0 @@
-Since the PCM emulation can call multiple times to hw_setup(), but we
-can only once allocate/request the DMA channel, we have to handle
-this gracefully.
-
-Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
-
-Index: linux-2.6.23-rc8/sound/soc/s3c24xx/s3c24xx-pcm.c
-===================================================================
---- linux-2.6.23-rc8.orig/sound/soc/s3c24xx/s3c24xx-pcm.c
-+++ linux-2.6.23-rc8/sound/soc/s3c24xx/s3c24xx-pcm.c
-@@ -158,18 +158,22 @@
- if (!dma)
- return 0;
-
-- /* prepare DMA */
-- prtd->params = dma;
--
-- DBG("params %p, client %p, channel %d\n", prtd->params,
-- prtd->params->client, prtd->params->channel);
--
-- ret = s3c2410_dma_request(prtd->params->channel,
-- prtd->params->client, NULL);
--
-- if (ret) {
-- DBG(KERN_ERR "failed to get dma channel\n");
-- return ret;
-+ /* this may get called several times by oss emulation
-+ * with different params -HW */
-+ if (prtd->params == NULL) {
-+ /* prepare DMA */
-+ prtd->params = dma;
-+
-+ DBG("params %p, client %p, channel %d\n", prtd->params,
-+ prtd->params->client, prtd->params->channel);
-+
-+ ret = s3c2410_dma_request(prtd->params->channel,
-+ prtd->params->client, NULL);
-+
-+ if (ret) {
-+ DBG(KERN_ERR "failed to get dma channel\n");
-+ return ret;
-+ }
- }
-
- /* channel needs configuring for mem=>device, increment memory addr,
Deleted:
branches/src/target/kernel/2.6.24.x/patches/fix-s3c2410fb-register-access.patch
===================================================================
---
branches/src/target/kernel/2.6.24.x/patches/fix-s3c2410fb-register-access.patch
2007-12-05 06:29:25 UTC (rev 3569)
+++
branches/src/target/kernel/2.6.24.x/patches/fix-s3c2410fb-register-access.patch
2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,85 +0,0 @@
-Index: linux-2.6.22/drivers/video/s3c2410fb.c
-===================================================================
---- linux-2.6.22.orig/drivers/video/s3c2410fb.c
-+++ linux-2.6.22/drivers/video/s3c2410fb.c
-@@ -123,6 +123,7 @@
-
- static void s3c2410fb_set_lcdaddr(struct s3c2410fb_info *fbi)
- {
-+ void __iomem *regs = fbi->io;
- struct fb_var_screeninfo *var = &fbi->fb->var;
- unsigned long saddr1, saddr2, saddr3;
-
-@@ -137,9 +138,9 @@
- dprintk("LCDSADDR2 = 0x%08lx\n", saddr2);
- dprintk("LCDSADDR3 = 0x%08lx\n", saddr3);
-
-- writel(saddr1, S3C2410_LCDSADDR1);
-- writel(saddr2, S3C2410_LCDSADDR2);
-- writel(saddr3, S3C2410_LCDSADDR3);
-+ writel(saddr1, regs + S3C2410_LCDSADDR1);
-+ writel(saddr2, regs + S3C2410_LCDSADDR2);
-+ writel(saddr3, regs + S3C2410_LCDSADDR3);
- }
-
- /* s3c2410fb_calc_pixclk()
-@@ -289,6 +290,7 @@
- static void s3c2410fb_activate_var(struct s3c2410fb_info *fbi,
- struct fb_var_screeninfo *var)
- {
-+ void __iomem *regs = fbi->io;
- int hs;
-
- fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_MODEMASK;
-@@ -432,16 +434,16 @@
- dprintk("lcdcon[4] = 0x%08lx\n", fbi->regs.lcdcon4);
- dprintk("lcdcon[5] = 0x%08lx\n", fbi->regs.lcdcon5);
-
-- writel(fbi->regs.lcdcon1 & ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1);
-- writel(fbi->regs.lcdcon2, S3C2410_LCDCON2);
-- writel(fbi->regs.lcdcon3, S3C2410_LCDCON3);
-- writel(fbi->regs.lcdcon4, S3C2410_LCDCON4);
-- writel(fbi->regs.lcdcon5, S3C2410_LCDCON5);
-+ writel(fbi->regs.lcdcon1 & ~S3C2410_LCDCON1_ENVID, regs +
S3C2410_LCDCON1);
-+ writel(fbi->regs.lcdcon2, regs + S3C2410_LCDCON2);
-+ writel(fbi->regs.lcdcon3, regs + S3C2410_LCDCON3);
-+ writel(fbi->regs.lcdcon4, regs + S3C2410_LCDCON4);
-+ writel(fbi->regs.lcdcon5, regs + S3C2410_LCDCON5);
-
- /* set lcd address pointers */
- s3c2410fb_set_lcdaddr(fbi);
-
-- writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
-+ writel(fbi->regs.lcdcon1, regs + S3C2410_LCDCON1);
- }
-
-
-@@ -549,7 +551,7 @@
- val |= ((green >> 5) & 0x07e0);
- val |= ((blue >> 11) & 0x001f);
-
-- writel(val, S3C2410_TFTPAL(regno));
-+ writel(val, fbi->io + S3C2410_TFTPAL(regno));
- schedule_palette_update(fbi, regno, val);
- }
-
-@@ -581,16 +583,17 @@
- */
- static int s3c2410fb_blank(int blank_mode, struct fb_info *info)
- {
-+ struct s3c2410fb_info *fbi = info->par;
- dprintk("blank(mode=%d, info=%p)\n", blank_mode, info);
-
- if (mach_info == NULL)
- return -EINVAL;
-
- if (blank_mode == FB_BLANK_UNBLANK)
-- writel(0x0, S3C2410_TPAL);
-+ writel(0x0, fbi->io + S3C2410_TPAL);
- else {
- dprintk("setting TPAL to output 0x000000\n");
-- writel(S3C2410_TPAL_EN, S3C2410_TPAL);
-+ writel(S3C2410_TPAL_EN, fbi->io + S3C2410_TPAL);
- }
-
- return 0;
Deleted:
branches/src/target/kernel/2.6.24.x/patches/s3c2410-nand-include-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410-nand-include-fix.patch
2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410-nand-include-fix.patch
2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,15 +0,0 @@
-Index: linux-2.6.22/drivers/mtd/nand/s3c2410.c
-===================================================================
---- linux-2.6.22.orig/drivers/mtd/nand/s3c2410.c
-+++ linux-2.6.22/drivers/mtd/nand/s3c2410.c
-@@ -60,8 +60,8 @@
-
- #include <asm/io.h>
-
--#include <asm/arch/regs-nand.h>
--#include <asm/arch/nand.h>
-+#include <asm/plat-s3c/regs-nand.h>
-+#include <asm/plat-s3c/nand.h>
-
- #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
- static int hardware_ecc = 1;
Deleted:
branches/src/target/kernel/2.6.24.x/patches/s3c2410-udc-include-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410-udc-include-fix.patch
2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410-udc-include-fix.patch
2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,16 +0,0 @@
-Index: linux-2.6.22/drivers/usb/gadget/s3c2410_udc.c
-===================================================================
---- linux-2.6.22.orig/drivers/usb/gadget/s3c2410_udc.c
-+++ linux-2.6.22/drivers/usb/gadget/s3c2410_udc.c
-@@ -54,8 +54,9 @@
- #include <asm/arch/hardware.h>
- #include <asm/arch/regs-clock.h>
- #include <asm/arch/regs-gpio.h>
--#include <asm/arch/regs-udc.h>
--#include <asm/arch/udc.h>
-+
-+#include <asm/plat-s3c24xx/udc.h>
-+#include <asm/plat-s3c24xx/regs-udc.h>
-
- #include <asm/mach-types.h>
-
Modified: branches/src/target/kernel/2.6.24.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/series 2007-12-05 06:29:25 UTC
(rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/series 2007-12-05 06:51:58 UTC
(rev 3570)
@@ -1,6 +1,3 @@
-arm-atag-kexec.patch
-asoc-platform-hw_init-pcm_emulation-fix.patch
-asoc-kconfig-fix.patch
asoc-neo1973_wm8753-power.patch
missing_defs.patch
openmoko-logo.patch
@@ -37,7 +34,7 @@
s3c2410-qt2410-buttons.patch
config-nr-tty-devices.patch
hxd8-core.patch
-s3c2410_fb-truecolor.patch
+# s3c2410_fb-truecolor.patch evaluate
s3c2440-nand-disable-hwecc.patch
hxd8-tsl256x.patch
pcf50633.patch
@@ -45,10 +42,7 @@
s3c24xx-nand-largepage.patch
s3c2442b-cpuid.patch
gta02-core.patch
-s3c2410-nand-include-fix.patch
-s3c2410-udc-include-fix.patch
neo1973-soc-include-fix.patch
explicitly-link-notes-section.patch
-fix-s3c2410fb-register-access.patch
lis302dl.patch
gta02-leds.patch
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
