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

Commit d8cff136 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

parents 7c289385 014aaf6b

arch/arm/mach-imx/mach-mx25_3ds.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static const uint32_t mx25pdk_keymap[] = { 
	KEY(3, 3, KEY_POWER),

};



static const struct matrix_keymap_data mx25pdk_keymap_data __initdata = {

static const struct matrix_keymap_data mx25pdk_keymap_data __initconst = {

	.keymap		= mx25pdk_keymap,

	.keymap_size	= ARRAY_SIZE(mx25pdk_keymap),

};

arch/arm/mach-mxs/clock-mx23.c

+2 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int name##_set_rate(struct clk *clk, unsigned long rate) \ 
	reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr);		\

	reg &= ~BM_CLKCTRL_##dr##_DIV;					\

	reg |= div << BP_CLKCTRL_##dr##_DIV;				\

	if (reg | (1 << clk->enable_shift)) {				\

	if (reg & (1 << clk->enable_shift)) {				\

		pr_err("%s: clock is gated\n", __func__);		\

		return -EINVAL;						\

	}								\
@@ -347,7 +347,7 @@ static int name##_set_parent(struct clk *clk, struct clk *parent) \ 
{									\

	if (parent != clk->parent) {					\

		__raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit,		\

			 HW_CLKCTRL_CLKSEQ_TOG);			\

			 CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG);	\

		clk->parent = parent;					\

	}								\

									\

arch/arm/mach-mxs/clock-mx28.c

+3 −4
Original line number Diff line number Diff line
@@ -355,12 +355,12 @@ static int name##_set_rate(struct clk *clk, unsigned long rate) \ 
	} else {							\

		reg &= ~BM_CLKCTRL_##dr##_DIV;				\

		reg |= div << BP_CLKCTRL_##dr##_DIV;			\

		if (reg | (1 << clk->enable_shift)) {			\

		if (reg & (1 << clk->enable_shift)) {			\

			pr_err("%s: clock is gated\n", __func__);	\

			return -EINVAL;					\

		}							\

	}								\

	__raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_CPU);		\

	__raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr);		\

									\

	for (i = 10000; i; i--)						\

		if (!(__raw_readl(CLKCTRL_BASE_ADDR +			\
@@ -483,7 +483,7 @@ static int name##_set_parent(struct clk *clk, struct clk *parent) \ 
{									\

	if (parent != clk->parent) {					\

		__raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit,		\

			 HW_CLKCTRL_CLKSEQ_TOG);			\

			 CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG);	\

		clk->parent = parent;					\

	}								\

									\
@@ -609,7 +609,6 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("duart", NULL, uart_clk)

	_REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk)

	_REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk)

	_REGISTER_CLOCK("fec.0", NULL, fec_clk)

	_REGISTER_CLOCK("rtc", NULL, rtc_clk)

	_REGISTER_CLOCK("pll2", NULL, pll2_clk)

	_REGISTER_CLOCK(NULL, "hclk", hbus_clk)

arch/arm/mach-mxs/clock.c

+0 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ static void __clk_disable(struct clk *clk) 
		if (clk->disable)

			clk->disable(clk);

		__clk_disable(clk->parent);

		__clk_disable(clk->secondary);

	}

}
@@ -68,7 +67,6 @@ static int __clk_enable(struct clk *clk) 


	if (clk->usecount++ == 0) {

		__clk_enable(clk->parent);

		__clk_enable(clk->secondary);



		if (clk->enable)

			clk->enable(clk);

arch/arm/mach-mxs/gpio.c

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc) 
	struct mxs_gpio_port *port = (struct mxs_gpio_port *)get_irq_data(irq);

	u32 gpio_irq_no_base = port->virtual_irq_start;



	desc->irq_data.chip->irq_ack(&desc->irq_data);



	irq_stat = __raw_readl(port->base + PINCTRL_IRQSTAT(port->id)) &

			__raw_readl(port->base + PINCTRL_IRQEN(port->id));