Skip to contentSkip to conversation

ARM: tegra: various misc cleanups

PATCH New Stephen Warren 1 participant 9 messages Sep 13, 2013 – Sep 17, 2013

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

cover ARM: tegra: various misc cleanups

From: Stephen Warren <[email protected]>

A bunch of cleanups for arch/arm/mach-tegra, mostly just deleting stale code.

Stephen Warren (7):
ARM: tegra: remove common.c
ARM: tegra: delete stale header content
ARM: tegra: delete gpio-names.h
ARM: tegra: move resume vector define to irammap.h
ARM: tegra: remove much of iomap.h
ARM: tegra: remove tegra_chip_uid()
ARM: tegra: make tegra_init_fuse() __init

 arch/arm/mach-tegra/Makefile        |   1 -
 arch/arm/mach-tegra/board-paz00.c   |   5 +-
 arch/arm/mach-tegra/board-paz00.h   |  25 ----
 arch/arm/mach-tegra/board.h         |  12 --
 arch/arm/mach-tegra/common.c        | 113 -----------------
 arch/arm/mach-tegra/fuse.c          |  12 +-
 arch/arm/mach-tegra/gpio-names.h    | 247 ------------------------------------
 arch/arm/mach-tegra/iomap.h         | 152 ----------------------
 arch/arm/mach-tegra/irammap.h       |   6 +
 arch/arm/mach-tegra/pm.c            |   8 +-
 arch/arm/mach-tegra/pm.h            |   3 -
 arch/arm/mach-tegra/pmc.c           |   9 ++
 arch/arm/mach-tegra/pmc.h           |   4 +
 arch/arm/mach-tegra/reset.c         |   2 +-
 arch/arm/mach-tegra/sleep-tegra20.S |   5 +-
 arch/arm/mach-tegra/sleep-tegra30.S |   5 +-
 arch/arm/mach-tegra/tegra.c         |  67 +++++++++-
 17 files changed, 98 insertions(+), 578 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/board-paz00.h
 delete mode 100644 arch/arm/mach-tegra/common.c
 delete mode 100644 arch/arm/mach-tegra/gpio-names.h
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/7 ARM: tegra: remove common.c

From: Stephen Warren <[email protected]>

common.c was create to contain code shared across the various Tegra board files. There is now only one board file, tegra.c. So, move the code there. One exception is the PMC reboot routine, which moves to pmc.c, and now takes advantage of the 'standard' tegra_pmc_readl/writel functions.

---
 arch/arm/mach-tegra/Makefile |   1 -
 arch/arm/mach-tegra/board.h  |   6 ---
 arch/arm/mach-tegra/common.c | 113 -------------------------------------------
 arch/arm/mach-tegra/pmc.c    |   9 ++++
 arch/arm/mach-tegra/pmc.h    |   4 ++
 arch/arm/mach-tegra/tegra.c  |  67 ++++++++++++++++++++++++-
 6 files changed, 78 insertions(+), 122 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/Makefile +0 -1
index e7e5f45..97eb48e 100644
@@ -1,6 +1,5 @@
 asflags-y				+= -march=armv7-a
 
-obj-y                                   += common.o
 obj-y                                   += io.o
 obj-y                                   += irq.o
 obj-y					+= fuse.o
arch/arm/mach-tegra/board.h +0 -6
index db6810d..7b9a5bd 100644
@@ -25,14 +25,8 @@
 #include <linux/types.h>
 #include <linux/reboot.h>
 
-void tegra_assert_system_reset(enum reboot_mode mode, const char *cmd);
-
-void __init tegra_init_early(void);
 void __init tegra_map_common_io(void);
 void __init tegra_init_irq(void);
-void __init tegra_dt_init_irq(void);
-
-void tegra_init_late(void);
 
 #ifdef CONFIG_DEBUG_FS
 int tegra_clk_debugfs_init(void);
arch/arm/mach-tegra/common.c deleted +0 -113

113 lines not on this page · raw message

