linux/arch/arm/mach-tegra
Olof Johansson e9daa0ead1 ARM: tegra: add Tegra114 SoC support
This pull request adds initial support for the Tegra114 SoC, which
 integrates a quad-core ARM Cortex-A15 CPU. I'm proud to observe that we
 posted the initial versions of these patches before the final official
 announcement of this chip.
 
 These patches are enough to boot with a UART-based console, support the
 Dalmore and Pluto reference/evaluation boards, instantiate the GPIO and
 pinctrl drivers, and enable a cpuidle state. As yet, no clocks or
 storage devices are supported, but patches for those will follow shortly.
 
 This pull request is based on (most of) the previous pull request with
 tag tegra-for-3.9-soc-cpuidle, followed by a merge of the previous pull
 request with tag tegra-for-3.9-scu-base-rework.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRCY47AAoJEMzrak5tbycxiCEQAKokAbR2acuzR1BC3o+pQAsv
 6/2TkGdZXhgmf7COXkjHLQSnQn5MLSiHSQxVfc8rwpJ7Tma0BaZ1QhoeYKU718ix
 S9htYgCurcU6XUuRW6THw3nF1a7S6Z7WX63DS6d1LcGzAHLRAc3Y6Kb1pHCDTThy
 Hqf0SvIrpIB6dLpBT63sbbGQjauwd+pvWMFanHwyrKJFOURqMQngzCcXeFqKw8cI
 DRS5JWeTZfhOKosnme9lNkWiXM7zYzedtErBcWg3TbtSz8I3DB/I4Zi3lQcwO/hj
 K/loW99/tg4mL90FaOtNrO33y1qc/4PAWSLdAvcSs00TvrIPGZ9HULybyY3NYPEK
 48XT/3WAS7NtD42MA78DbBDyX4sw2vIz7LZLdTukG/gjIckOE4oapIq4QvIK6OwM
 9GkYe8Zx6kASVEKQEntW3iax/VyhU04xpmCYpAVcUkBW260zbHPA95Ltqr6R4vdq
 HKezEUq7Gq/kLiiMlnUcotaZY6MHyTOR1SXBN3ai71pAQzhsrHUPOQZoxvoERW7Q
 vIN7unQ4lqgmBY4mUnPvFB0pXQ7Y939EGtYK59s7uuQraVe3TI0G/KUlKwbxVzDX
 iTtkeu54bfla39kxMaYVUzNhy0mh/TA8PonefgYqZW7QPw4PhfgzYItzOvU6g/XC
 cDSQluEEjqwn1vfSBaI1
 =bIIe
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.9-soc-t114' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc

From Stepen Warren:
ARM: tegra: add Tegra114 SoC support

This pull request adds initial support for the Tegra114 SoC, which
integrates a quad-core ARM Cortex-A15 CPU. I'm proud to observe that we
posted the initial versions of these patches before the final official
announcement of this chip.

These patches are enough to boot with a UART-based console, support the
Dalmore and Pluto reference/evaluation boards, instantiate the GPIO and
pinctrl drivers, and enable a cpuidle state. As yet, no clocks or
storage devices are supported, but patches for those will follow shortly.

This pull request is based on (most of) the previous pull request with
tag tegra-for-3.9-soc-cpuidle, followed by a merge of the previous pull
request with tag tegra-for-3.9-scu-base-rework.

* tag 'tegra-for-3.9-soc-t114' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (24 commits)
  ARM: DT: tegra114: add pinmux DT entry
  ARM: DT: tegra114: add GPIO DT entry
  ARM: tegra114: select PINCTRL for Tegra114 SoC
  ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support
  ARM: tegra: Add SMMU entry to Tegra114 DT
  ARM: tegra: add AHB entry to Tegra114 DT
  ARM: tegra: Add initial support for Tegra114 SoC.
  ARM: dt: tegra114: Add new board, Pluto
  ARM: dt: tegra114: Add new board, Dalmore
  ARM: dt: tegra114: Add new SoC base, Tegra114 SoC
  ARM: tegra: fuse: Add chip ID Tegra114 0x35
  ARM: OMAP: Make use of available scu_a9_get_base() interface
  ARM: tegra: Skip scu_enable(scu_base) if not Cortex A9
  ARM: Add API to detect SCU base address from CP15
  ARM: tegra: Use DT /cpu node to detect number of CPU core
  ARM: tegra: Add CPU nodes to Tegra30 device tree
  ARM: tegra: Add CPU nodes to Tegra20 device tree
  ARM: perf: simplify __hw_perf_event_init err handling
  ARM: perf: remove unnecessary checks for idx < 0
  ARM: perf: handle armpmu_register failing
  ...

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

