Re: [U-Boot] [PATCH 34/60] ARM: tegra: move flow.h

[Simon Glass]

On 19 April 2016 at 14:59, Stephen Warren  wrote:
> From: Stephen Warren 
>
> This header is only needed by code local to mach-tegra, so move it there.
> Since the definitions are used by code in mach-tegra/ itself, not just in
> SoC-specific mach-tegra/tegraNNN/, and the content varies per SoC, we need
> to put it in the (somewhat isolated)  include directory rather than
> in mach-tegra/ directly.
>
> Signed-off-by: Stephen Warren 
> ---
>  arch/arm/mach-tegra/powergate.c   | 2 +-
>  arch/arm/mach-tegra/tegra114/cpu.c| 2 +-
>  .../asm/arch-tegra30 => mach-tegra/tegra114/include/soc}/flow.h   | 8 
> 
>  arch/arm/mach-tegra/tegra124/cpu.c| 2 +-
>  .../asm/arch-tegra124 => mach-tegra/tegra124/include/soc}/flow.h  | 6 +++---
>  arch/arm/mach-tegra/tegra124/psci.c   | 2 +-
>  .../asm/arch-tegra20 => mach-tegra/tegra20/include/soc}/flow.h| 4 ++--
>  arch/arm/mach-tegra/tegra20/warmboot_avp.c| 2 +-
>  .../asm/arch-tegra210 => mach-tegra/tegra210/include/soc}/flow.h  | 6 +++---
>  arch/arm/mach-tegra/tegra30/cpu.c | 2 +-
>  .../asm/arch-tegra114 => mach-tegra/tegra30/include/soc}/flow.h   | 8 
> 
>  11 files changed, 22 insertions(+), 22 deletions(-)
>  rename arch/arm/{include/asm/arch-tegra30 => 
> mach-tegra/tegra114/include/soc}/flow.h (67%)
>  rename arch/arm/{include/asm/arch-tegra124 => 
> mach-tegra/tegra124/include/soc}/flow.h (93%)
>  rename arch/arm/{include/asm/arch-tegra20 => 
> mach-tegra/tegra20/include/soc}/flow.h (85%)
>  rename arch/arm/{include/asm/arch-tegra210 => 
> mach-tegra/tegra210/include/soc}/flow.h (90%)
>  rename arch/arm/{include/asm/arch-tegra114 => 
> mach-tegra/tegra30/include/soc}/flow.h (67%)

Reviewed-by: Simon Glass 
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 34/60] ARM: tegra: move flow.h

[Stephen Warren]

From: Stephen Warren 

This header is only needed by code local to mach-tegra, so move it there.
Since the definitions are used by code in mach-tegra/ itself, not just in
SoC-specific mach-tegra/tegraNNN/, and the content varies per SoC, we need
to put it in the (somewhat isolated)  include directory rather than
in mach-tegra/ directly.

Signed-off-by: Stephen Warren 
---
 arch/arm/mach-tegra/powergate.c   | 2 +-
 arch/arm/mach-tegra/tegra114/cpu.c| 2 +-
 .../asm/arch-tegra30 => mach-tegra/tegra114/include/soc}/flow.h   | 8 
 arch/arm/mach-tegra/tegra124/cpu.c| 2 +-
 .../asm/arch-tegra124 => mach-tegra/tegra124/include/soc}/flow.h  | 6 +++---
 arch/arm/mach-tegra/tegra124/psci.c   | 2 +-
 .../asm/arch-tegra20 => mach-tegra/tegra20/include/soc}/flow.h| 4 ++--
 arch/arm/mach-tegra/tegra20/warmboot_avp.c| 2 +-
 .../asm/arch-tegra210 => mach-tegra/tegra210/include/soc}/flow.h  | 6 +++---
 arch/arm/mach-tegra/tegra30/cpu.c | 2 +-
 .../asm/arch-tegra114 => mach-tegra/tegra30/include/soc}/flow.h   | 8 
 11 files changed, 22 insertions(+), 22 deletions(-)
 rename arch/arm/{include/asm/arch-tegra30 => 
mach-tegra/tegra114/include/soc}/flow.h (67%)
 rename arch/arm/{include/asm/arch-tegra124 => 
mach-tegra/tegra124/include/soc}/flow.h (93%)
 rename arch/arm/{include/asm/arch-tegra20 => 
mach-tegra/tegra20/include/soc}/flow.h (85%)
 rename arch/arm/{include/asm/arch-tegra210 => 
mach-tegra/tegra210/include/soc}/flow.h (90%)
 rename arch/arm/{include/asm/arch-tegra114 => 
mach-tegra/tegra30/include/soc}/flow.h (67%)

diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index 49723e88cc56..04205bb10cbb 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -9,9 +9,9 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
+#include 
 
 #define PWRGATE_TOGGLE 0x30
 #define  PWRGATE_TOGGLE_START (1 << 8)
diff --git a/arch/arm/mach-tegra/tegra114/cpu.c 
b/arch/arm/mach-tegra/tegra114/cpu.c
index 41e337fcfb57..c06e632bb36a 100644
--- a/arch/arm/mach-tegra/tegra114/cpu.c
+++ b/arch/arm/mach-tegra/tegra114/cpu.c
@@ -8,10 +8,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
+#include 
 #include "../cpu.h"
 #include "../pmc.h"
 
diff --git a/arch/arm/include/asm/arch-tegra30/flow.h 
b/arch/arm/mach-tegra/tegra114/include/soc/flow.h
similarity index 67%
rename from arch/arm/include/asm/arch-tegra30/flow.h
rename to arch/arm/mach-tegra/tegra114/include/soc/flow.h
index 73cb0eecdcdc..781ac57516ff 100644
--- a/arch/arm/include/asm/arch-tegra30/flow.h
+++ b/arch/arm/mach-tegra/tegra114/include/soc/flow.h
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2010-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * SPDX-License-Identifier:GPL-2.0
  */
 
-#ifndef _TEGRA30_FLOW_H_
-#define _TEGRA30_FLOW_H_
+#ifndef _TEGRA114_FLOW_H
+#define _TEGRA114_FLOW_H
 
 struct flow_ctlr {
u32 halt_cpu_events;
@@ -22,4 +22,4 @@ struct flow_ctlr {
u32 cluster_control;
 };
 
-#endif /* _TEGRA30_FLOW_H_ */
+#endif
diff --git a/arch/arm/mach-tegra/tegra124/cpu.c 
b/arch/arm/mach-tegra/tegra124/cpu.c
index e8c8c507c404..527c4a186e68 100644
--- a/arch/arm/mach-tegra/tegra124/cpu.c
+++ b/arch/arm/mach-tegra/tegra124/cpu.c
@@ -8,10 +8,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
+#include 
 #include "../cpu.h"
 #include "../pmc.h"
 
diff --git a/arch/arm/include/asm/arch-tegra124/flow.h 
b/arch/arm/mach-tegra/tegra124/include/soc/flow.h
similarity index 93%
rename from arch/arm/include/asm/arch-tegra124/flow.h
rename to arch/arm/mach-tegra/tegra124/include/soc/flow.h
index 3f70fb190527..a96eeb9217aa 100644
--- a/arch/arm/include/asm/arch-tegra124/flow.h
+++ b/arch/arm/mach-tegra/tegra124/include/soc/flow.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: GPL-2.0+
  */
 
-#ifndef _TEGRA124_FLOW_H_
-#define _TEGRA124_FLOW_H_
+#ifndef _TEGRA124_FLOW_H
+#define _TEGRA124_FLOW_H
 
 struct flow_ctlr {
u32 halt_cpu_events;/* offset 0x00 */
@@ -49,4 +49,4 @@ enum {
RAM_REPAIR_STS = 0x1 << 1,
 };
 
-#endif /*  _TEGRA124_FLOW_H_ */
+#endif
diff --git a/arch/arm/mach-tegra/tegra124/psci.c 
b/arch/arm/mach-tegra/tegra124/psci.c
index b6d99c7740c7..27f9e60e1372 100644
--- a/arch/arm/mach-tegra/tegra124/psci.c
+++ b/arch/arm/mach-tegra/tegra124/psci.c
@@ -9,8 +9,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
 #include "../cpu.h"
 #include "../pmc.h"
 
diff --git a/arch/arm/include/asm/arch-tegra20/flow.h 
b/arch/arm/mach-tegra/tegra20/include/soc/flow.h
similarity index 85%
rename from arch/arm/include/asm/arch-tegra20/flow.h
rename to