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

Commit 3c2b251e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ux500-fixes-for-v3.8' of... 

Merge tag 'ux500-fixes-for-v3.8' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

From Linus Walleij:
- U9540 boot regression fix due to new clock framework
- Configure out the yet instable battery management driver
- Adjust cache initilization per SoC family

* tag 'ux500-fixes-for-v3.8' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: Fix u9540 booting issues
  ARM: ux500: add spin_unlock(&master_lock).
  ARM: ux500: Disable Power Supply and Battery Management by default

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 949db153 57940016

arch/arm/configs/u8500_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ CONFIG_SPI=y 
CONFIG_SPI_PL022=y

CONFIG_GPIO_STMPE=y

CONFIG_GPIO_TC3589X=y

CONFIG_POWER_SUPPLY=y

CONFIG_AB8500_BM=y

CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y

# CONFIG_POWER_SUPPLY is not set

# CONFIG_AB8500_BM is not set

# CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL is not set

CONFIG_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_MFD_STMPE=y

arch/arm/mach-ux500/cpu.c

+2 −4
Original line number Diff line number Diff line
@@ -71,13 +71,11 @@ void __init ux500_init_irq(void) 
	 * Init clocks here so that they are available for system timer

	 * initialization.

	 */

	if (cpu_is_u8500_family())

	if (cpu_is_u8500_family() || cpu_is_u9540())

		db8500_prcmu_early_init();



	if (cpu_is_u8500_family())

	if (cpu_is_u8500_family() || cpu_is_u9540())

		u8500_clk_init();

	else if (cpu_is_u9540())

		u9540_clk_init();

	else if (cpu_is_u8540())

		u8540_clk_init();

}

arch/arm/mach-ux500/cpuidle.c

+3 −1
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ static inline int ux500_enter_idle(struct cpuidle_device *dev, 
			goto wfi;



		/* decouple the gic from the A9 cores */

		if (prcmu_gic_decouple())

		if (prcmu_gic_decouple()) {

			spin_unlock(&master_lock);

			goto out;

		}



		/* If an error occur, we will have to recouple the gic

		 * manually */