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/mach-at91
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
..
include/mach ARM: at91/PMC: fix at91sam9n12 USB FS init 2013-06-26 15:23:18 +02:00
at91_aic.h arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
at91_rstc.h ARM: at91: remove trailing semicolon from macros 2013-04-08 17:47:44 +02:00
at91_shdwc.h ARM: at91: remove trailing semicolon from macros 2013-04-08 17:47:44 +02:00
at91_tc.h arn: at91: move at91_tc.h to arch/arm/mach-at91 2012-11-06 20:29:44 +08:00
at91rm9200_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91rm9200_time.c ARM: at91: rm9200 fix time support 2013-05-15 12:37:45 +02:00
at91rm9200.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
at91sam9_alt_reset.S arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
at91sam9g45_devices.c ARM: arm-soc driver changes for 3.10 2013-05-04 12:31:18 -07:00
at91sam9g45_reset.S arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
at91sam9g45.c ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
at91sam9n12.c ARM: at91: at91sam9n12: move external irq declatation to DT 2013-05-24 10:53:50 +02:00
at91sam9rl_devices.c ARM: at91/avr32/atmel_lcdfb: add platform device-id table 2013-03-13 11:05:12 +01:00
at91sam9rl.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
at91sam9x5.c ARM: at91: sam9x5 add udc DT support 2013-06-15 00:15:07 +02:00
at91sam926x_time.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
at91sam9260_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9260.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
at91sam9261_devices.c ARM: at91/avr32/atmel_lcdfb: add platform device-id table 2013-03-13 11:05:12 +01:00
at91sam9261.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
at91sam9263_devices.c ARM: at91/avr32/atmel_lcdfb: add platform device-id table 2013-03-13 11:05:12 +01:00
at91sam9263.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
at91x40_time.c ARM: at91: remove trailing semicolon from macros 2013-04-08 17:47:44 +02:00
at91x40.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
board-1arm.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-afeb-9260v1.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-cam60.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-carmeva.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-cpu9krea.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-cpuat91.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-csb337.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-csb637.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-dt-rm9200.c ARM: at91: renamme rm9200 dt file 2013-03-13 17:28:14 +01:00
board-dt-sam9.c ARM: at91: rename board-dt to more specific name board-dt-sam9 2013-03-13 17:18:00 +01:00
board-dt-sama5.c ARM: at91: Fix link breakage when !CONFIG_PHYLIB 2013-06-18 10:20:22 +02:00
board-eb01.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-eb9200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-ecbat91.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-eco920.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-flexibity.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-foxg20.c ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
board-gsia18s.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-kafa.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-kb9202.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-pcontrol-g20.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-picotux200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-qil-a9260.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-rm9200ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-rsi-ews.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9-l9260.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9g20ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9m10g45ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9rlek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9260ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9261ek.c ARM: at91: udpate defconfigs 2013-05-17 15:05:08 +02:00
board-sam9263ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-snapper9260.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-stamp9g20.c ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
board-yl-9200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board.h ARM: arm-soc: Header cleanups 2012-12-12 11:45:16 -08:00
clock.c ARM: at91/PMC: use at91_usb_rate() for UTMI PLL 2013-06-26 15:24:11 +02:00
clock.h ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01:00
cpuidle.c ARM: at91: cpuidle: Fix target_residency 2013-06-21 16:52:00 +02:00
generic.h ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
gpio.c arm: Move chained_irq_(enter|exit) to a generic file 2013-03-26 16:11:43 +00:00
gsia18s.h arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00
irq.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
Kconfig ARM: at91: Fix link breakage when !CONFIG_PHYLIB 2013-06-18 10:20:22 +02:00
Kconfig.non_dt ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
leds.c arm: at91 move board.h to arch/arm/mach-at91 2012-11-06 20:29:37 +08:00
Makefile ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
pm_slowclock.S ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support 2012-04-17 14:47:21 +02:00
pm.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
pm.h ARM: at91: suspend both memory controllers on at91sam9263 2013-04-18 16:31:02 +02:00
sam9_smc.c ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
sam9_smc.h ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
sama5d3.c ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01:00
setup.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
soc.h ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
stamp9g20.h arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00