arch/arm/mach-tegra/pmc.c +9 -0
index 7916ff9..93a4dbc 100644
@@ -166,6 +166,15 @@ int tegra_pmc_cpu_remove_clamping(int cpuid)
 	return tegra_pmc_powergate_remove_clamping(id);
 }
 
+void tegra_pmc_restart(enum reboot_mode mode, const char *cmd)
+{
+	u32 val;
+
+	val = tegra_pmc_readl(0);
+	val |= 0x10;
+	tegra_pmc_writel(val, 0);
+}
+
 #ifdef CONFIG_PM_SLEEP
 static void set_power_timers(u32 us_on, u32 us_off, unsigned long rate)
 {
arch/arm/mach-tegra/pmc.h +4 -0
index 4d5f8f3..59e19c34 100644
@@ -18,6 +18,8 @@
 #ifndef __MACH_TEGRA_PMC_H
 #define __MACH_TEGRA_PMC_H
 
+#include <linux/reboot.h>
+
 enum tegra_suspend_mode {
 	TEGRA_SUSPEND_NONE = 0,
 	TEGRA_SUSPEND_LP2,	/* CPU voltage off */
@@ -39,6 +41,8 @@ bool tegra_pmc_cpu_is_powered(int cpuid);
 int tegra_pmc_cpu_power_on(int cpuid);
 int tegra_pmc_cpu_remove_clamping(int cpuid);
 
+void tegra_pmc_restart(enum reboot_mode mode, const char *cmd);
+
 void tegra_pmc_init_irq(void);
 void tegra_pmc_init(void);
 
arch/arm/mach-tegra/tegra.c +65 -2

95 lines not on this page · raw message

Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 2/7 ARM: tegra: delete stale header content

In reply to Stephen Warren

From: Stephen Warren <[email protected]>

A few function prototypes were left in header files during code re- organization. Delete them.

---
 arch/arm/mach-tegra/board.h | 6 ------
 arch/arm/mach-tegra/pm.h    | 3 ---
 2 files changed, 9 deletions(-)
arch/arm/mach-tegra/board.h +0 -6
index 7b9a5bd..bcf5dbf 100644
@@ -28,12 +28,6 @@
 void __init tegra_map_common_io(void);
 void __init tegra_init_irq(void);
 
-#ifdef CONFIG_DEBUG_FS
-int tegra_clk_debugfs_init(void);
-#else
-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);
arch/arm/mach-tegra/pm.h +0 -3
index fe204e5..6e92a7c 100644
@@ -37,9 +37,6 @@ void tegra30_sleep_core_init(void);
 
 extern unsigned long l2x0_saved_regs_addr;
 
-void save_cpu_arch_register(void);
-void restore_cpu_arch_register(void);
-
 void tegra_clear_cpu_in_lp2(void);
 bool tegra_set_cpu_in_lp2(void);
 
Signature · 1 line
1.8.1.5
#3 lore raw

PATCH 3/7 ARM: tegra: delete gpio-names.h

In reply to Stephen Warren

From: Stephen Warren <[email protected]>

gpio-names.h defines IDs for GPIOs. This information now comes from device tree, so delete this stale header. The one remaining use-case is board-paz00.c's wifi_rfkill device. Isolate the knowledge of those GPIO IDs into that file. Let's hope the values stay valid:-)

---
 arch/arm/mach-tegra/board-paz00.c |   5 +-
 arch/arm/mach-tegra/board-paz00.h |  25 ----
 arch/arm/mach-tegra/gpio-names.h  | 247 --------------------------------------
 3 files changed, 2 insertions(+), 275 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/board-paz00.h
 delete mode 100644 arch/arm/mach-tegra/gpio-names.h
arch/arm/mach-tegra/board-paz00.c +2 -3
index 740e16f..06f0240 100644
@@ -20,12 +20,11 @@
 #include <linux/platform_device.h>
 #include <linux/rfkill-gpio.h>
 #include "board.h"
-#include "board-paz00.h"
 
 static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
 	.name		= "wifi_rfkill",
