linux/arch/arm/mach-shmobile
Linus Torvalds 6a57d104c8 ARM: arm-soc: SoC updates, take 2
This is the second batch of SoC updates for the 3.8 merge window,
 containing parts that had dependencies on earlier branches such that we
 couldn't include them with the first branch.
 
 These are general updates for Samsung Exynos, Renesas/shmobile and a
 topic branch that adds SMP support to Altera's socfpga platform.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJQy5gxAAoJEIwa5zzehBx3ab0P/1SSJYLNcn8rieIALLZaSH17
 lxVwyv/OMLmRual0eVjXN+mcNuAc05gemLUSNSrdFPrHhEGSqFz8x0C/A6o3Ovw/
 OxNNX3rQiZP86vKRVmT/did7yEkMmleKng19uOyBXN2p7f6lh01Y5NFTVE1dWiZG
 TJPEgWI9mrarUMarL90fBu7AlXPNJwfG0opmT5QWuZmcLlaRXFTqFU2U08e5rPp5
 9yrTn3fQCDx+eT7qUBiZfuH6sesMnofYWDNJSvV/aPI4UYsEcK6KyJUL8LBuTLQ7
 9LHqsJNHLnlqxDsq6N/B0/pno2rhgdbkPPtl0c0xw35anHWW86IUgWgSCbu16LDZ
 uKDV31tIsx8yhsm8QkSKwzEjVnablhVYORGByVkNYBVSgMobdxBNFog6iX9NNQxJ
 3Z1K0i65YPffDoK7CJorIxcxyvBuBR/KueUFpzEK05xzJlvhPK2NQSY5Je0qEaA3
 tZYt0WfMtLC0huhLxEL/xNXuErqvj18kOSal3CHmg2LWVaKCFKNuY/B71yF7xaTc
 qN3RGJdb5Dyh49CCzXVBSAKJozc+pB8RauGnM//UQf49lmFzQ7oaQjxNjS3zQrjA
 3LsbJ8cDbwWVKb8yRvR8BtnJl81yE58D6R/gEPjH33v4jRPLUONLyyhVI57Rf0tV
 SFjd8wRlsFakOQ4qnG/B
 =77Ct
 -----END PGP SIGNATURE-----

Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM Soc updates, take 2, from Olof Johansson:
 "This is the second batch of SoC updates for the 3.8 merge window,
  containing parts that had dependencies on earlier branches such that
  we couldn't include them with the first branch.

  These are general updates for Samsung Exynos, Renesas/shmobile and a
  topic branch that adds SMP support to Altera's socfpga platform."

Fix up conflicts mostly as per Olof.

* tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: EXYNOS: Clock settings for SATA and SATA PHY
  ARM: EXYNOS: Add ARM down clock support
  ARM: EXYNOS: Fix i2c suspend/resume for legacy controller
  ARM: EXYNOS: Add aliases for i2c controller
  ARM: EXYNOS: Setup legacy i2c controller interrupts
  sh: clkfwk: fixup unsed variable warning
  Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode"
  Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode"
  Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode"
  ARM: highbank: use common debug_ll_io_init
  ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
  ARM: shmobile: sh7372: remove fsidivx clock
  ARM: socfpga: mark secondary_trampoline as cpuinit
  socfpga: map uart into virtual address space so that early_printk() works
  ARM: socfpga: fix build break for allyesconfig
  ARM: socfpga: Enable SMP for socfpga
  ARM: EXYNOS: Add dp clock support for EXYNOS5
  ARM: SAMSUNG: call clk_get_rate for debugfs rate files
  ARM: SAMSUNG: add clock_tree debugfs file in clock
2012-12-14 14:38:28 -08:00
..
include/mach ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global 2012-11-08 17:52:35 +09:00
board-ag5evm.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
board-ap4evb.c ARM: shmobile: use FSI driver's audio clock on ap4evb 2012-11-08 17:52:05 +09:00
board-armadillo800eva.c Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2 2012-11-12 21:59:38 +01:00
board-bonito.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
board-kota2.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
board-kzm9d.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
board-kzm9g.c ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
board-mackerel.c ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
board-marzen.c ARM: shmobile: marzen: add USB OHCI driver support 2012-11-08 17:52:04 +09:00
clock-emev2.c mach-shmobile: Emma Mobile EV2 DT support V3 2012-05-18 00:14:03 +02:00
clock-r8a7740.c ARM: shmobile: add fsi external clock on r8a7740 2012-11-08 15:22:01 +09:00
clock-r8a7779.c Merge branches 'depends/asoc', 'renesas/boards', 'renesas/soc' and 'renesas/soc2' into next/boards2 2012-11-12 21:59:00 +01:00
clock-sh73a0.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
clock-sh7372.c ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global 2012-11-08 17:52:35 +09:00
clock.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
console.c
cpuidle.c ARM: shmobile: Make sh7372 cpuidle handling more straightforward 2012-09-04 01:45:01 +02:00
entry-intc.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
headsmp.S ARM / mach-shmobile: Invalidate caches when booting secondary cores 2012-05-12 22:13:52 +02:00
hotplug.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
intc-r8a7740.c ARM: shmobile: r8a7740: add HDMI interrupt support 2012-06-20 12:27:47 +02:00
intc-r8a7779.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
intc-sh73a0.c Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
intc-sh7372.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
Kconfig ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
Makefile ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
Makefile.boot ARM: dtb: move all dtb targets to common Makefile 2012-09-20 22:58:17 -07:00
pfc-r8a7740.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
pfc-r8a7779.c ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx 2012-11-07 17:11:22 +09:00
pfc-sh73a0.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
pfc-sh7372.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
platsmp.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
pm-r8a7740.c ARM: shmobile: Move r8a7740's PM domain objects to a table 2012-09-04 01:44:57 +02:00
pm-r8a7779.c ARM: shmobile: Move r8a7779's PM domain objects to a table 2012-09-04 01:44:58 +02:00
pm-rmobile.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
pm-sh7372.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
setup-emev2.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
setup-r8a7740.c ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
setup-r8a7779.c Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2 2012-11-12 21:57:52 +01:00
setup-sh73a0.c ARM: soc: soc-specific updates 2012-10-01 18:24:44 -07:00
setup-sh7372.c ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
sh-gpio.h ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
sleep-sh7372.S PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode 2011-12-25 23:39:03 +01:00
smp-emev2.c Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode" 2012-11-13 11:41:09 +09:00
smp-r8a7779.c Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode" 2012-11-13 11:42:54 +09:00
smp-sh73a0.c Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode" 2012-11-13 11:42:28 +09:00
suspend.c ARM: shmobile: use machine specific hook for late init 2012-05-08 20:36:35 +08:00
timer.c ARM / mach-shmobile: Use preset_lpj with calibrate_delay() 2012-05-12 22:21:36 +02:00