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

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

Merge tag 'omap-for-v4.8/soc-signed' of... 

Merge tag 'omap-for-v4.8/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC related changes for omaps for v4.8 merge window:

- A series of DSS platform_data fixes to prepare for DSS driver changes
- Add tblck clck aliases for PWM
- A series of trivial spelling corrections
- Remove bogus eQEP, ePWM and eCAP hwmod entries
- A series of McBSP sidetone fixes
- Remove QSPI and DSS addresses from hwmod, these come from dts
- Fix RSTST register offset for pruss
- Make ti81xx_rtc_hwmod static
- Remove wrongly defined RSTST offset for PER Domain, note
  that the subject for this one wrongly has "dts" in the
  subject
- Add support for omap5 and dra7 workaround for 801819
- A series of patches to make kexec work for SMP omaps

* tag 'omap-for-v4.8/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (30 commits)
  ARM: OMAP2+: Fix build if CONFIG_SMP is not set
  ARM: OMAP4+: Allow kexec on SMP variants
  ARM: OMAP4+: Reset CPU1 properly for kexec
  ARM: OMAP4+: Prevent CPU1 related hang with kexec
  ARM: OMAP4+: Initialize SAR RAM base early for proper CPU1 reset for kexec
  ARM: dts: am43xx: Remove wrongly defined RSTST offset for PER Domain
  ARM: OMAP: make ti81xx_rtc_hwmod static
  ARM: AM43XX: hwmod: Fix RSTST register offset for pruss
  ARM: DRA7: hwmod: remove DSS addresses from hwmod
  ARM: DRA7: hwmod: Remove QSPI address space entry from hwmod
  ARM: OMAP2+: McBSP: Remove the old iclk allow/deny idle code
  ASoC: omap-mcbsp: sidetone: Use the new callback for iclk handling
  ASoC: omap-mcbsp: Rename omap_mcbsp_sysfs_remove() to omap_mcbsp_cleanup()
  ARM: OMAP3: pdata-quirks: Add support for McBSP2/3 sidetone handling
  ARM: OMAP3: McBSP: New callback for McBSP2/3 ICLK idle configuration
  ARM: OMAP3: hwmod data: Fix McBSP2/3 sidetone data
  ARM: AM335x/AM437x: hwmod: Remove eQEP, ePWM and eCAP hwmod entries
  ARM: OMAP2+: Fix typo in sdrc.h
  ARM: OMAP2+: Fix typo in omap_device.c
  ARM: OMAP2+: Fix typo in omap4-common.c
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fa06f54a 44e7475d

arch/arm/mach-omap1/ams-delta-fiq.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ void __init ams_delta_init_fiq(void) 
		fiq_buffer[i] = 0;



	/*

	 * FIQ mode r9 always points to the fiq_buffer, becauses the FIQ isr

	 * FIQ mode r9 always points to the fiq_buffer, because the FIQ isr

	 * will run in an unpredictable context. The fiq_buffer is the FIQ isr's

	 * only means of communication with the IRQ level and other kernel

	 * context code.

arch/arm/mach-omap1/include/mach/mtd-xip.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static inline unsigned long xip_omap_mpu_timer_read(int nr) 
#define xip_currtime()		(~xip_omap_mpu_timer_read(0))



/*

 * It's permitted to do approxmation for xip_elapsed_since macro

 * It's permitted to do approximation for xip_elapsed_since macro

 * (see linux/mtd/xip.h)

 */

arch/arm/mach-omap2/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -240,4 +240,12 @@ endmenu 


endif



config OMAP5_ERRATA_801819

	bool "Errata 801819: An eviction from L1 data cache might stall indefinitely"

	depends on SOC_OMAP5 || SOC_DRA7XX

	help

	  A livelock can occur in the L2 cache arbitration that might prevent

	  a snoop from completing. Under certain conditions this can cause the

	  system to deadlock.



endmenu

arch/arm/mach-omap2/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ccflags-y := -I$(srctree)/$(src)/include \ 
# Common support

obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o timer.o pm.o \

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 omap_device.o sram.o drm.o

	 omap_device.o omap-headsmp.o sram.o drm.o



hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \

					  omap_hwmod_common_data.o
@@ -32,7 +32,7 @@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o 


# SMP support ONLY available for OMAP4



smp-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o

smp-$(CONFIG_SMP)			+= omap-smp.o

smp-$(CONFIG_HOTPLUG_CPU)		+= omap-hotplug.o

omap-4-5-common				=  omap4-common.o omap-wakeupgen.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-4-5-common) $(smp-y) sleep44xx.o

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

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "gpmc.h"

#include "gpmc-smsc911x.h"



#include <video/omapdss.h>

#include <linux/platform_data/omapdss.h>

#include <video/omap-panel-data.h>



#include "board-flash.h"
@@ -47,6 +47,7 @@ 
#include "hsmmc.h"

#include "control.h"

#include "common-board-devices.h"

#include "display.h"



#define LDP_SMSC911X_CS		1

#define LDP_SMSC911X_GPIO	152