-	.reset_gpio	= TEGRA_WIFI_RST,
-	.shutdown_gpio	= TEGRA_WIFI_PWRN,
+	.reset_gpio	= 25, /* PD1 */
+	.shutdown_gpio	= 85, /* PK5 */
 	.type	= RFKILL_TYPE_WLAN,
 };
 
arch/arm/mach-tegra/board-paz00.h deleted +0 -25
deleted file mode 100644
index 25c08ec..0000000
@@ -1,25 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-paz00.h
- *
- * Copyright (C) 2010 Marc Dietrich <[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_BOARD_PAZ00_H
-#define _MACH_TEGRA_BOARD_PAZ00_H
-
-#include "gpio-names.h"
-
-#define TEGRA_WIFI_PWRN			TEGRA_GPIO_PK5
-#define TEGRA_WIFI_RST			TEGRA_GPIO_PD1
-
-#endif
arch/arm/mach-tegra/gpio-names.h deleted +0 -247

247 lines not on this page · raw message

Signature · 1 line
1.8.1.5
#4 lore raw

PATCH 4/7 ARM: tegra: move resume vector define to irammap.h

In reply to Stephen Warren

From: Stephen Warren <[email protected]>

irammap.h's purpose is to define the layout/usage of IRAM. As such, TEGRA_IRAM_CODE_AREA should have been added there rather than iomap.h. Move the define, and rename it something more descriptive.

---
 arch/arm/mach-tegra/iomap.h         | 2 --
 arch/arm/mach-tegra/irammap.h       | 6 ++++++
 arch/arm/mach-tegra/pm.c            | 8 ++++----
 arch/arm/mach-tegra/reset.c         | 2 +-
 arch/arm/mach-tegra/sleep-tegra20.S | 5 +++--
 arch/arm/mach-tegra/sleep-tegra30.S | 5 +++--
 6 files changed, 17 insertions(+), 11 deletions(-)
arch/arm/mach-tegra/iomap.h +0 -2
index 3f5fa07..7e0c180 100644
@@ -24,8 +24,6 @@
 #define TEGRA_IRAM_BASE			0x40000000
 #define TEGRA_IRAM_SIZE			SZ_256K
 
-#define TEGRA_IRAM_CODE_AREA		(TEGRA_IRAM_BASE + SZ_4K)
-
 #define TEGRA_HOST1X_BASE		0x50000000
 #define TEGRA_HOST1X_SIZE		0x24000
 
arch/arm/mach-tegra/irammap.h +6 -0
index 501952a..e32e174 100644
@@ -23,4 +23,10 @@
 #define TEGRA_IRAM_RESET_HANDLER_OFFSET	0
 #define TEGRA_IRAM_RESET_HANDLER_SIZE	SZ_1K
 
+/*
+ * This area is used for LPx resume vector, only while LPx power state is
+ * active. At other times, the AVP may use this area for arbitrary purposes
+ */
+#define TEGRA_IRAM_LPx_RESUME_AREA	(TEGRA_IRAM_BASE + SZ_4K)
+
 #endif
arch/arm/mach-tegra/pm.c +4 -4
index ed294a0..36ed88a 100644
@@ -263,10 +263,10 @@ static void tegra_suspend_enter_lp1(void)
 	tegra_pmc_suspend();
 
 	/* copy the reset vector & SDRAM shutdown code into IRAM */
-	memcpy(iram_save_addr, IO_ADDRESS(TEGRA_IRAM_CODE_AREA),
-		iram_save_size);
-	memcpy(IO_ADDRESS(TEGRA_IRAM_CODE_AREA), tegra_lp1_iram.start_addr,
+	memcpy(iram_save_addr, IO_ADDRESS(TEGRA_IRAM_LPx_RESUME_AREA),
 		iram_save_size);
+	memcpy(IO_ADDRESS(TEGRA_IRAM_LPx_RESUME_AREA),
+		tegra_lp1_iram.start_addr, iram_save_size);
 
 	*((u32 *)tegra_cpu_lp1_mask) = 1;
 }
@@ -276,7 +276,7 @@ static void tegra_suspend_exit_lp1(void)
 	tegra_pmc_resume();
 
 	/* restore IRAM */
-	memcpy(IO_ADDRESS(TEGRA_IRAM_CODE_AREA), iram_save_addr,
+	memcpy(IO_ADDRESS(TEGRA_IRAM_LPx_RESUME_AREA), iram_save_addr,
 		iram_save_size);
 
 	*(u32 *)tegra_cpu_lp1_mask = 0;
arch/arm/mach-tegra/reset.c +1 -1
index fd0bbf8..568f5bb 100644
@@ -82,7 +82,7 @@ void __init tegra_cpu_reset_handler_init(void)
 
 #ifdef CONFIG_PM_SLEEP
 	__tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_LP1] =
-		TEGRA_IRAM_CODE_AREA;
+		TEGRA_IRAM_LPx_RESUME_AREA;
 	__tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_LP2] =
 		virt_to_phys((void *)tegra_resume);
 #endif
