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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Olof Johansson 14 years ago b462fca4 1c2e1fd1

+6 -3

3 changed files

expand all

arch

arm

configs

imx_v4_v5_defconfig

mach-imx

imx27-dt.c

mm-imx5.c

arch/arm/configs/imx_v4_v5_defconfig

··· 112 112 CONFIG_IMX2_WDT=y 113 113 CONFIG_MFD_MC13XXX=y 114 114 CONFIG_REGULATOR=y 115 + CONFIG_REGULATOR_FIXED_VOLTAGE=y 115 116 CONFIG_REGULATOR_MC13783=y 116 117 CONFIG_REGULATOR_MC13892=y 117 118 CONFIG_FB=y

+4 -2

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

··· 35 35 static int __init imx27_avic_add_irq_domain(struct device_node *np, 36 36 struct device_node *interrupt_parent) 37 37 { 38 - irq_domain_add_simple(np, 0); 38 + irq_domain_add_legacy(np, 64, 0, 0, &irq_domain_simple_ops, NULL); 39 39 return 0; 40 40 } 41 41 ··· 44 44 { 45 45 static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS; 46 46 47 - irq_domain_add_simple(np, gpio_irq_base); 47 + gpio_irq_base -= 32; 48 + irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops, 49 + NULL); 48 50 49 51 return 0; 50 52 }

+1 -1

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

··· 35 35 } 36 36 clk_enable(gpc_dvfs_clk); 37 37 mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF); 38 - if (tzic_enable_wake() != 0) 38 + if (!tzic_enable_wake()) 39 39 cpu_do_idle(); 40 40 clk_disable(gpc_dvfs_clk); 41 41 }