FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-10 19:43:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'next-s3c64xx-fixes' into next-s3c-fixes

Browse Source
This commit is contained in:
Ben Dooks 2009-09-17 10:12:48 +01:00
commit 01875d56ae
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/plat-s3c64xx/dma.c
View File

@ -345,13 +345,13 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
if (!chan) if (!chan)
return -EINVAL; return -EINVAL;
buff = kzalloc(sizeof(struct s3c64xx_dma_buff), GFP_KERNEL); buff = kzalloc(sizeof(struct s3c64xx_dma_buff), GFP_ATOMIC);
if (!buff) { if (!buff) {
printk(KERN_ERR "%s: no memory for buffer\n", __func__); printk(KERN_ERR "%s: no memory for buffer\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
lli = dma_pool_alloc(dma_pool, GFP_KERNEL, &buff->lli_dma); lli = dma_pool_alloc(dma_pool, GFP_ATOMIC, &buff->lli_dma);
if (!lli) { if (!lli) {
printk(KERN_ERR "%s: no memory for lli\n", __func__); printk(KERN_ERR "%s: no memory for lli\n", __func__);
ret = -ENOMEM; ret = -ENOMEM;
@ -697,7 +697,7 @@ static int __init s3c64xx_dma_init(void)
printk(KERN_INFO "%s: Registering DMA channels\n", __func__); printk(KERN_INFO "%s: Registering DMA channels\n", __func__);
dma_pool = dma_pool_create("DMA-LLI", NULL, 32, 16, 0); dma_pool = dma_pool_create("DMA-LLI", NULL, sizeof(struct pl080s_lli), 16, 0);
if (!dma_pool) { if (!dma_pool) {
printk(KERN_ERR "%s: failed to create pool\n", __func__); printk(KERN_ERR "%s: failed to create pool\n", __func__);
return -ENOMEM; return -ENOMEM;

2
arch/arm/plat-s3c64xx/include/plat/dma-plat.h
View File

@ -26,7 +26,7 @@ struct s3c64xx_dma_buff {
struct s3c64xx_dma_buff *next; struct s3c64xx_dma_buff *next;
void *pw; void *pw;
struct pl080_lli *lli; struct pl080s_lli *lli;
dma_addr_t lli_dma; dma_addr_t lli_dma;
}; };

8
arch/arm/plat-s3c64xx/s3c6400-clock.c
View File

@ -302,8 +302,8 @@ static int s3c64xx_setrate_clksrc(struct clk *clk, unsigned long rate)
return -EINVAL; return -EINVAL;
val = __raw_readl(reg); val = __raw_readl(reg);
val &= ~(0xf << sclk->shift); val &= ~(0xf << sclk->divider_shift);
val |= (div - 1) << sclk->shift; val |= (div - 1) << sclk->divider_shift;
__raw_writel(val, reg); __raw_writel(val, reg);
return 0; return 0;
@ -328,6 +328,8 @@ static int s3c64xx_setparent_clksrc(struct clk *clk, struct clk *parent)
clksrc |= src_nr << sclk->shift; clksrc |= src_nr << sclk->shift;
__raw_writel(clksrc, S3C_CLK_SRC); __raw_writel(clksrc, S3C_CLK_SRC);
clk->parent = parent;
return 0; return 0;
} }
@ -343,7 +345,7 @@ static unsigned long s3c64xx_roundrate_clksrc(struct clk *clk,
if (rate > parent_rate) if (rate > parent_rate)
rate = parent_rate; rate = parent_rate;
else { else {
div = rate / parent_rate; div = parent_rate / rate;
if (div == 0) if (div == 0)
div = 1; div = 1;