arch/arm/mach-tegra/sleep-tegra20.S +3 -2
index 5c3bd11..aaaf3ab 100644
@@ -25,6 +25,7 @@
 #include <asm/cp15.h>
 #include <asm/cache.h>
 
+#include "irammap.h"
 #include "sleep.h"
 #include "flowctrl.h"
 
@@ -235,7 +236,7 @@ ENTRY(tegra20_sleep_core_finish)
 	mov32	r0, tegra20_tear_down_core
 	mov32	r1, tegra20_iram_start
 	sub	r0, r0, r1
-	mov32	r1, TEGRA_IRAM_CODE_AREA
+	mov32	r1, TEGRA_IRAM_LPx_RESUME_AREA
 	add	r0, r0, r1
 
 	mov	pc, r3
@@ -328,7 +329,7 @@ tegra20_iram_start:
  * The physical address of tegra_resume expected to be stored in
  * PMC_SCRATCH41.
  *
- * NOTE: THIS *MUST* BE RELOCATED TO TEGRA_IRAM_CODE_AREA.
+ * NOTE: THIS *MUST* BE RELOCATED TO TEGRA_IRAM_LPx_RESUME_AREA.
  */
 ENTRY(tegra20_lp1_reset)
 	/*
arch/arm/mach-tegra/sleep-tegra30.S +3 -2
index 63fa91b..c6fc15c 100644
@@ -20,6 +20,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/cache.h>
 
+#include "irammap.h"
 #include "fuse.h"
 #include "sleep.h"
 #include "flowctrl.h"
@@ -262,7 +263,7 @@ ENTRY(tegra30_sleep_core_finish)
 	mov32	r0, tegra30_tear_down_core
 	mov32	r1, tegra30_iram_start
 	sub	r0, r0, r1
-	mov32	r1, TEGRA_IRAM_CODE_AREA
+	mov32	r1, TEGRA_IRAM_LPx_RESUME_AREA
 	add	r0, r0, r1
 
 	mov	pc, r3
@@ -314,7 +315,7 @@ tegra30_iram_start:
  * The physical address of tegra_resume expected to be stored in
  * PMC_SCRATCH41.
  *
- * NOTE: THIS *MUST* BE RELOCATED TO TEGRA_IRAM_CODE_AREA.
+ * NOTE: THIS *MUST* BE RELOCATED TO TEGRA_IRAM_LPx_RESUME_AREA.
  */
 ENTRY(tegra30_lp1_reset)
 	/*
Signature · 1 line
1.8.1.5
#5 lore raw

PATCH 5/7 ARM: tegra: remove much of iomap.h

In reply to Stephen Warren

From: Stephen Warren <[email protected]>

iomap.h defines the base address of Tegra peripherals. Most of this information comes from device tree now, and hence can be deleted. Entries are kept for various system peripherals that low-level code (such as initial boot, system suspend/resume, debug) still requires.

Removing the values removes the temptation for someone to use them.

---
 arch/arm/mach-tegra/iomap.h | 150 --------------------------------------------
 1 file changed, 150 deletions(-)
arch/arm/mach-tegra/iomap.h +0 -150
index 7e0c180..cbee57f 100644
@@ -24,42 +24,12 @@
 #define TEGRA_IRAM_BASE			0x40000000
 #define TEGRA_IRAM_SIZE			SZ_256K
 
-#define TEGRA_HOST1X_BASE		0x50000000
-#define TEGRA_HOST1X_SIZE		0x24000
-
 #define TEGRA_ARM_PERIF_BASE		0x50040000
 #define TEGRA_ARM_PERIF_SIZE		SZ_8K
 
-#define TEGRA_ARM_PL310_BASE		0x50043000
-#define TEGRA_ARM_PL310_SIZE		SZ_4K
-
 #define TEGRA_ARM_INT_DIST_BASE		0x50041000
 #define TEGRA_ARM_INT_DIST_SIZE		SZ_4K
 
-#define TEGRA_MPE_BASE			0x54040000
-#define TEGRA_MPE_SIZE			SZ_256K
-
-#define TEGRA_VI_BASE			0x54080000
-#define TEGRA_VI_SIZE			SZ_256K
-
-#define TEGRA_ISP_BASE			0x54100000
-#define TEGRA_ISP_SIZE			SZ_256K
-
-#define TEGRA_DISPLAY_BASE		0x54200000
-#define TEGRA_DISPLAY_SIZE		SZ_256K
-
-#define TEGRA_DISPLAY2_BASE		0x54240000
-#define TEGRA_DISPLAY2_SIZE		SZ_256K
-
-#define TEGRA_HDMI_BASE			0x54280000
-#define TEGRA_HDMI_SIZE			SZ_256K
-
-#define TEGRA_GART_BASE			0x58000000
-#define TEGRA_GART_SIZE			SZ_32M
-
-#define TEGRA_RES_SEMA_BASE		0x60001000
-#define TEGRA_RES_SEMA_SIZE		SZ_4K
-
 #define TEGRA_PRIMARY_ICTLR_BASE	0x60004000
 #define TEGRA_PRIMARY_ICTLR_SIZE	SZ_64
 
@@ -96,51 +66,15 @@
 #define TEGRA_FLOW_CTRL_BASE		0x60007000
 #define TEGRA_FLOW_CTRL_SIZE		20
 
-#define TEGRA_AHB_DMA_BASE		0x60008000
-#define TEGRA_AHB_DMA_SIZE		SZ_4K
-
-#define TEGRA_AHB_DMA_CH0_BASE		0x60009000
-#define TEGRA_AHB_DMA_CH0_SIZE		32
-
-#define TEGRA_APB_DMA_BASE		0x6000A000
-#define TEGRA_APB_DMA_SIZE		SZ_4K
-
-#define TEGRA_APB_DMA_CH0_BASE		0x6000B000
-#define TEGRA_APB_DMA_CH0_SIZE		32
-
-#define TEGRA_AHB_GIZMO_BASE		0x6000C004
-#define TEGRA_AHB_GIZMO_SIZE		0x10C
-
 #define TEGRA_SB_BASE			0x6000C200
 #define TEGRA_SB_SIZE			256
 
-#define TEGRA_STATMON_BASE		0x6000C400
-#define TEGRA_STATMON_SIZE		SZ_1K
-
-#define TEGRA_GPIO_BASE			0x6000D000
-#define TEGRA_GPIO_SIZE			SZ_4K
-
 #define TEGRA_EXCEPTION_VECTORS_BASE    0x6000F000
 #define TEGRA_EXCEPTION_VECTORS_SIZE    SZ_4K
 
 #define TEGRA_APB_MISC_BASE		0x70000000
 #define TEGRA_APB_MISC_SIZE		SZ_4K
 
-#define TEGRA_APB_MISC_DAS_BASE		0x70000c00
-#define TEGRA_APB_MISC_DAS_SIZE		SZ_128
-
-#define TEGRA_AC97_BASE			0x70002000
-#define TEGRA_AC97_SIZE			SZ_512
-
-#define TEGRA_SPDIF_BASE		0x70002400
-#define TEGRA_SPDIF_SIZE		SZ_512
-
-#define TEGRA_I2S1_BASE			0x70002800
-#define TEGRA_I2S1_SIZE			SZ_256
-
-#define TEGRA_I2S2_BASE			0x70002A00
-#define TEGRA_I2S2_SIZE			SZ_256
-
 #define TEGRA_UARTA_BASE		0x70006000
 #define TEGRA_UARTA_SIZE		SZ_64
 
@@ -156,87 +90,15 @@
 #define TEGRA_UARTE_BASE		0x70006400
 #define TEGRA_UARTE_SIZE		SZ_256
 
-#define TEGRA_NAND_BASE			0x70008000
-#define TEGRA_NAND_SIZE			SZ_256
-
-#define TEGRA_HSMMC_BASE		0x70008500
-#define TEGRA_HSMMC_SIZE		SZ_256
-
-#define TEGRA_SNOR_BASE			0x70009000
-#define TEGRA_SNOR_SIZE			SZ_4K
-
-#define TEGRA_PWFM_BASE			0x7000A000
-#define TEGRA_PWFM_SIZE			SZ_256
-
-#define TEGRA_PWFM0_BASE		0x7000A000
-#define TEGRA_PWFM0_SIZE		4
-
-#define TEGRA_PWFM1_BASE		0x7000A010
-#define TEGRA_PWFM1_SIZE		4
-
-#define TEGRA_PWFM2_BASE		0x7000A020
-#define TEGRA_PWFM2_SIZE		4
-
-#define TEGRA_PWFM3_BASE		0x7000A030
-#define TEGRA_PWFM3_SIZE		4
-
-#define TEGRA_MIPI_BASE			0x7000B000
-#define TEGRA_MIPI_SIZE			SZ_256
-
-#define TEGRA_I2C_BASE			0x7000C000
-#define TEGRA_I2C_SIZE			SZ_256
-
-#define TEGRA_TWC_BASE			0x7000C100
-#define TEGRA_TWC_SIZE			SZ_256
-
-#define TEGRA_SPI_BASE			0x7000C380
-#define TEGRA_SPI_SIZE			48
-
-#define TEGRA_I2C2_BASE			0x7000C400
-#define TEGRA_I2C2_SIZE			SZ_256
-
-#define TEGRA_I2C3_BASE			0x7000C500
-#define TEGRA_I2C3_SIZE			SZ_256
-
-#define TEGRA_OWR_BASE			0x7000C600
-#define TEGRA_OWR_SIZE			80
-
-#define TEGRA_DVC_BASE			0x7000D000
-#define TEGRA_DVC_SIZE			SZ_512
-
-#define TEGRA_SPI1_BASE			0x7000D400
-#define TEGRA_SPI1_SIZE			SZ_512
-
-#define TEGRA_SPI2_BASE			0x7000D600
-#define TEGRA_SPI2_SIZE			SZ_512
-
-#define TEGRA_SPI3_BASE			0x7000D800
-#define TEGRA_SPI3_SIZE			SZ_512
-
-#define TEGRA_SPI4_BASE			0x7000DA00
-#define TEGRA_SPI4_SIZE			SZ_512
-
-#define TEGRA_RTC_BASE			0x7000E000
-#define TEGRA_RTC_SIZE			SZ_256
-
-#define TEGRA_KBC_BASE			0x7000E200
-#define TEGRA_KBC_SIZE			SZ_256
-
 #define TEGRA_PMC_BASE			0x7000E400
 #define TEGRA_PMC_SIZE			SZ_256
 
-#define TEGRA_MC_BASE			0x7000F000
-#define TEGRA_MC_SIZE			SZ_1K
-
 #define TEGRA_EMC_BASE			0x7000F400
 #define TEGRA_EMC_SIZE			SZ_1K
 
 #define TEGRA_FUSE_BASE			0x7000F800
 #define TEGRA_FUSE_SIZE			SZ_1K
 
-#define TEGRA_KFUSE_BASE		0x7000FC00
-#define TEGRA_KFUSE_SIZE		SZ_1K
-
 #define TEGRA_EMC0_BASE			0x7001A000
 #define TEGRA_EMC0_SIZE			SZ_2K
 
@@ -246,18 +108,6 @@
 #define TEGRA_CSITE_BASE		0x70040000
 #define TEGRA_CSITE_SIZE		SZ_256K
 
-#define TEGRA_SDMMC1_BASE		0xC8000000
-#define TEGRA_SDMMC1_SIZE		SZ_512
-
-#define TEGRA_SDMMC2_BASE		0xC8000200
-#define TEGRA_SDMMC2_SIZE		SZ_512
-
-#define TEGRA_SDMMC3_BASE		0xC8000400
-#define TEGRA_SDMMC3_SIZE		SZ_512
-
-#define TEGRA_SDMMC4_BASE		0xC8000600
-#define TEGRA_SDMMC4_SIZE		SZ_512
-
 /* On TEGRA, many peripherals are very closely packed in
  * two 256MB io windows (that actually only use about 64KB
  * at the start of each).
Signature · 1 line
1.8.1.5
#6 lore raw

PATCH 6/7 ARM: tegra: remove tegra_chip_uid()

In reply to Stephen Warren

From: Stephen Warren <[email protected]>

This function is no longer used. It's also only accurate for Tegra20.

---
NOTE: Depends on "crypto: tegra: use kernel entropy instead of ad-hoc", which is in the crypto tree; not sure for which release...

---
 arch/arm/mach-tegra/fuse.c | 10 ----------
 1 file changed, 10 deletions(-)
arch/arm/mach-tegra/fuse.c +0 -10
index e035cd2..64652b3 100644
@@ -155,13 +155,3 @@ void tegra_init_fuse(void)
 		tegra_sku_id, tegra_cpu_process_id,
 		tegra_core_process_id);
 }
-
-unsigned long long tegra_chip_uid(void)
-{
-	unsigned long long lo, hi;
-
-	lo = tegra_fuse_readl(FUSE_UID_LOW);
-	hi = tegra_fuse_readl(FUSE_UID_HIGH);
-	return (hi << 32ull) | lo;
-}
-EXPORT_SYMBOL(tegra_chip_uid);
Signature · 1 line
1.8.1.5
#7 lore raw

PATCH 7/7 ARM: tegra: make tegra_init_fuse() __init

In reply to Stephen Warren

From: Stephen Warren <[email protected]>

It's a one-time initialization function, called early during boot.

---
 arch/arm/mach-tegra/fuse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-tegra/fuse.c +1 -1
index 64652b3..fef1dc8 100644
@@ -112,7 +112,7 @@ u32 tegra_read_chipid(void)
 	return readl_relaxed(IO_ADDRESS(TEGRA_APB_MISC_BASE) + 0x804);
 }
 
-void tegra_init_fuse(void)
+void __init tegra_init_fuse(void)
 {
 	u32 id;
 
Signature · 1 line
1.8.1.5
#8 lore raw

cover ARM: tegra: various misc cleanups

In reply to Stephen Warren
Quoted 5 lines · Stephen Warren

From: Stephen Warren <[email protected]>

A bunch of cleanups for arch/arm/mach-tegra, mostly just deleting stale code.

Quoted 8 lines

Stephen Warren (7):
ARM: tegra: remove common.c
ARM: tegra: delete stale header content
ARM: tegra: delete gpio-names.h
ARM: tegra: move resume vector define to irammap.h
ARM: tegra: remove much of iomap.h
ARM: tegra: remove tegra_chip_uid()
ARM: tegra: make tegra_init_fuse() __init

I've applied this series, excluding patch 6 which I expect to go through the crypto tree along with the patch it depends on, to Tegra's for-3.13/cleanup branch.