lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung

Browse Source 
* 'samsung-fixes-3' of git://github.com/kgene/linux-samsung:
  ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver
  ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
  ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt
  ARM: S3C2443: Fix bit-reset in setrate of clk_armdiv
This commit is contained in:
Linus Torvalds
2011-09-26 16:29:26 -07:00
parent ef82bdc57a 00aaad227a
commit 858b1814b8
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-exynos4/clock.c
View File

@@ -899,8 +899,7 @@ static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 28, .size = 4 }, .reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 28, .size = 4 },
}, { }, {
.clk = { .clk = {
.name = "sclk_cam", .name = "sclk_cam0",
.devname = "exynos4-fimc.0",
.enable = exynos4_clksrc_mask_cam_ctrl, .enable = exynos4_clksrc_mask_cam_ctrl,
.ctrlbit = (1 << 16), .ctrlbit = (1 << 16),
}, },
@@ -909,8 +908,7 @@ static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 16, .size = 4 }, .reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 16, .size = 4 },
}, { }, {
.clk = { .clk = {
.name = "sclk_cam", .name = "sclk_cam1",
.devname = "exynos4-fimc.1",
.enable = exynos4_clksrc_mask_cam_ctrl, .enable = exynos4_clksrc_mask_cam_ctrl,
.ctrlbit = (1 << 20), .ctrlbit = (1 << 20),
}, },

2
arch/arm/mach-s3c2443/clock.c
View File

@@ -128,7 +128,7 @@ static int s3c2443_armclk_setrate(struct clk *clk, unsigned long rate)
unsigned long clkcon0; unsigned long clkcon0;
clkcon0 = __raw_readl(S3C2443_CLKDIV0); clkcon0 = __raw_readl(S3C2443_CLKDIV0);
clkcon0 &= S3C2443_CLKDIV0_ARMDIV_MASK; clkcon0 &= ~S3C2443_CLKDIV0_ARMDIV_MASK;
clkcon0 |= val << S3C2443_CLKDIV0_ARMDIV_SHIFT; clkcon0 |= val << S3C2443_CLKDIV0_ARMDIV_SHIFT;
__raw_writel(clkcon0, S3C2443_CLKDIV0); __raw_writel(clkcon0, S3C2443_CLKDIV0);
} }

6
arch/arm/mach-s5pv210/clock.c
View File

@@ -815,8 +815,7 @@ static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 }, .reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },
}, { }, {
.clk = { .clk = {
.name = "sclk_cam", .name = "sclk_cam0",
.devname = "s5pv210-fimc.0",
.enable = s5pv210_clk_mask0_ctrl, .enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
}, },
@@ -825,8 +824,7 @@ static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 }, .reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 },
}, { }, {
.clk = { .clk = {
.name = "sclk_cam", .name = "sclk_cam1",
.devname = "s5pv210-fimc.1",
.enable = s5pv210_clk_mask0_ctrl, .enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 4), .ctrlbit = (1 << 4),
}, },

9
arch/arm/plat-s5p/irq-gpioint.c
View File

@@ -114,18 +114,19 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip)
{ {
static int used_gpioint_groups = 0; static int used_gpioint_groups = 0;
int group = chip->group; int group = chip->group;
struct s5p_gpioint_bank *bank = NULL; struct s5p_gpioint_bank *b, *bank = NULL;
struct irq_chip_generic *gc; struct irq_chip_generic *gc;
struct irq_chip_type *ct; struct irq_chip_type *ct;
if (used_gpioint_groups >= S5P_GPIOINT_GROUP_COUNT) if (used_gpioint_groups >= S5P_GPIOINT_GROUP_COUNT)
return -ENOMEM; return -ENOMEM;
list_for_each_entry(bank, &banks, list) { list_for_each_entry(b, &banks, list) {
if (group >= bank->start && if (group >= b->start && group < b->start + b->nr_groups) {
group < bank->start + bank->nr_groups) bank = b;
break; break;
} }
}
if (!bank) if (!bank)
return -EINVAL; return -EINVAL;