platform: tegra: emc: Move EMC header

Move the core EMC header to a common location. This allows different
sources to include it without the annoying "../../" type stuff.

Change-Id: I57d2d35e1961eca23d7dd69c2634e8e9af52d4b1
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/376787
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bo Yan <byan@nvidia.com>

9 files changed, 17 insertions, 25 deletions

diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index bf595c29dabf..e75e4d597f4f 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -39,12 +39,12 @@
 #include <linux/tegra-timer.h>
 
 #include <mach/edp.h>
+#include <mach/tegra_emc.h>
 
 #include "board.h"
 #include "clock.h"
 #include "dvfs.h"
 #include "iomap.h"
-#include "tegra_emc.h"
 #include "cpu-tegra.h"
 
 /* Global data of Tegra CPU CAR ops */
diff --git a/arch/arm/mach-tegra/tegra_emc.h b/arch/arm/mach-tegra/include/mach/tegra_emc.h
index afeb021c758c..f85ea5d482cb 100644
--- a/arch/arm/mach-tegra/tegra_emc.h
+++ b/arch/arm/mach-tegra/include/mach/tegra_emc.h
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra_emc.h
  *
- * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2013-2014, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-tegra/tegra11_emc.h b/arch/arm/mach-tegra/tegra11_emc.h
index 43e2c9c07f74..244ac5fc414c 100644
--- a/arch/arm/mach-tegra/tegra11_emc.h
+++ b/arch/arm/mach-tegra/tegra11_emc.h
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra11_emc.h
  *
- * Copyright (C) 2011-2013 NVIDIA Corporation
+ * Copyright (C) 2011-2014 NVIDIA Corporation.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,13 +15,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
  */
 
 #ifndef _MACH_TEGRA_TEGRA11_EMC_H
 #define _MACH_TEGRA_TEGRA11_EMC_H
 
-#include "tegra_emc.h"
+#include <mach/tegra_emc.h>
 
 int tegra11_emc_init(void);
 
diff --git a/arch/arm/mach-tegra/tegra12_emc.h b/arch/arm/mach-tegra/tegra12_emc.h
index 6a65cd208fe1..0a85163c128a 100644
--- a/arch/arm/mach-tegra/tegra12_emc.h
+++ b/arch/arm/mach-tegra/tegra12_emc.h
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra12_emc.h
  *
- * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2013-2014, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,13 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
  */
 
 #ifndef _MACH_TEGRA_TEGRA12_EMC_H
 #define _MACH_TEGRA_TEGRA12_EMC_H
 
-#include "tegra_emc.h"
+#include <mach/tegra_emc.h>
 #include <linux/platform_data/tegra_emc.h>
 
 int tegra12_emc_init(void);
diff --git a/arch/arm/mach-tegra/tegra14_emc.h b/arch/arm/mach-tegra/tegra14_emc.h
index b906c1e098db..f23ad94017cd 100644
--- a/arch/arm/mach-tegra/tegra14_emc.h
+++ b/arch/arm/mach-tegra/tegra14_emc.h
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra14_emc.h
  *
- * Copyright (c) 2013, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2013-2014, NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,13 +15,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
  */
 
 #ifndef _MACH_TEGRA_TEGRA14_EMC_H
 #define _MACH_TEGRA_TEGRA14_EMC_H
 
-#include "tegra_emc.h"
+#include <mach/tegra_emc.h>
 
 int tegra14_emc_init(void);
 extern u32 notrace tegra_read_usec_raw(void);
diff --git a/arch/arm/mach-tegra/tegra3_emc.h b/arch/arm/mach-tegra/tegra3_emc.h
index a0713df8c25d..d9466870869b 100644
--- a/arch/arm/mach-tegra/tegra3_emc.h
+++ b/arch/arm/mach-tegra/tegra3_emc.h
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra3_emc.h
  *
- * Copyright (C) 2011-2013, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (C) 2011-2014, NVIDIA CORPORATION. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,13 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
  */
 
 #ifndef _MACH_TEGRA_TEGRA3_EMC_H
 #define _MACH_TEGRA_TEGRA3_EMC_H
 
-#include "tegra_emc.h"
+#include <mach/tegra_emc.h>
 
 #define TEGRA_EMC_BRIDGE_RATE_MIN	300000000
 #define TEGRA_EMC_BRIDGE_MVOLTS_MIN	1200
diff --git a/arch/arm/mach-tegra/tegra_bb.c b/arch/arm/mach-tegra/tegra_bb.c
index b615a079f83e..c9801659847e 100644
--- a/arch/arm/mach-tegra/tegra_bb.c
+++ b/arch/arm/mach-tegra/tegra_bb.c
@@ -1,8 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra_bb.c
  *
- * Copyright (C) 2012-2013 NVIDIA Corporation. All rights reserved.
- *
+ * Copyright (C) 2012-2014 NVIDIA Corporation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -33,16 +32,16 @@
 #include <linux/clk/tegra.h>
 #include <linux/suspend.h>
 #include <linux/pm_runtime.h>
+#include <linux/platform_data/nvshm.h>
 
 #include <mach/tegra_bb.h>
 #include <mach/tegra_bbc_proxy.h>
 #include <mach/pm_domains.h>
-#include <linux/platform_data/nvshm.h>
+#include <mach/tegra_emc.h>
 
 #include "clock.h"
 #include "iomap.h"
 #include "sleep.h"
-#include "tegra_emc.h"
 #include "pm.h"
 
 /* BB mailbox offset */
diff --git a/arch/arm/mach-tegra/tegra_emc.c b/arch/arm/mach-tegra/tegra_emc.c
index 1fad9737eb6c..e859d0ff6dc3 100644
--- a/arch/arm/mach-tegra/tegra_emc.c
+++ b/arch/arm/mach-tegra/tegra_emc.c
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra_emc.c
  *
- * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2013-2014, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
  */
 
 #include <linux/kernel.h>
@@ -26,7 +25,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 
-#include "tegra_emc.h"
+#include <mach/tegra_emc.h>
 
 u8 tegra_emc_iso_share = 100;
 static unsigned long emc_iso_allocation;
diff --git a/arch/arm/mach-tegra/tegra_emc_therm.c b/arch/arm/mach-tegra/tegra_emc_therm.c
index b10201ef0fa8..1b2a5acf3da3 100644
--- a/arch/arm/mach-tegra/tegra_emc_therm.c
+++ b/arch/arm/mach-tegra/tegra_emc_therm.c
@@ -1,7 +1,5 @@
 /*
- * arch/arm/mach-tegra/therm-dram.c
- *
- * Copyright (C) 2013 NVIDIA Corporation. All rights reserved.
+ * Copyright (C) 2013-2014 NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -26,7 +24,7 @@
 #include <linux/timer.h>
 #include <linux/atomic.h>
 
-#include "tegra_emc.h"
+#include <mach/tegra_emc.h>
 
 #define TEGRA_DRAM_THERM_MAX_STATE     1