Revert "ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>"
Dan Willemsen [Tue, 20 Aug 2013 03:48:25 +0000 (20:48 -0700)]
This reverts commit e4bcda28344cc4762c57ad7333f0472a39e83479.

Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

arch/arm/mach-tegra/board.h
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/include/mach/powergate.h [moved from include/linux/tegra-powergate.h with 92% similarity]
arch/arm/mach-tegra/pcie.c
arch/arm/mach-tegra/powergate.c
drivers/clk/tegra/clk-tegra30.c

index 1787327..60431de 100644 (file)
@@ -40,7 +40,6 @@ int tegra_clk_debugfs_init(void);
 static inline int tegra_clk_debugfs_init(void) { return 0; }
 #endif
 
-int __init tegra_powergate_init(void);
 #if defined(CONFIG_ARCH_TEGRA_2x_SOC) && defined(CONFIG_DEBUG_FS)
 int __init tegra_powergate_debugfs_init(void);
 #else
index d03bc83..b02ebe7 100644 (file)
@@ -27,6 +27,8 @@
 
 #include <asm/hardware/cache-l2x0.h>
 
+#include <mach/powergate.h>
+
 #include "board.h"
 #include "common.h"
 #include "fuse.h"
similarity index 92%
rename from include/linux/tegra-powergate.h
rename to arch/arm/mach-tegra/include/mach/powergate.h
index 55c29a8..06763fe 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * drivers/regulator/tegra-regulator.c
+ *
  * Copyright (c) 2010 Google, Inc
  *
  * Author:
@@ -38,6 +40,9 @@ struct clk;
 #define TEGRA_POWERGATE_CPU0   TEGRA_POWERGATE_CPU
 #define TEGRA_POWERGATE_3D0    TEGRA_POWERGATE_3D
 
+int  __init tegra_powergate_init(void);
+
+int tegra_cpu_powergate_id(int cpuid);
 int tegra_powergate_is_powered(int id);
 int tegra_powergate_power_on(int id);
 int tegra_powergate_power_off(int id);
index 46144a1..b60165f 100644 (file)
 #include <linux/delay.h>
 #include <linux/export.h>
 #include <linux/clk/tegra.h>
-#include <linux/tegra-powergate.h>
 
 #include <asm/sizes.h>
 #include <asm/mach/pci.h>
 
+#include <mach/powergate.h>
+
 #include "board.h"
 #include "iomap.h"
 
index f076f0f..af9067e 100644 (file)
@@ -28,7 +28,8 @@
 #include <linux/seq_file.h>
 #include <linux/spinlock.h>
 #include <linux/clk/tegra.h>
-#include <linux/tegra-powergate.h>
+
+#include <mach/powergate.h>
 
 #include "fuse.h"
 #include "iomap.h"
index ba99e38..bdbbce8 100644 (file)
@@ -22,7 +22,8 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/clk/tegra.h>
-#include <linux/tegra-powergate.h>
+
+#include <mach/powergate.h>
 
 #include "clk.h"