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

Commit 6701ef03 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.3/fixes-rc6' of... 

Merge tag 'omap-for-v4.3/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "Fixes for omaps for v4.3-rc cycle" from Tony Lindgren:

- Fix oops with LPAE and moew than 2GB of memory by enabling
  ZONE_DMA for LPAE. Probably no need for stable on this one as we
  only recently ran into this with the mainline kernel

- Fix imprecise external abort caused by bogus SRAM init. This affects
  dm814x recently merged, so no need for stable on this one AFAIK

* tag 'omap-for-v4.3/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init
  ARM: OMAP2+: Fix oops with LPAE and more than 2GB of memory
parents 4f1d8414 57df5380

arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


/ {

	model = "LogicPD Zoom DM3730 Torpedo Development Kit";

	compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap36xx";

	compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3";



	gpio_keys {

		compatible = "gpio-keys";

arch/arm/boot/dts/omap3-evm-37xx.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


/ {

	model = "TI OMAP37XX EVM (TMDSEVM3730)";

	compatible = "ti,omap3-evm-37xx", "ti,omap36xx";

	compatible = "ti,omap3-evm-37xx", "ti,omap3630", "ti,omap3";



	memory {

		device_type = "memory";

arch/arm/mach-omap2/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ config SOC_OMAP5 
	select OMAP_INTERCONNECT

	select OMAP_INTERCONNECT_BARRIER

	select PM_OPP if PM

	select ZONE_DMA if ARM_LPAE



config SOC_AM33XX

	bool "TI AM33XX"
@@ -78,6 +79,7 @@ config SOC_DRA7XX 
	select OMAP_INTERCONNECT

	select OMAP_INTERCONNECT_BARRIER

	select PM_OPP if PM

	select ZONE_DMA if ARM_LPAE



config ARCH_OMAP2PLUS

	bool

arch/arm/mach-omap2/board-generic.c

+10 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
MACHINE_END



static const char *const omap36xx_boards_compat[] __initconst = {

	"ti,omap3630",

	"ti,omap36xx",

	NULL,

};
@@ -243,6 +244,9 @@ static const char *const omap5_boards_compat[] __initconst = { 
};



DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)")

#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)

	.dma_zone_size	= SZ_2G,

#endif

	.reserve	= omap_reserve,

	.smp		= smp_ops(omap4_smp_ops),

	.map_io		= omap5_map_io,
@@ -288,6 +292,9 @@ static const char *const dra74x_boards_compat[] __initconst = { 
};



DT_MACHINE_START(DRA74X_DT, "Generic DRA74X (Flattened Device Tree)")

#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)

	.dma_zone_size	= SZ_2G,

#endif

	.reserve	= omap_reserve,

	.smp		= smp_ops(omap4_smp_ops),

	.map_io		= dra7xx_map_io,
@@ -308,6 +315,9 @@ static const char *const dra72x_boards_compat[] __initconst = { 
};



DT_MACHINE_START(DRA72X_DT, "Generic DRA72X (Flattened Device Tree)")

#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)

	.dma_zone_size	= SZ_2G,

#endif

	.reserve	= omap_reserve,

	.map_io		= dra7xx_map_io,

	.init_early	= dra7xx_init_early,

arch/arm/mach-omap2/pdata-quirks.c

+8 −1
Original line number Diff line number Diff line
@@ -559,7 +559,14 @@ static void pdata_quirks_check(struct pdata_init *quirks) 


void __init pdata_quirks_init(const struct of_device_id *omap_dt_match_table)

{

	/*

	 * We still need this for omap2420 and omap3 PM to work, others are

	 * using drivers/misc/sram.c already.

	 */

	if (of_machine_is_compatible("ti,omap2420") ||

	    of_machine_is_compatible("ti,omap3"))

		omap_sdrc_init(NULL, NULL);



	pdata_quirks_check(auxdata_quirks);

	of_platform_populate(NULL, omap_dt_match_table,

			     omap_auxdata_lookup, NULL);