From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 May 2013 16:31:45 +0000 (-0700)
Subject: Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.12-rc1~931
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97b1007a2924aaa9126398623f6755a8c3c6a616;p=kernel%2Fkernel-generic.git

Merge tag 'soc-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC platform updates from Olof Johansson:
 "This branch contains part 1 of the platform updates for 3.10.  Among
  the highlights:

   - Support for the new Atmel Cortex-A5 based platforms (SAMA5D3)
   - New support for CSR SiRFatlas6 SoCs
   - A handful of updates for NVidia T114 (a.k.a. Tegra 4)
   - A bunch of updates for the shmobile platforms
   - A handful of updates for davinci
   - A few updates for Qualcomm MSM
   - Plus a handful of other patches, defconfig updates, etc."

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (135 commits)
  ARM: tegra: pm: fix build error w/o PM_SLEEP
  ARM: davinci: ensure global variables are declared
  ARM: davinci: sram.c: fix incorrect type in assignment
  ARM: davinci: da8xx dt: make file local symbols static
  ARM: davinci: da8xx: add remoteproc support
  ARM: socfpga: Upgrade clk driver for socfpga to make use of dts clock entries
  ARM: socfpga: Add clock entries into device tree
  ARM: socfpga: Enable soft reset
  ARM: EXYNOS: replace cpumask by the corresponding macro
  ARM: EXYNOS: handle properly the return values
  ARM: EXYNOS: factor out the idle states
  ARM: OMAP4: Enable fix for Cortex-A9 erratas
  ARM: OMAP2+: Export SoC information to userspace
  ARM: OMAP2+: SoC name and revision unification
  ARM: OMAP2+: Move common part of late init into common function
  ARM: tegra: pm: remove duplicated include from pm.c
  ARM: davinci: da850: override mmc DT node device name
  ARM: davinci: da850: add mmc DT entries
  mmc: davinci_mmc: add DT support
  ARM: SAMSUNG: check processor type before cache restoration in resume
  ...
---

97b1007a2924aaa9126398623f6755a8c3c6a616
diff --cc Documentation/kernel-parameters.txt
index 8c01a02,4a6d962..9653cf2
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -44,7 -44,7 +44,8 @@@ parameter is applicable
  	AVR32	AVR32 architecture is enabled.
  	AX25	Appropriate AX.25 support is enabled.
  	BLACKFIN Blackfin architecture is enabled.
 +	CLK	Common clock infrastructure is enabled.
+ 	CMA	Contiguous Memory Area support is enabled.
  	DRM	Direct Rendering Management support is enabled.
  	DYNAMIC_DEBUG Build in debug messages and enable them at runtime
  	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled
diff --cc arch/arm/configs/mxs_defconfig
index 87924d6,e9b1f6d..7ba48d2
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@@ -120,9 -122,9 +122,10 @@@ CONFIG_USB_EHCI_HCD=
  CONFIG_USB_CHIPIDEA=y
  CONFIG_USB_CHIPIDEA_HOST=y
  CONFIG_USB_STORAGE=y
 +CONFIG_USB_PHY=y
  CONFIG_USB_MXS_PHY=y
  CONFIG_MMC=y
+ CONFIG_MMC_UNSAFE_RESUME=y
  CONFIG_MMC_MXS=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
diff --cc arch/arm/mach-exynos/cpuidle.c
index 498a7a2,e2689d1..17a18ff
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@@ -58,6 -46,20 +46,19 @@@ static DEFINE_PER_CPU(struct cpuidle_de
  static struct cpuidle_driver exynos4_idle_driver = {
  	.name			= "exynos4_idle",
  	.owner			= THIS_MODULE,
 -	.en_core_tk_irqen	= 1,
+ 	.states = {
+ 		[0] = ARM_CPUIDLE_WFI_STATE,
+ 		[1] = {
+ 			.enter			= exynos4_enter_lowpower,
+ 			.exit_latency		= 300,
+ 			.target_residency	= 100000,
+ 			.flags			= CPUIDLE_FLAG_TIME_VALID,
+ 			.name			= "C1",
+ 			.desc			= "ARM power down",
+ 		},
+ 	},
+ 	.state_count = 2,
+ 	.safe_state_index = 0,
  };
  
  /* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
diff --cc arch/arm/mach-omap2/id.c
index ff0bc9e,098e94e..2fb17ca
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@@ -550,11 -561,13 +567,13 @@@ void __init omap5xxx_check_revision(voi
  
  	default:
  		/* Unknown default to latest silicon rev as default*/
 -		omap_revision = OMAP5430_REV_ES1_0;
 +		omap_revision = OMAP5430_REV_ES2_0;
  	}
  
- 	pr_info("OMAP%04x ES%d.0\n",
- 			omap_rev() >> 16, ((omap_rev() >> 12) & 0xf));
+ 	sprintf(soc_name, "OMAP%04x", omap_rev() >> 16);
+ 	sprintf(soc_rev, "ES%d.0", (omap_rev() >> 12) & 0xf);
+ 
+ 	pr_info("%s %s\n", soc_name, soc_rev);
  }
  
  /*
diff --cc arch/arm/mach-tegra/Makefile
index c197000,e40326d..b78f0d7
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -25,8 -25,10 +25,9 @@@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= cpu
  endif
  obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
 -obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
  obj-$(CONFIG_TEGRA_PCI)			+= pcie.o
  
+ obj-$(CONFIG_ARCH_TEGRA_114_SOC)	+= tegra114_speedo.o
  ifeq ($(CONFIG_CPU_IDLE),y)
  obj-$(CONFIG_ARCH_TEGRA_114_SOC)	+= cpuidle-tegra114.o
  endif