]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
platform: tegra: move pmc power detect to platform/tegra
authorLaxman Dewangan <ldewangan@nvidia.com>
Wed, 3 Jun 2015 10:54:49 +0000 (16:24 +0530)
committerLaxman Dewangan <ldewangan@nvidia.com>
Thu, 4 Jun 2015 05:28:03 +0000 (22:28 -0700)
Move Tegra PMC power detect driver to platform/tegra as central
location for all architecture.

Change-Id: I43a013407dea79bccef698b4614e18e7148837a7
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/751883

arch/arm/mach-tegra/Makefile
arch/arm64/mach-tegra/Makefile
arch/arm64/mach-tegra/powerdetect.c [deleted file]
drivers/platform/tegra/Makefile
drivers/platform/tegra/tegra-pmc-powerdetect.c [moved from arch/arm/mach-tegra/powerdetect.c with 99% similarity]

index 0ee14ee0a86c7edf164fb0d2b2e0ec3c32317d0b..05a1cd8657bdc503d827faf7a19ca18d4b0b9ebc 100644 (file)
@@ -77,7 +77,6 @@ obj-$(CONFIG_CPU_IDLE)                  += cpuidle.o
 obj-$(CONFIG_CPU_IDLE)                  += sleep.o
 obj-$(CONFIG_SMP)                       += platsmp.o
 obj-y                                   += headsmp.o
-obj-$(CONFIG_TEGRA_DYNAMIC_PWRDET)      += powerdetect.o
 
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += board-dt-tegra20.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += board-dt-tegra30.o
index 4741dcb1fec4481a44fa365417de36345d74b11f..341553775f9b568b64c3d7ba3a6109baba03b31a 100644 (file)
@@ -89,7 +89,5 @@ obj-y                                 += sleep.o
 obj-$(CONFIG_ARCH_TEGRA_13x_SOC)      += pm-tegra132.o
 endif
 
-obj-$(CONFIG_TEGRA_DYNAMIC_PWRDET)      += powerdetect.o
-
 # To override the "-march=armv7-xxx" in arm/mach-tegra/Makefile
 AFLAGS_sleep.o :=
diff --git a/arch/arm64/mach-tegra/powerdetect.c b/arch/arm64/mach-tegra/powerdetect.c
deleted file mode 100644 (file)
index 74daf14..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../arm/mach-tegra/powerdetect.c"
index 6a2a45e1503042b9c38d58d102cdbe6b3f043e70..515a541d09b951fd36655740b5247cf9f10ef3f0 100644 (file)
@@ -27,6 +27,7 @@ obj-y += nvdumper/
 obj-$(CONFIG_PM_SLEEP) += pm-irq.o
 obj-$(CONFIG_TEGRA_PMC) += pmc.o
 obj-$(CONFIG_TEGRA210_BOOTROM_PMC) += tegra-bootrom-pmc-config.o
+obj-$(CONFIG_TEGRA_DYNAMIC_PWRDET)     += tegra-pmc-powerdetect.o
 obj-y += pm.o
 
 obj-$(CONFIG_TEGRA_MC_DOMAINS) += pm_domains.o
similarity index 99%
rename from arch/arm/mach-tegra/powerdetect.c
rename to drivers/platform/tegra/tegra-pmc-powerdetect.c
index ba5ce4c670738da1288cbf7f03572d527803af15..803ea4c1bc72bf1fa041cbb76713bc61c4b8c868 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-tegra/powerdetect.c
+ * tegra-pmc-powerdetect.c
  *
  * Copyright (c) 2011 - 2014, NVIDIA CORPORATION.  All rights reserved.
  *