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

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

Merge tag 'omap-for-v3.19/fixes-rc1' of... 

Merge tag 'omap-for-v3.19/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "omap fixes against v3.19-rc1" from Tony Lindgren:

Fixes for omaps mostly to deal with dra7 timer issues
and hypervisor mode. The other fixes are minor fixes for
various boards. The summary of the fixes is:

- Fix real-time counter rate typos for some frequencies
- Fix counter frequency drift for am572x
- Fix booting of secondary CPU in HYP mode
- Fix n900 board name for legacy user space
- Fix cpufreq in omap2plus_defconfig after Kconfig change
- Fix dra7 qspi partitions

And also, let's re-enable smc91x on some n900 boards that
we have sitting in a few test boot systems after the boot
loader dependencies got fixed.

* tag 'omap-for-v3.19/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: Revert disabling of smc91x for n900
  ARM: dts: dra7-evm: fix qspi device tree partition size
  ARM: omap2plus_defconfig: use CONFIG_CPUFREQ_DT
  ARM: OMAP2+: Fix n900 board name for legacy user space
  ARM: omap5/dra7xx: Enable booting secondary CPU in HYP mode
  ARM: dra7xx: Fix counter frequency drift for AM572x errata i856
  ARM: omap5/dra7xx: Fix frequency typos

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3be81429 7ac72746

arch/arm/boot/dts/dra7-evm.dts

+5 −5
Original line number Diff line number Diff line
@@ -499,23 +499,23 @@ 
		};

		partition@5 {

			label = "QSPI.u-boot-spl-os";

			reg = <0x00140000 0x00010000>;

			reg = <0x00140000 0x00080000>;

		};

		partition@6 {

			label = "QSPI.u-boot-env";

			reg = <0x00150000 0x00010000>;

			reg = <0x001c0000 0x00010000>;

		};

		partition@7 {

			label = "QSPI.u-boot-env.backup1";

			reg = <0x00160000 0x0010000>;

			reg = <0x001d0000 0x0010000>;

		};

		partition@8 {

			label = "QSPI.kernel";

			reg = <0x00170000 0x0800000>;

			reg = <0x001e0000 0x0800000>;

		};

		partition@9 {

			label = "QSPI.file-system";

			reg = <0x00970000 0x01690000>;

			reg = <0x009e0000 0x01620000>;

		};

	};

};

arch/arm/boot/dts/omap3-n900.dts

+1 −3
Original line number Diff line number Diff line
@@ -700,11 +700,9 @@ 
		};

	};



	/* Ethernet is on some early development boards and qemu */

	ethernet@gpmc {

		compatible = "smsc,lan91c94";



		status = "disabled";



		interrupt-parent = <&gpio2>;

		interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;	/* gpio54 */

		reg = <1 0x300 0xf>;		/* 16 byte IO range at offset 0x300 */

arch/arm/configs/omap2plus_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 
CONFIG_CPU_FREQ_GOV_POWERSAVE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

CONFIG_GENERIC_CPUFREQ_CPU0=y

CONFIG_CPUFREQ_DT=y

# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set

CONFIG_CPU_IDLE=y

CONFIG_BINFMT_MISC=y

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

+18 −0
Original line number Diff line number Diff line
@@ -77,6 +77,24 @@ MACHINE_END 
#endif



#ifdef CONFIG_ARCH_OMAP3

/* Some boards need board name for legacy userspace in /proc/cpuinfo */

static const char *const n900_boards_compat[] __initconst = {

	"nokia,omap3-n900",

	NULL,

};



DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board")

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap3430_init_early,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.dt_compat	= n900_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END



/* Generic omap3 boards, most boards can use these */

static const char *const omap3_boards_compat[] __initconst = {

	"ti,omap3430",

	"ti,omap3",

arch/arm/mach-omap2/common.h

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ extern void omap4_cpu_die(unsigned int cpu); 
extern struct smp_operations omap4_smp_ops;



extern void omap5_secondary_startup(void);

extern void omap5_secondary_hyp_startup(void);

#endif



#if defined(CONFIG_SMP) && defined(CONFIG_PM)