Skip to contentSkip to conversation

ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>

PATCH New Stephen Warren 2 participants 7 messages Mar 30, 2013 – Apr 2, 2013

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>

From: Stephen Warren <[email protected]>

This is required so that code such as Tegra's PCIe and clock drivers can still access this header file once Tegra is converted to multiplatform, and <mach/> no longer exists.

---
 arch/arm/mach-tegra/board.h                                       |    1 +
 arch/arm/mach-tegra/common.c                                      |    2 --
 arch/arm/mach-tegra/pcie.c                                        |    3 +--
 arch/arm/mach-tegra/powergate.c                                   |    3 +--
 drivers/clk/tegra/clk-tegra30.c                                   |    3 +--
 .../include/mach/powergate.h => include/linux/tegra-powergate.h   |    5 -----
 6 files changed, 4 insertions(+), 13 deletions(-)
 rename arch/arm/mach-tegra/include/mach/powergate.h => include/linux/tegra-powergate.h (92%)
arch/arm/mach-tegra/board.h +1 -0
index 60431de..1787327 100644
@@ -40,6 +40,7 @@ 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
arch/arm/mach-tegra/common.c +0 -2
index f0315c9..7cc75636 100644
@@ -27,8 +27,6 @@
 
 #include <asm/hardware/cache-l2x0.h>
 
-#include <mach/powergate.h>
-
 #include "board.h"
 #include "common.h"
 #include "fuse.h"
arch/arm/mach-tegra/pcie.c +1 -2
index b60165f..46144a1 100644
@@ -34,12 +34,11 @@
 #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"
 
arch/arm/mach-tegra/powergate.c +1 -2
index c6bc8f8..585d297 100644
@@ -27,8 +27,7 @@
 #include <linux/seq_file.h>
 #include <linux/spinlock.h>
 #include <linux/clk/tegra.h>
-
-#include <mach/powergate.h>
+#include <linux/tegra-powergate.h>
 
 #include "fuse.h"
 #include "iomap.h"
drivers/clk/tegra/clk-tegra30.c +1 -2
index 32c61cb..84584e5 100644
@@ -22,8 +22,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/clk/tegra.h>
-
-#include <mach/powergate.h>
+#include <linux/tegra-powergate.h>
 
 #include "clk.h"
 
