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

Commit b462fca4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v3.4-rc3-imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 

ARM i.MX misc fixes for -rc

* tag 'v3.4-rc3-imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx: Fix imx5 idle logic bug
  ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple()
  ARM: imx_v4_v5_defconfig: Add support for CONFIG_REGULATOR_FIXED_VOLTAGE
parents 1c2e1fd1 4659b7f1

arch/arm/configs/imx_v4_v5_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ CONFIG_WATCHDOG=y 
CONFIG_IMX2_WDT=y

CONFIG_IMX2_WDT=y

CONFIG_MFD_MC13XXX=y

CONFIG_MFD_MC13XXX=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_REGULATOR_MC13892=y

CONFIG_FB=y

CONFIG_FB=y

arch/arm/mach-imx/imx27-dt.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = { 
static int __init imx27_avic_add_irq_domain(struct device_node *np,

static int __init imx27_avic_add_irq_domain(struct device_node *np,

				struct device_node *interrupt_parent)

				struct device_node *interrupt_parent)

{

{

	irq_domain_add_simple(np, 0);

	irq_domain_add_legacy(np, 64, 0, 0, &irq_domain_simple_ops, NULL);

	return 0;

	return 0;

}

}
@@ -44,7 +44,9 @@ static int __init imx27_gpio_add_irq_domain(struct device_node *np, 
{

{

	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;

	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;





	irq_domain_add_simple(np, gpio_irq_base);

	gpio_irq_base -= 32;

	irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops,

				NULL);





	return 0;

	return 0;

}

}

arch/arm/mach-imx/mm-imx5.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ static void imx5_idle(void) 
	}

	}

	clk_enable(gpc_dvfs_clk);

	clk_enable(gpc_dvfs_clk);

	mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);

	mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);

	if (tzic_enable_wake() != 0)

	if (!tzic_enable_wake())

		cpu_do_idle();

		cpu_do_idle();

	clk_disable(gpc_dvfs_clk);

	clk_disable(gpc_dvfs_clk);

}

}