diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 22:47:16 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 22:47:16 +0100 |
| commit | 96fd1112a91c82d88292249d9beb2a7ede44bb93 (patch) | |
| tree | 940cd35ebc0a7adaae7d8679e9196d39be19b8a0 | |
| parent | MAINTAINERS: ARM Versatile Express platform (diff) | |
| parent | ARM: tegra: Re-add removed SoC id macro to tegra_resume() (diff) | |
| download | linux-96fd1112a91c82d88292249d9beb2a7ede44bb93.tar.xz linux-96fd1112a91c82d88292249d9beb2a7ede44bb93.zip | |
Merge tag 'tegra-for-3.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/fixes-non-critical
Pull "ARM: tegra: Core code changes for v3.19" from Thierry Reding:
This contains a single fix for a bug that was introduced back in v3.13.
* tag 'tegra-for-3.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Re-add removed SoC id macro to tegra_resume()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-tegra/reset-handler.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S index 7b2baab0f0bd..71be4af5e975 100644 --- a/arch/arm/mach-tegra/reset-handler.S +++ b/arch/arm/mach-tegra/reset-handler.S @@ -51,6 +51,7 @@ ENTRY(tegra_resume) THUMB( it ne ) bne cpu_resume @ no + tegra_get_soc_id TEGRA_APB_MISC_BASE, r6 /* Are we on Tegra20? */ cmp r6, #TEGRA20 beq 1f @ Yes |