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

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

Merge branch 'fixes-for-arm-soc-20120416' of... 

Merge branch 'fixes-for-arm-soc-20120416' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

* 'fixes-for-arm-soc-20120416' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: update defconfig
  ARM: ux500: Fix unmet direct dependency
  ARM: ux500: wake secondary cpu via resched
parents b462fca4 f27962ac

arch/arm/configs/u8500_defconfig

+4 −5
Original line number Original line Diff line number Diff line
@@ -8,8 +8,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_LBDAF is not set

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_U8500=y

CONFIG_ARCH_U8500=y

CONFIG_UX500_SOC_DB5500=y

CONFIG_UX500_SOC_DB8500=y

CONFIG_MACH_HREFV60=y

CONFIG_MACH_HREFV60=y

CONFIG_MACH_SNOWBALL=y

CONFIG_MACH_SNOWBALL=y

CONFIG_MACH_U5500=y

CONFIG_MACH_U5500=y
@@ -39,7 +37,6 @@ CONFIG_CAIF=y 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_MISC_DEVICES=y

CONFIG_AB8500_PWM=y

CONFIG_AB8500_PWM=y

CONFIG_SENSORS_BH1780=y

CONFIG_SENSORS_BH1780=y

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y
@@ -65,16 +62,18 @@ CONFIG_SERIAL_AMBA_PL011=y 
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_NOMADIK=y

CONFIG_HW_RANDOM_NOMADIK=y

CONFIG_I2C=y

CONFIG_I2C_NOMADIK=y

CONFIG_SPI=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_SPI_PL022=y

CONFIG_GPIO_STMPE=y

CONFIG_GPIO_STMPE=y

CONFIG_GPIO_TC3589X=y

CONFIG_GPIO_TC3589X=y

CONFIG_POWER_SUPPLY=y

CONFIG_AB8500_BM=y

CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y

CONFIG_MFD_STMPE=y

CONFIG_MFD_STMPE=y

CONFIG_MFD_TC3589X=y

CONFIG_MFD_TC3589X=y

CONFIG_AB5500_CORE=y

CONFIG_AB5500_CORE=y

CONFIG_AB8500_CORE=y

CONFIG_AB8500_CORE=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_AB8500=y

CONFIG_REGULATOR_AB8500=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET=y

arch/arm/mach-ux500/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ config UX500_SOC_DB5500 
config UX500_SOC_DB8500

config UX500_SOC_DB8500

	bool

	bool

	select MFD_DB8500_PRCMU

	select MFD_DB8500_PRCMU

	select REGULATOR

	select REGULATOR_DB8500_PRCMU

	select REGULATOR_DB8500_PRCMU

	select CPU_FREQ_TABLE if CPU_FREQ

	select CPU_FREQ_TABLE if CPU_FREQ

arch/arm/mach-ux500/platsmp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -99,7 +99,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) 
	 */

	 */

	write_pen_release(cpu_logical_map(cpu));

	write_pen_release(cpu_logical_map(cpu));





	gic_raise_softirq(cpumask_of(cpu), 1);

	smp_send_reschedule(cpu);





	timeout = jiffies + (1 * HZ);

	timeout = jiffies + (1 * HZ);

	while (time_before(jiffies, timeout)) {

	while (time_before(jiffies, timeout)) {