mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-22 02:21:29 +03:00
[s3c24xx] Update to 2.6.30.1, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16680 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
73c8796fe7
commit
ee7bcf1bc1
@ -12,7 +12,7 @@ BOARDNAME:=Samsung S3C24xx
|
|||||||
FEATURES:=jffs2
|
FEATURES:=jffs2
|
||||||
CFLAGS:=-O2 -pipe -march=armv4t -mtune=arm920t -funit-at-a-time
|
CFLAGS:=-O2 -pipe -march=armv4t -mtune=arm920t -funit-at-a-time
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.29
|
LINUX_VERSION:=2.6.30.1
|
||||||
|
|
||||||
DEVICE_TYPE=phone
|
DEVICE_TYPE=phone
|
||||||
|
|
||||||
|
@ -1288,9 +1288,9 @@
|
|||||||
#include <mach/regs-mem.h>
|
#include <mach/regs-mem.h>
|
||||||
#include <mach/regs-lcd.h>
|
#include <mach/regs-lcd.h>
|
||||||
#include <mach/regs-sdi.h>
|
#include <mach/regs-sdi.h>
|
||||||
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c 2009-06-10 05:05:27.000000000 +0200
|
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
|
||||||
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c 2009-05-16 13:25:48.000000000 +0200
|
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
|
||||||
@@ -218,23 +231,16 @@
|
@@ -218,24 +218,17 @@ static int s3c24xx_pcm_prepare(struct sn
|
||||||
* sync to pclk, half-word transfers to the IIS-FIFO. */
|
* sync to pclk, half-word transfers to the IIS-FIFO. */
|
||||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||||
s3c2410_dma_devconfig(prtd->params->channel,
|
s3c2410_dma_devconfig(prtd->params->channel,
|
||||||
@ -1315,9 +1315,10 @@
|
|||||||
+ S3C2410_DMASRC_HW,
|
+ S3C2410_DMASRC_HW,
|
||||||
+ prtd->params->dma_addr);
|
+ prtd->params->dma_addr);
|
||||||
}
|
}
|
||||||
+
|
|
||||||
+ s3c2410_dma_config(prtd->params->channel,
|
+ s3c2410_dma_config(prtd->params->channel,
|
||||||
+ prtd->params->dma_size);
|
+ prtd->params->dma_size);
|
||||||
|
+
|
||||||
/* flush the DMA channel */
|
/* flush the DMA channel */
|
||||||
s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH);
|
s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH);
|
||||||
|
prtd->dma_loaded = 0;
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
diff -urNX /opt/Projects/openmoko-linux-2.6/orig/dontdiff /opt/Projects/openmoko-linux-2.6/orig/linux-2.6.29-rc3/drivers/serial/samsung.c /opt/Projects/openmoko-linux-2.6/drivers/serial/samsung.c
|
--- a/drivers/serial/samsung.c
|
||||||
--- a/drivers/serial/samsung.c 2009-01-28 19:49:30.000000000 +0100
|
+++ b/drivers/serial/samsung.c
|
||||||
+++ b/drivers/serial/samsung.c 2009-05-16 13:25:47.000000000 +0200
|
@@ -1263,6 +1263,13 @@ module_exit(s3c24xx_serial_modexit);
|
||||||
@@ -1208,6 +1355,13 @@
|
|
||||||
#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
|
#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
|
||||||
|
|
||||||
static struct uart_port *cons_uart;
|
static struct uart_port *cons_uart;
|
||||||
@ -15,7 +14,7 @@ diff -urNX /opt/Projects/openmoko-linux-2.6/orig/dontdiff /opt/Projects/openmoko
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
|
s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
|
||||||
@@ -1232,9 +1386,21 @@
|
@@ -1287,9 +1294,21 @@ static void
|
||||||
s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
|
s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
|
||||||
{
|
{
|
||||||
unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
|
unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
|
||||||
@ -37,4 +36,3 @@ diff -urNX /opt/Projects/openmoko-linux-2.6/orig/dontdiff /opt/Projects/openmoko
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/sound/soc/codecs/wm8753.c 2009-06-28 20:58:43.000000000 +0200
|
--- a/sound/soc/codecs/wm8753.c
|
||||||
+++ b/sound/soc/codecs/wm8753.c 2009-06-28 21:24:59.000000000 +0200
|
+++ b/sound/soc/codecs/wm8753.c
|
||||||
@@ -79,7 +79,7 @@
|
@@ -79,7 +79,7 @@ static const u16 wm8753_reg[] = {
|
||||||
0x0097, 0x0097, 0x0000, 0x0004,
|
0x0097, 0x0097, 0x0000, 0x0004,
|
||||||
0x0000, 0x0083, 0x0024, 0x01ba,
|
0x0000, 0x0083, 0x0024, 0x01ba,
|
||||||
0x0000, 0x0083, 0x0024, 0x01ba,
|
0x0000, 0x0083, 0x0024, 0x01ba,
|
||||||
@ -9,7 +9,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* codec private data */
|
/* codec private data */
|
||||||
@@ -1660,11 +1660,11 @@
|
@@ -1660,11 +1660,11 @@ static int wm8753_register(struct wm8753
|
||||||
codec->set_bias_level = wm8753_set_bias_level;
|
codec->set_bias_level = wm8753_set_bias_level;
|
||||||
codec->dai = wm8753_dai;
|
codec->dai = wm8753_dai;
|
||||||
codec->num_dai = 2;
|
codec->num_dai = 2;
|
||||||
|
Loading…
Reference in New Issue
Block a user