From: Olof Johansson <olof@lixom.net>
Date: Wed, 14 Aug 2013 07:54:46 +0000 (-0700)
Subject: Merge tag 'renesas-boards-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~5402^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=74f19946976edabe6432ac0005346b0611e2f8c1;p=firefly-linux-kernel-4.4.55.git

Merge tag 'renesas-boards-for-v3.12' of git://git./linux/kernel/git/horms/renesas into next/boards

From Simon Horman:
Renesas ARM-based SoC board updates for v3.12

* ape6evm: Add SDHI and MMCIF support
* lager: Add MMCIF support
* armadillo800eva: Add DMA support for MMCIF

* tag 'renesas-boards-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (54 commits)
  ARM: shmobile: ape6evm: add SDHI interfaces
  ARM: shmobile: ape6evm: add MMCIF support
  ARM: shmobile: select the fixed regulator driver on BockW
  ARM: shmobile: lager: add MMCIF support
  ARM: shmobile: armadillo800eva: add DMA support to MMCIF
  ARM: shmobile: Setup r8a7790 arch timer based on MD pins
  ARM: shmobile: Introduce r8a7790_read_mode_pins()
  ARM: shmobile: r8a7740: add MMCIF DMA definitions
  ARM: shmobile: Disconnect EMEV2 SMP code from clocks
  ARM: shmobile: Make r8a73a4 Arch timer optional
  ARM: shmobile: Add r8a73a4 CMT10 clock event
  ARM: shmobile: Make r8a7790 Arch timer optional
  ARM: shmobile: Add r8a7790 CMT00 clock event
  ARM: shmobile: Sort r8a7790 MSTP entries
  ARM: shmobile: r8a73a4: add clocks for I2C controllers
  ARM: shmobile: r8a73a4: add Z2 clock support
  ARM: shmobile: r8a73a4: safeguard against wrong clk_set_rate() uses
  ARM: shmobile: r8a73a4: implement CPU clock scaling for CPUFreq
  ARM: shmobile: r8a73a4: wait for completion when kicking the clock
  ARM: shmobile: r8a7790: add thermal driver support
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
---

74f19946976edabe6432ac0005346b0611e2f8c1
diff --cc arch/arm/mach-shmobile/smp-emev2.c
index 22a05a869d25,1bf8bc7e8ed8..78e84c582453
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@@ -29,8 -29,10 +29,10 @@@
  #include <asm/smp_scu.h>
  
  #define EMEV2_SCU_BASE 0x1e000000
+ #define EMEV2_SMU_BASE 0xe0110000
+ #define SMU_GENERAL_REG0 0x7c0
  
 -static int __cpuinit emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
 +static int emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
  {
  	arch_send_wakeup_ipi_mask(cpumask_of(cpu_logical_map(cpu)));
  	return 0;