2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
linux-next/arch/arm
Linus Torvalds ee1a8d402e ARM SoC device tree changes
These changes from 30 individual branches for the most part update device
 tree files, but there are also a few source code changes that have crept
 in this time, usually in order to atomically move over a driver from
 using hardcoded data to DT probing.
 
 A number of platforms change their DT files to use the C preprocessor,
 which is causing a bit of churn, but that is hopefully only this once.
 
 There are a few conflicts with the other branches unfortunately:
 
 * in exynos5440.dtsi and kirkwood-6281.dtsi, device nodes are added
   from multiple branches. Need to be careful to have the right
   set of closing braces as git gets this one wrong.
 
 * In kirkwood.dtsi, one 'ranges' line got split into two lines, while
   another line got added. Order of the lines does not matter.
 
 * in sama5d3.dtsi, some cleanup was merged the wrong way, causing
   a bogus conflict. We want the 'dmas' and 'dma-names' properties
   to get added here.
 
 * Two lines got removed independently in arch/arm/mach-mxs/mach-mxs.c
 
 * Contents get added independently in arch/arm/mach-omap2/cclock33xx_data.c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUdLnpGCrR//JCVInAQI50RAAsXbH1SGvjKJemXhRkFloPDYpCbgdDUFr
 ChUbjNV1xsY/jaNCfMa5/Qo7lgz/Ot7BpJef9fZn7ret+dc7nchqe/4iIkAokAUh
 E4ao9D1dP5aAA0ihdbSQHCZtR/0SUR81h6BoOVuo/1mvEiBaFbWAeYe8/6LJd9II
 OU1w9bDmjfZWYFUXs+j2VF76ueZQ+kz69XDKZUGtkqN76m1AL8lGDurj5jxvyllF
 VJns8d9q2nr2q9PferfajK6rkOIPaTpwKblxZHUgobCyOitZaiZM0NgF733TsNM6
 HXmhDhkcn7T81+SiHVfigJ/nxo9UgU4zNJCODF3WZIwGIj3FbxvCOpdCYi2NhCO8
 oLcgDk57tpoKpB3gvAmYVQHP9FIepFa/WAWyPIADA7PkpYrwgc4v+cLEHXpd8SRv
 viLLIa5QuNdMeaK+Md9OKmKZFd7uFD9jiMtmdm6IpEVDDjMgoteb2XSoEtNebmtY
 MfbW4okn118a2dFKKaPTKcXVW/a5FRp2JGfB0A58RQHaJWj3JsY1bFn/xWPEpTOA
 IWB/HHMln0LYTL2AXN9HcaL1jnGI1Wq5eWBurX+cXQ/ij1A6jfoRKYglx7AQqOHj
 iWcGYtKLLJCgiWFnLSwcljZhfoYr0/z7rhns6yo7/vhN0riy+M84OgN4HbAmUzc1
 Bgy9PnJTNo8=
 =8PtJ
 -----END PGP SIGNATURE-----

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

Pull ARM SoC device tree changes from Arnd Bergmann:
 "These changes from 30 individual branches for the most part update
  device tree files, but there are also a few source code changes that
  have crept in this time, usually in order to atomically move over a
  driver from using hardcoded data to DT probing.

  A number of platforms change their DT files to use the C preprocessor,
  which is causing a bit of churn, but that is hopefully only this once"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string
  ARM: Kirkwood: Fix the internal register ranges translation
  ARM: dts: bcm281xx: change comment to C89 style
  ARM: mmc: bcm281xx SDHCI driver (dt mods)
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
  ARM: dts: omap4-panda: Fix DVI EDID reads
  ARM: dts: omap4-panda: Add USB Host support
  arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
  ARM: shmobile: irqpin: add a DT property to enable masking on parent
  ARM: dts: AM43x EPOS EVM support
  ARM: dts: OMAP5: Add bandgap DT entry
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
  ...