Remove/add conflict in arch/arm/mach-tegra/common.c resolved.
Remove/remove conflict in arch/arm/mach-tegra/platsmp.c. Leave the empty
stub function for now since removing it in the merge commit is confusing;
will be cleaned up in a separate commit.  # # It looks like you may be
committing a merge.  # If this is not correct, please remove the file #
.git/MERGE_HEAD # and try again.
2013-02-05 13:10:39 -08:00
..
include/mach ARM: tegra: remove legacy clock code 2013-01-28 11:19:33 -07:00
apbio.c ARM: tegra: Make variables static 2013-01-28 10:21:28 -07:00
apbio.h
board-dt-tegra20.c ARM: tegra: USB driver cleanup 2013-02-05 12:45:39 -08:00
board-dt-tegra30.c ARM: tegra: Common Clock Framework rework 2013-02-05 12:13:10 -08:00
board-dt-tegra114.c ARM: tegra: Add initial support for Tegra114 SoC. 2013-01-28 11:23:15 -07:00
board-harmony-pcie.c
board-paz00.c
board-paz00.h
board.h ARM: tegra: move timer.c to drivers/clocksource/ 2013-01-28 10:21:21 -07:00
common.c ARM: tegra: Common Clock Framework rework 2013-02-05 12:13:10 -08:00
common.h ARM: tegra: moving the clock gating procedure to tegra_cpu_kill 2013-01-28 10:21:48 -07:00
cpu-tegra.c ARM: tegra: migrate to new clock code 2013-01-28 11:19:07 -07:00
cpuidle-tegra20.c ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode 2013-01-28 11:20:38 -07:00
cpuidle-tegra30.c ARM: tegra: move tegra_cpu_car.h to linux/clk/tegra.h 2013-01-28 11:19:06 -07:00
cpuidle-tegra114.c ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support 2013-01-29 11:01:23 -07:00
cpuidle.c ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support 2013-01-29 11:01:23 -07:00
cpuidle.h ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support 2013-01-29 11:01:23 -07:00
flowctrl.c ARM: tegra20: flowctrl: add support for cpu_suspend_enter/exit 2013-01-28 11:20:38 -07:00
flowctrl.h ARM: tegra20: flowctrl: add support for cpu_suspend_enter/exit 2013-01-28 11:20:38 -07:00
fuse.c ARM: tegra: add function to read chipid 2013-01-28 11:19:06 -07:00
fuse.h ARM: tegra: fuse: Add chip ID Tegra114 0x35 2013-01-28 11:23:00 -07:00
gpio-names.h
headsmp.S ARM: tegra: make device can run on UP 2013-01-28 11:14:06 -07:00
hotplug.c ARM: tegra: move tegra_cpu_car.h to linux/clk/tegra.h 2013-01-28 11:19:06 -07:00
io.c ARM: tegra: don't include iomap.h from debug-macro.S 2012-11-16 12:22:17 -07:00
iomap.h ARM: tegra: remove USB address related macros from iomap.h 2013-01-28 11:20:04 -07:00
irammap.h ARM: tegra: decouple uncompress.h and debug-macro.S 2012-11-16 12:22:17 -07:00
irq.c ARM: tegra: cpuidle enhancements 2013-02-05 12:46:18 -08:00
irq.h ARM: tegra: add pending SGI checking API 2013-01-28 11:20:38 -07:00
Kconfig ARM: tegra114: select PINCTRL for Tegra114 SoC 2013-01-29 11:02:14 -07:00
Makefile ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support 2013-01-29 11:01:23 -07:00
Makefile.boot
pcie.c ARM: tegra: migrate to new clock code 2013-01-28 11:19:07 -07:00
platsmp.c ARM: tegra: add Tegra114 SoC support 2013-02-05 13:10:39 -08:00
pm.c ARM: tegra20: cpuidle: add powered-down state for secondary CPU 2013-01-28 11:20:38 -07:00
pm.h ARM: tegra: retain L2 content over CPU suspend/resume 2012-11-15 15:09:22 -07:00
pmc.c ARM: tegra: move iomap.h to mach-tegra 2012-11-05 11:36:06 -07:00
pmc.h
powergate.c ARM: tegra: migrate to new clock code 2013-01-28 11:19:07 -07:00
reset-handler.S ARM: tegra: make device can run on UP 2013-01-28 11:14:06 -07:00
reset.c ARM: tegra: make device can run on UP 2013-01-28 11:14:06 -07:00
reset.h ARM: tegra30: cpuidle: add powered-down state for secondary CPUs 2012-11-15 15:09:21 -07:00
sleep-tegra20.S ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode 2013-01-28 11:20:38 -07:00
sleep-tegra30.S ARM: tegra: update the cache maintenance order for CPU shutdown 2013-01-28 10:21:44 -07:00
sleep.h ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode 2013-01-28 11:20:38 -07:00
sleep.S ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode 2013-01-28 11:20:38 -07:00
tegra2_emc.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
tegra2_emc.h
tegra20_speedo.c ARM: tegra: Add speedo-based process identification 2012-11-15 14:34:20 -07:00
tegra30_speedo.c ARM: tegra: Tegra30 speedo-based process identification 2012-11-15 14:36:59 -07:00