author | Dan Murphy <DMurphy@ti.com> | |
Mon, 29 Sep 2014 14:58:55 +0000 (09:58 -0500) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Mon, 29 Sep 2014 14:58:55 +0000 (09:58 -0500) |
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>
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>
1 | 2 | |||
---|---|---|---|---|
arch/arm/mach-omap2/Makefile | patch | | diff1 | | diff2 | | blob | history |
drivers/clk/ti/dpll.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/mach-omap2/Makefile
index c38e0696c017a2ffbfde89e65caefa352b439f4a,647029598b26fdaa127b0158a569a5bf8314c3cd..25591f2aeb46b879bb32d28268a8d2c18948cd67
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
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