2013-07-02 14:23:01 -07:00
..
boot ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
common ARM: edma: Add EDMA crossbar event mux support 2013-06-24 14:08:34 +05:30
configs ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
crypto ARM: 7723/1: crypto: sha1-armv4-large.S: fix SP handling 2013-05-22 22:01:35 +01:00
include ARM SoC specific changes 2013-07-02 13:43:38 -07:00
kernel ARM SoC specific changes 2013-07-02 13:43:38 -07:00
kvm ARM: KVM: be more thorough when invalidating TLBs 2013-06-03 10:58:56 +03:00
lib
mach-at91 ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-bcm ARM: bcm281xx: Remove init_irq declaration in machine description 2013-05-14 09:48:40 -07:00
mach-bcm2835
mach-clps711x ARM: clps711x: Add support for SYSCON driver 2013-06-11 15:47:45 -07:00
mach-cns3xxx ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-davinci ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-dove ARM: dove: move DT boards to SoC-centric clock init 2013-05-29 19:21:05 +00:00
mach-ebsa110
mach-ep93xx
mach-exynos ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-footbridge
mach-gemini ARM: arm-soc cleanup for 3.10 2013-05-02 09:03:55 -07:00
mach-highbank ARM: highbank: remove the .map_io declaration 2013-05-24 10:23:05 +02:00
mach-imx ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-integrator ARM: integrator: let pciv3 use mem/premem from device tree 2013-06-27 14:19:54 +02:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx Finally eradicate CONFIG_HOTPLUG 2013-06-03 14:20:18 -07:00
mach-keystone ARM: keystone: Move CPU bringup code to dedicated asm file 2013-06-24 16:23:36 +02:00
mach-kirkwood ARM SoC board specific changes 2013-07-02 14:10:26 -07:00
mach-ks8695
mach-lpc32xx
mach-mmp ARM: arm-soc board specific changes for 3.10, part 1 2013-05-04 12:34:30 -07:00
mach-msm Cleanups for MSM for 3.11 2013-06-14 18:28:02 -07:00
mach-mv78xx0
mach-mvebu mvebu register map changes for v3.11 (round 2) 2013-06-21 20:00:08 +02:00
mach-mxs ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-netx
mach-nomadik ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-omap1 ARM SoC board specific changes 2013-07-02 14:10:26 -07:00
mach-omap2 ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-orion5x ARM: Orion: Remove redundant init_dma_coherent_pool_size() 2013-05-13 19:35:39 +00:00
mach-picoxcell ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-prima2 ARM SoC cleanups 2013-07-02 13:25:35 -07:00
mach-pxa - Lots of cleanups from Artem, including deletion of some obsolete drivers 2013-05-09 10:15:46 -07:00
mach-realview Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-05-03 09:13:19 -07:00
mach-rockchip arm: add basic support for Rockchip RK3066a boards 2013-06-21 09:21:02 +02:00
mach-rpc
mach-s3c24xx ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-s3c64xx ARM: SAMSUNG: Let platforms use the new watchdog reset driver 2013-06-19 03:13:16 +09:00
mach-s5p64x0 ARM: s5p64x0: avoid build warning for uncompress.h 2013-06-20 17:31:50 +02:00
mach-s5pc100 ARM: SAMSUNG: Let platforms use the new watchdog reset driver 2013-06-19 03:13:16 +09:00
mach-s5pv210 ARM: SAMSUNG: Consolidate uncompress subroutine 2013-06-19 02:22:18 +09:00
mach-sa1100
mach-shark
mach-shmobile ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-socfpga Adds basic support for Rockchip Cortex-A9 SoCs. 2013-06-21 11:46:56 +02:00
mach-spear ARM: spear: Remove init_irq declaration in machine description 2013-05-24 10:12:51 +02:00
mach-sunxi ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-tegra ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-u300 ARM: u300: only build for ARCH_MULTI_V5 2013-06-20 12:20:47 +02:00
mach-ux500 ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-versatile
mach-vexpress ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-virt ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-vt8500 Cleanups in various machine definitions 2013-05-31 22:08:11 -07:00
mach-w90x900
mach-zynq ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mm ARM SoC specific changes 2013-07-02 13:43:38 -07:00
net
nwfpe
oprofile
plat-iop
plat-omap ARM: OMAP: dma: Remove the erroneous freeing of platform data 2013-06-18 00:09:57 -07:00
plat-orion ARM: plat-orion: Fix num_resources and id for ge10 and ge11 2013-05-20 17:39:07 +00:00
plat-pxa
plat-samsung ARM SoC specific changes 2013-07-02 13:43:38 -07:00
plat-versatile
tools
vfp ARM: 7729/1: vfp: ensure VFP_arch is non-zero when VFP is not supported 2013-05-22 22:01:37 +01:00
xen xen/arm: rename xen_secondary_init and run it on every online cpu 2013-05-13 16:14:25 +00:00
Kconfig ARM SoC specific changes 2013-07-02 13:43:38 -07:00
Kconfig-nommu
Kconfig.debug Adds basic support for Rockchip Cortex-A9 SoCs. 2013-06-21 11:46:56 +02:00
Makefile ARM SoC specific changes 2013-07-02 13:43:38 -07:00