From: Kevin Hilman <khilman@linaro.org>
Date: Thu, 25 Jun 2015 04:32:13 +0000 (-0700)
Subject: Merge tag 'armsoc-soc' into test-merge
X-Git-Tag: v4.2-rc1~31^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=03fa626774a30145bdb97ce1bc909a0cfd419ce6;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'armsoc-soc' into test-merge

ARM: SoC: platform support for v4.2

Our SoC branch usually contains expanded support for new SoCs and
other core platform code. Some highlights from this round:

- sunxi: SMP support for A23 SoC
- socpga: big-endian support
- pxa: conversion to common clock framework
- bcm: SMP support for BCM63138
- imx: support new I.MX7D SoC
- zte: basic support for ZX296702 SoC

 Conflicts:
	arch/arm/mach-socfpga/core.h

Trivial remove/remove conflict with our cleanup branch.
Resolution: remove both sides

# gpg: Signature made Wed Jun 24 21:32:12 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
# gpg:                 aka "Kevin Hilman <khilman@kernel.org>"

# Conflicts:
#	arch/arm/mach-socfpga/core.h
---

03fa626774a30145bdb97ce1bc909a0cfd419ce6
diff --cc arch/arm/mach-socfpga/core.h
index 767c09e954a0f,2484179c2b479..7259c37327025
--- a/arch/arm/mach-socfpga/core.h
+++ b/arch/arm/mach-socfpga/core.h
@@@ -31,8 -33,8 +33,6 @@@
  
  #define RSTMGR_MPUMODRST_CPU1		0x2     /* CPU1 Reset */
  
- extern void __iomem *socfpga_scu_base_addr;
 -extern void socfpga_secondary_startup(void);
--
  extern void socfpga_init_clocks(void);
  extern void socfpga_sysmgr_init(void);
  
diff --cc arch/arm/mach-tegra/reset.h
index 0aee0129f8d7e,29c3dec0126a4..9c479c7925b85
--- a/arch/arm/mach-tegra/reset.h
+++ b/arch/arm/mach-tegra/reset.h
@@@ -35,7 -35,9 +35,8 @@@ extern unsigned long __tegra_cpu_reset_
  
  void __tegra_cpu_reset_handler_start(void);
  void __tegra_cpu_reset_handler(void);
+ void __tegra20_cpu1_resettable_status_offset(void);
  void __tegra_cpu_reset_handler_end(void);
 -void tegra_secondary_startup(void);
  
  #ifdef CONFIG_PM_SLEEP
  #define tegra_cpu_lp1_mask \
diff --cc arch/arm/mach-zynq/common.h
index 7038cae95ddcd,f2f0bf2e7d14a..79cda2e5fa4ec
--- a/arch/arm/mach-zynq/common.h
+++ b/arch/arm/mach-zynq/common.h
@@@ -17,9 -17,10 +17,8 @@@
  #ifndef __MACH_ZYNQ_COMMON_H__
  #define __MACH_ZYNQ_COMMON_H__
  
 -void zynq_secondary_startup(void);
 -
  extern int zynq_slcr_init(void);
  extern int zynq_early_slcr_init(void);
- extern void zynq_slcr_system_reset(void);
  extern void zynq_slcr_cpu_stop(int cpu);
  extern void zynq_slcr_cpu_start(int cpu);
  extern bool zynq_slcr_cpu_state_read(int cpu);