Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 858b1814 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents ef82bdc5 00aaad22

arch/arm/mach-exynos4/clock.c

+2 −4
Original line number Diff line number Diff line
@@ -899,8 +899,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 28, .size = 4 },

	}, {

		.clk		= {

			.name		= "sclk_cam",

			.devname	= "exynos4-fimc.0",

			.name		= "sclk_cam0",

			.enable		= exynos4_clksrc_mask_cam_ctrl,

			.ctrlbit	= (1 << 16),

		},
@@ -909,8 +908,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 16, .size = 4 },

	}, {

		.clk		= {

			.name		= "sclk_cam",

			.devname	= "exynos4-fimc.1",

			.name		= "sclk_cam1",

			.enable		= exynos4_clksrc_mask_cam_ctrl,

			.ctrlbit	= (1 << 20),

		},

arch/arm/mach-s3c2443/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int s3c2443_armclk_setrate(struct clk *clk, unsigned long rate) 
		unsigned long clkcon0;



		clkcon0 = __raw_readl(S3C2443_CLKDIV0);

		clkcon0 &= S3C2443_CLKDIV0_ARMDIV_MASK;

		clkcon0 &= ~S3C2443_CLKDIV0_ARMDIV_MASK;

		clkcon0 |= val << S3C2443_CLKDIV0_ARMDIV_SHIFT;

		__raw_writel(clkcon0, S3C2443_CLKDIV0);

	}

arch/arm/mach-s5pv210/clock.c

+2 −4
Original line number Diff line number Diff line
@@ -815,8 +815,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },

	}, {

		.clk		= {

			.name		= "sclk_cam",

			.devname	= "s5pv210-fimc.0",

			.name		= "sclk_cam0",

			.enable		= s5pv210_clk_mask0_ctrl,

			.ctrlbit	= (1 << 3),

		},
@@ -825,8 +824,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 },

	}, {

		.clk		= {

			.name		= "sclk_cam",

			.devname	= "s5pv210-fimc.1",

			.name		= "sclk_cam1",

			.enable		= s5pv210_clk_mask0_ctrl,

			.ctrlbit	= (1 << 4),

		},

arch/arm/plat-s5p/irq-gpioint.c

+5 −4
Original line number Diff line number Diff line
@@ -114,18 +114,19 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip) 
{

	static int used_gpioint_groups = 0;

	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_type *ct;



	if (used_gpioint_groups >= S5P_GPIOINT_GROUP_COUNT)

		return -ENOMEM;



	list_for_each_entry(bank, &banks, list) {

		if (group >= bank->start &&

		    group < bank->start + bank->nr_groups)

	list_for_each_entry(b, &banks, list) {

		if (group >= b->start && group < b->start + b->nr_groups) {

			bank = b;

			break;

		}

	}

	if (!bank)

		return -EINVAL;