include/linux/tegra-powergate.h renamed from arch/arm/mach-tegra/include/mach/powergate.h +0 -5
similarity index 92%
rename from arch/arm/mach-tegra/include/mach/powergate.h
rename to include/linux/tegra-powergate.h
index 06763fe..55c29a8 100644
@@ -1,6 +1,4 @@
 /*
- * drivers/regulator/tegra-regulator.c
- *
  * Copyright (c) 2010 Google, Inc
  *
  * Author:
@@ -40,9 +38,6 @@ 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);
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/2 ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>

Quoted 5 lines · Stephen Warren

From: Stephen Warren <[email protected]>

This is required so that code such as Tegra's PCIe and clock drivers can still access this header file once Tegra is converted to multiplatform, and <mach/> no longer exists.

The series applied to Tegra's for-3.10/multiplatform branch.

#2 lore raw

PATCH 1/2 ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>

In reply to Stephen Warren
Quoted 7 lines · Stephen Warren

From: Stephen Warren <[email protected]>

This is required so that code such as Tegra's PCIe and clock drivers can still access this header file once Tegra is converted to multiplatform, and <mach/> no longer exists.

It sounds like this should be integrated in the reset controller API that Philipp Zabel just posted. I'm not blaming you for now knowing about it, since I only saw it myself a few days ago, and my interpretation could be wrong. Are you able to move to that API before 3.10?

If not, we can probably take your patch for now, if you remove it again for 3.11.

Arnd

#3 lore raw

PATCH 1/2 ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>

Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · Stephen Warren

From: Stephen Warren <[email protected]>

This is required so that code such as Tegra's PCIe and clock drivers can still access this header file once Tegra is converted to multiplatform, and <mach/> no longer exists.

Quoted 6 lines
Quoted 1 line

It sounds like this should be integrated in the reset controller API that Philipp Zabel just posted. I'm not blaming you for now knowing about it, since I only saw it myself a few days ago, and my interpretation could be wrong. Are you able to move to that API before 3.10?

Well, I wrote the binding for it:-)

Quoted 2 lines

If not, we can probably take your patch for now, if you remove it again for 3.11.

There are at least a couple of different things in this file:

a) The reset API, which definitely should be converted to the new reset API. I can't make any promises about which kernel release that will happen in, but it's definitely something we know we have to do.

b) Power-gating. This should probably be converted to use the powerdomains code. I believe Joseph Lo is aware of this, but again I can't promise any specific time-scale at this time.

So is this still OK, without any promises of timescale?

#4 lore raw

PATCH 1/2 ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>

Quoted 12 lines · Stephen Warren
Quoted 4 lines · Arnd Bergmann

On Saturday 30 March 2013, Stephen Warren wrote:

If not, we can probably take your patch for now, if you remove it again for 3.11.

There are at least a couple of different things in this file:

a) The reset API, which definitely should be converted to the new reset API. I can't make any promises about which kernel release that will happen in, but it's definitely something we know we have to do.

Quoted 6 lines

b) Power-gating. This should probably be converted to use the powerdomains code. I believe Joseph Lo is aware of this, but again I can't promise any specific time-scale at this time.

So is this still OK, without any promises of timescale?

Yes, sounds good.

Arnd

#5 lore raw

PATCH 2/2 ARM: tegra: convert to multi-platform

In reply to Stephen Warren

From: Stephen Warren <[email protected]>

This allows Tegra be included in a kernel build that supports multiple SoCs at once, which is useful for distro kernels.

This change:
* Moves Tegra's Kconfig into its own directory, as seems typical for multi-platform conversions.
* Stops selecting some ARM errata that are incompatible with multi- platform. This requires that you use a bootloader that enables the workaround!
* Deletes some headers and Makefile.boot that aren't needed now that we support multi-platform.

---
 arch/arm/Kconfig                              |   19 ---
 arch/arm/mach-tegra/Kconfig                   |   27 +++-
 arch/arm/mach-tegra/Makefile.boot             |    3 -
 arch/arm/mach-tegra/include/mach/timex.h      |   26 ----
 arch/arm/mach-tegra/include/mach/uncompress.h |  175 -------------------------
 5 files changed, 20 insertions(+), 230 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/Makefile.boot
 delete mode 100644 arch/arm/mach-tegra/include/mach/timex.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/uncompress.h
arch/arm/Kconfig +0 -19
index 59b7be7..f6dfe23 100644
@@ -663,25 +663,6 @@ config ARCH_LPC32XX
 	help
 	  Support for the NXP LPC32XX family of processors
 
-config ARCH_TEGRA
-	bool "NVIDIA Tegra"
-	select ARCH_HAS_CPUFREQ
-	select ARCH_REQUIRE_GPIOLIB
-	select CLKDEV_LOOKUP
-	select CLKSRC_MMIO
-	select CLKSRC_OF
-	select COMMON_CLK
-	select GENERIC_CLOCKEVENTS
-	select HAVE_CLK
-	select HAVE_SMP
-	select MIGHT_HAVE_CACHE_L2X0
-	select SOC_BUS
-	select SPARSE_IRQ
-	select USE_OF
-	help
-	  This enables support for NVIDIA Tegra based systems (Tegra APX,
-	  Tegra 6xx and Tegra 2 series).
-
 config ARCH_PXA
 	bool "PXA2xx/PXA3xx-based"
 	depends on MMU
arch/arm/mach-tegra/Kconfig +20 -7
index d1c4893..df99ee9 100644
@@ -1,13 +1,28 @@
-if ARCH_TEGRA
+config ARCH_TEGRA
+	bool "NVIDIA Tegra" if ARCH_MULTI_V7
+	select ARCH_HAS_CPUFREQ
+	select ARCH_REQUIRE_GPIOLIB
+	select CLKDEV_LOOKUP
+	select CLKSRC_MMIO
+	select CLKSRC_OF
+	select COMMON_CLK
+	select GENERIC_CLOCKEVENTS
+	select HAVE_CLK
+	select HAVE_SMP
+	select MIGHT_HAVE_CACHE_L2X0
+	select SOC_BUS
+	select SPARSE_IRQ
+	select USE_OF
+	help
+	  This enables support for NVIDIA Tegra based systems.
 
-comment "NVIDIA Tegra options"
+menu "NVIDIA Tegra options"
+	depends on ARCH_TEGRA
 
 config ARCH_TEGRA_2x_SOC
 	bool "Enable support for Tegra20 family"
 	select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
 	select ARM_ERRATA_720789
-	select ARM_ERRATA_742230 if SMP
-	select ARM_ERRATA_751472
 	select ARM_ERRATA_754327 if SMP
 	select ARM_ERRATA_764369 if SMP
 	select ARM_GIC
@@ -26,8 +41,6 @@ config ARCH_TEGRA_2x_SOC
 
 config ARCH_TEGRA_3x_SOC
 	bool "Enable support for Tegra30 family"
-	select ARM_ERRATA_743622
-	select ARM_ERRATA_751472
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_764369 if SMP
 	select ARM_GIC
@@ -71,4 +84,4 @@ config TEGRA_AHB
 config TEGRA_EMC_SCALING_ENABLE
 	bool "Enable scaling the memory frequency"
 
-endif
+endmenu
arch/arm/mach-tegra/Makefile.boot deleted +0 -3
deleted file mode 100644
index 2943381..0000000
@@ -1,3 +0,0 @@
-zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC)	+= 0x00008000
-params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)	:= 0x00000100
-initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)	:= 0x00800000
arch/arm/mach-tegra/include/mach/timex.h deleted +0 -26
deleted file mode 100644
index a44ccbd..0000000
@@ -1,26 +0,0 @@
-/*
- * arch/arm/mach-tegra/include/mach/timex.h
- *
- * Copyright (C) 2010 Google, Inc.
- *
- * Author:
- *	Colin Cross <[email protected]>
- *	Erik Gilling <[email protected]>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef __MACH_TEGRA_TIMEX_H
-#define __MACH_TEGRA_TIMEX_H
-
-#define CLOCK_TICK_RATE		1000000
-
-#endif
arch/arm/mach-tegra/include/mach/uncompress.h deleted +0 -175

175 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#6 lore raw

PATCH 2/2 ARM: tegra: convert to multi-platform

Quoted 14 lines · Stephen Warren

From: Stephen Warren <[email protected]>

This allows Tegra be included in a kernel build that supports multiple SoCs at once, which is useful for distro kernels.

This change:
* Moves Tegra's Kconfig into its own directory, as seems typical for multi-platform conversions.
* Stops selecting some ARM errata that are incompatible with multi- platform. This requires that you use a bootloader that enables the workaround!
* Deletes some headers and Makefile.boot that aren't needed now that we support multi-platform.

Quoted 1 line

Ok, very nice.

I already commented on patch 1 of the series, which I hope we can replace with something better.

Another comment is that the EHCI driver is broken for Tegra if enabled in combination with one of a few other platforms. Manjunath has an experimental patch for this, but there are still problems with that patch. I'll forward a private copy of the last version we had, and you can try to get it working from there.

Arnd