mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 10:31:48 +00:00
e9daa0ead1
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. |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| arch_timer.c | ||
| armksyms.c | ||
| arthur.c | ||
| asm-offsets.c | ||
| atags_compat.c | ||
| atags_parse.c | ||
| atags_proc.c | ||
| atags.h | ||
| bios32.c | ||
| calls.S | ||
| cpuidle.c | ||
| crash_dump.c | ||
| debug.S | ||
| devtree.c | ||
| dma-isa.c | ||
| dma.c | ||
| early_printk.c | ||
| elf.c | ||
| entry-armv.S | ||
| entry-common.S | ||
| entry-header.S | ||
| etm.c | ||
| fiq.c | ||
| fiqasm.S | ||
| ftrace.c | ||
| head-common.S | ||
| head-nommu.S | ||
| head.S | ||
| hw_breakpoint.c | ||
| hyp-stub.S | ||
| insn.c | ||
| insn.h | ||
| io.c | ||
| irq.c | ||
| isa.c | ||
| iwmmxt.S | ||
| jump_label.c | ||
| kgdb.c | ||
| kprobes-arm.c | ||
| kprobes-common.c | ||
| kprobes-test-arm.c | ||
| kprobes-test-thumb.c | ||
| kprobes-test.c | ||
| kprobes-test.h | ||
| kprobes-thumb.c | ||
| kprobes.c | ||
| kprobes.h | ||
| machine_kexec.c | ||
| Makefile | ||
| module.c | ||
| opcodes.c | ||
| patch.c | ||
| patch.h | ||
| perf_event_cpu.c | ||
| perf_event_v6.c | ||
| perf_event_v7.c | ||
| perf_event_xscale.c | ||
| perf_event.c | ||
| pj4-cp0.c | ||
| process.c | ||
| ptrace.c | ||
| relocate_kernel.S | ||
| return_address.c | ||
| sched_clock.c | ||
| setup.c | ||
| signal.c | ||
| signal.h | ||
| sleep.S | ||
| smp_scu.c | ||
| smp_tlb.c | ||
| smp_twd.c | ||
| smp.c | ||
| stacktrace.c | ||
| suspend.c | ||
| swp_emulate.c | ||
| sys_arm.c | ||
| sys_oabi-compat.c | ||
| tcm.c | ||
| tcm.h | ||
| thumbee.c | ||
| time.c | ||
| topology.c | ||
| traps.c | ||
| unwind.c | ||
| vmlinux.lds.S | ||
| xscale-cp0.c | ||