diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 21:49:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 21:49:36 -0500 |
commit | 0ba3307a8ec35252f7b1e222e32889a6f3d9ceb3 (patch) | |
tree | 26126ed7a2080a706f0488c215549fc9f5f76a59 /arch/arm/Makefile | |
parent | 903a9f77d1d00c8621bc37afd959ac45a4b3ebec (diff) | |
parent | cd2f43a1f7400a74a084094502f70df2e169c6e8 (diff) |
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM driver updates from Olof Johansson:
"Updates of SoC-near drivers and other driver updates that makes more
sense to take through our tree.
The largest part of this is a conversion of device registration for
some renesas shmobile/sh devices over to use resources. This has
required coordination with the corresponding arch/sh changes, and
we've agreed to merge the arch/sh changes through our tree.
Added in this branch is support for Trusted Foundations secure
firmware, which is what is used on many of the commercial Nvidia Tegra
products that are in the market, including the Nvidia Shield. The
code is local to arch/arm at this time since it's uncertain whether it
will be shared with arm64 longer-term, if needed we will refactor
later.
A couple of new RTC drivers used on ARM boards, merged through our
tree on request by the RTC maintainer.
... plus a bunch of smaller updates across the board, gpio conversions
for davinci, etc"
* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
watchdog: davinci: rename platform driver to davinci-wdt
tty: serial: Limit msm_serial_hs driver to platforms that use it
mmc: msm_sdcc: Limit driver to platforms that use it
usb: phy: msm: Move mach dependent code to platform data
clk: versatile: fixup IM-PD1 clock implementation
clk: versatile: pass a name to ICST clock provider
ARM: integrator: pass parent IRQ to the SIC
irqchip: versatile FPGA: support cascaded interrupts from DT
gpio: davinci: don't create irq_domain in case of unbanked irqs
gpio: davinci: use chained_irq_enter/chained_irq_exit API
gpio: davinci: add OF support
gpio: davinci: remove unused variable intc_irq_num
gpio: davinci: convert to use irqdomain support.
gpio: introduce GPIO_DAVINCI kconfig option
gpio: davinci: get rid of DAVINCI_N_GPIO
gpio: davinci: use {readl|writel}_relaxed() instead of __raw_*
serial: sh-sci: Add OF support
serial: sh-sci: Add device tree bindings documentation
serial: sh-sci: Remove platform data mapbase and irqs fields
serial: sh-sci: Remove platform data scbrr_algo_id field
...
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index d8605046792c..23d5e3946589 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -267,6 +267,7 @@ core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ | |||
267 | core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ | 267 | core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ |
268 | core-y += arch/arm/net/ | 268 | core-y += arch/arm/net/ |
269 | core-y += arch/arm/crypto/ | 269 | core-y += arch/arm/crypto/ |
270 | core-y += arch/arm/firmware/ | ||
270 | core-y += $(machdirs) $(platdirs) | 271 | core-y += $(machdirs) $(platdirs) |
271 | 272 | ||
272 | drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ | 273 | drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ |