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:
  ti_config_fragments/am43x_only.cfg: Create a seperate config fragment for am43xx devices
  ti_config_fragments/am33x_only.cfg: Create a seperate config fragment for am33xx devices
  clk: ti: am43x: Fix boot with CONFIG_SOC_AM33XX disabled
  clk: ti: dra7-atl-clock: Mark the device as pm_runtime_irq_safe
  ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7

Conflicts:
	arch/arm/mach-omap2/Makefile

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

diff --cc arch/arm/mach-omap2/Makefile
index c38e069,6470295..25591f2
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -90,11 -87,10 +90,12 @@@ ifeq ($(CONFIG_PM),y
  obj-$(CONFIG_ARCH_OMAP2)              += pm24xx.o
  obj-$(CONFIG_ARCH_OMAP2)              += sleep24xx.o
  obj-$(CONFIG_ARCH_OMAP3)              += pm34xx.o sleep34xx.o
- obj-$(CONFIG_ARCH_OMAP4)              += pm44xx.o omap-mpuss-lowpower.o
- obj-$(CONFIG_SOC_OMAP5)                       += omap-mpuss-lowpower.o
- obj-$(CONFIG_SOC_DRA7XX)              += omap-mpuss-lowpower.o
 -omap-4-5-pm-common                    =  pm44xx.o omap-mpuss-lowpower.o
++omap-4-5-pm-common                            =  pm44xx.o omap-mpuss-lowpower.o
+ obj-$(CONFIG_ARCH_OMAP4)              += $(omap-4-5-pm-common)
+ obj-$(CONFIG_SOC_OMAP5)                       += $(omap-4-5-pm-common)
+ obj-$(CONFIG_SOC_DRA7XX)              += $(omap-4-5-pm-common)
 +obj-$(CONFIG_SOC_AM33XX)              += pm33xx.o sleep33xx.o
 +obj-$(CONFIG_SOC_AM43XX)              += pm33xx.o sleep43xx.o
  obj-$(CONFIG_PM_DEBUG)                        += pm-debug.o
  
  obj-$(CONFIG_POWER_AVS_OMAP)          += sr_device.o
@@@ -108,10 -102,11 +109,13 @@@ AFLAGS_sleep43xx.o                      :=-Wa,-march=armv7
  endif
  
  ifeq ($(CONFIG_CPU_IDLE),y)
 +obj-$(CONFIG_SOC_AM33XX)                += cpuidle33xx.o
 +obj-$(CONFIG_SOC_AM43XX)                += cpuidle43xx.o
  obj-$(CONFIG_ARCH_OMAP3)                += cpuidle34xx.o
- obj-$(CONFIG_ARCH_OMAP4)                += cpuidle44xx.o
+ omap-4-5-idle-common                  =  cpuidle44xx.o
+ obj-$(CONFIG_ARCH_OMAP4)              += $(omap-4-5-idle-common)
+ obj-$(CONFIG_SOC_OMAP5)                       += $(omap-4-5-idle-common)
+ obj-$(CONFIG_SOC_DRA7XX)              += $(omap-4-5-idle-common)
  endif
  
  # PRCM

diff --cc drivers/clk/ti/dpll.c
Simple merge