Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: dra7xx: Fix counter frequency drift for AM572x errata i856
  ARM: omap5/dra7xx: Fix frequency typos.

Conflicts:
	arch/arm/mach-omap2/control.h

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc arch/arm/mach-omap2/control.h
index 8acafad,7bd7d91..4ec6218
--- 1/arch/arm/mach-omap2/control.h
--- 2/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@@ -258,11 -258,10 +258,15 @@@
  #define OMAP5XXX_CONTROL_STATUS                0x134
  #define OMAP5_DEVICETYPE_MASK          (0x7 << 6)
  
 +/* DRA7XX DSP Reset Vector boot register */
 +#define DRA7XX_CTRL_CORE_CONTROL_DSP1_RST_VECT        0x55C
 +#define DRA7XX_CTRL_CORE_DSP_RST_VECT_MASK    (0x3FFFFF << 0)
 +#define DRA7XX_CTRL_CORE_DSP_RST_VECT_SHIFT   10
 +
+ /* DRA7XX CONTROL CORE BOOTSTRAP */
+ #define DRA7_CTRL_CORE_BOOTSTRAP      0x6c4
+ #define DRA7_SPEEDSELECT_MASK         (0x3 << 8)
+ 
  /*
   * REVISIT: This list of registers is not comprehensive - there are more
   * that should be added.

diff --cc arch/arm/mach-omap2/timer.c
index 64b16e5,84d0dc9..c2b3b1f
--- 1/arch/arm/mach-omap2/timer.c
--- 2/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -54,8 -54,8 +54,9 @@@
  
  #include "soc.h"
  #include "common.h"
+ #include "control.h"
  #include "powerdomain.h"
 +#include "pm.h"
  #include "omap-secure.h"
  
  #define REALTIME_COUNTER_BASE                         0x48243200