2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
linux-next/arch/arm/mach-shmobile/include/mach
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
..
clkdev.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
clock.h ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO() 2013-06-07 14:24:42 +09:00
common.h ARM: shmobile: Remove old SCU boot code 2013-06-17 16:07:29 +09:00
dma-register.h ARM: shmobile: add common DMAEngine definitions 2012-06-30 15:03:16 +02:00
dma.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
emev2.h ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
hardware.h ARM: mach-shmobile: Rely on run-time IRQ handlers 2011-01-07 10:43:02 +09:00
head-mackerel.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
intc.h ARM: mach-shmobile: Introduce INTC_IRQ_PINS_16H 2012-04-11 12:11:48 +02:00
irqs.h ARM: shmobile: add GPIO IRQ macro 2013-06-04 21:03:57 +09:00
mmc-mackerel.h mmc, ARM: Rename SuperH Mobile ARM zboot helpers 2011-03-25 01:24:57 +09:00
mmc.h ARM: shmobile: Remove AP4EVB board support 2013-06-17 16:07:31 +09:00
pm-rmobile.h ARM: shmobile: Rework adding devices to PM domains on Mackerel 2012-09-04 01:45:00 +02:00
r8a73a4.h ARM: shmobile: r8a73a4: Remove all GPIO enums 2013-04-03 10:30:43 +09:00
r8a7740.h ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
r8a7778.h Second Round of Renesas ARM-based SoC updates for v3.11 2013-06-14 18:00:00 -07:00
r8a7779.h ARM: shmobile: Marzen: pass platform data to USB PHY device 2013-06-11 16:10:48 +09:00
r8a7790.h ARM: shmobile: r8a7790: Remove all GPIOs 2013-06-05 17:17:12 +09:00
sdhi-sh7372.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sdhi.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sh73a0.h Merge branch 'soc' into pinmux-base 2013-04-02 11:08:34 +09:00
sh7372.h ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys() 2013-06-17 16:06:47 +09:00
system.h Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
timex.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
uncompress.h ARM: remove unused arch_decomp_wdog() 2013-01-11 10:54:03 +08:00
zboot_macros.h ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM 2010-12-05 08:40:21 +00:00
zboot.h ARM: shmobile: Remove AP4EVB board support 2013-06-17 16:07:31 +09:00