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

Commit 5497e7b8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'late/fixes' into fixes 



* late/fixes:
  ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
  ARM: ux500: always select ABX500_CORE
  ARM: SIRF: select SMP_ON_UP only on SMP builds
  ARM: SPEAr: conditionalize l2x0 support
  ARM: imx: build CPU suspend code only when needed
  ARM: OMAP: build SMP code only for OMAP4/5
  ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
  ARM: default machine descriptor for multiplatform

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8cbc95ee eb16d332

arch/arm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -897,7 +897,6 @@ config ARCH_MULTI_V7 
	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"

	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"

	default y

	default y

	select ARCH_MULTI_V6_V7

	select ARCH_MULTI_V6_V7

	select ARCH_VEXPRESS

	select CPU_V7

	select CPU_V7





config ARCH_MULTI_V6_V7

config ARCH_MULTI_V6_V7

arch/arm/configs/omap2plus_defconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -137,6 +137,8 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y 
CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_OMAP=y

CONFIG_SERIAL_OMAP_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CHARDEV=y

CONFIG_SPI=y

CONFIG_SPI=y

arch/arm/kernel/devtree.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -180,6 +180,13 @@ struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) 
	unsigned long dt_root;

	unsigned long dt_root;

	const char *model;

	const char *model;





#ifdef CONFIG_ARCH_MULTIPLATFORM

	DT_MACHINE_START(GENERIC_DT, "Generic DT based system")

	MACHINE_END



	mdesc_best = (struct machine_desc *)&__mach_desc_GENERIC_DT;

#endif



	if (!dt_phys)

	if (!dt_phys)

		return NULL;

		return NULL;

arch/arm/kernel/setup.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/bootmem.h>

#include <linux/bootmem.h>

#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/screen_info.h>

#include <linux/screen_info.h>

#include <linux/of_platform.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/kexec.h>

#include <linux/kexec.h>

#include <linux/of_fdt.h>

#include <linux/of_fdt.h>
@@ -659,9 +660,19 @@ struct screen_info screen_info = { 




static int __init customize_machine(void)

static int __init customize_machine(void)

{

{

	/* customizes platform devices, or adds new ones */

	/*

	 * customizes platform devices, or adds new ones

	 * On DT based machines, we fall back to populating the

	 * machine from the device tree, if no callback is provided,

	 * otherwise we would always need an init_machine callback.

	 */

	if (machine_desc->init_machine)

	if (machine_desc->init_machine)

		machine_desc->init_machine();

		machine_desc->init_machine();

#ifdef CONFIG_OF

	else

		of_platform_populate(NULL, of_default_bus_match_table,

					NULL, NULL);

#endif

	return 0;

	return 0;

}

}

arch_initcall(customize_machine);

arch_initcall(customize_machine);

arch/arm/mach-imx/headsmp.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ ENTRY(v7_secondary_startup) 
ENDPROC(v7_secondary_startup)

ENDPROC(v7_secondary_startup)

#endif

#endif





#ifdef CONFIG_PM

#ifdef CONFIG_ARM_CPU_SUSPEND

/*

/*

 * The following code must assume it is running from physical address

 * The following code must assume it is running from physical address

 * where absolute virtual addresses to the data section have to be

 * where absolute virtual addresses to the data section have to be