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-shmobile
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 SoC device tree changes 2013-07-02 14:23:01 -07:00
board-ag5evm.c ARM: shmobile: ag5evm: Register pinctrl mappings for IrDA 2013-03-15 13:34:09 +01:00
board-ape6evm.c ARM: shmobile: ape6evm: MP clock parent become EXTAL2 2013-06-07 14:26:30 +09:00
board-armadillo800eva-reference.c ARM: shmobile: armadillo800eva: Reference DT implementation 2013-06-04 17:41:53 +09:00
board-armadillo800eva.c ARM: shmobile: armadillo800eva: Convert SCIFA1 to pinctrl 2013-06-05 17:16:44 +09:00
board-bockw.c ARM SoC board specific changes 2013-07-02 14:10:26 -07:00
board-kota2.c ARM: shmobile: kota2: Register pinctrl mappings for BSC 2013-03-15 13:34:10 +01:00
board-kzm9d.c ARM: shmobile: kzm9d: resigser smsc911x platform device with id -1 2013-06-07 14:26:31 +09:00
board-kzm9g-reference.c ARM: shmobile: kzm9g-reference: Remove the VCCQ MC0 function GPIO 2013-06-05 17:17:16 +09:00
board-kzm9g.c ARM: shmobile: kzm9g: add AS3711 PMIC platform data 2013-06-07 14:26:31 +09:00
board-lager.c ARM: shmobile: lager: support GPIO switches 2013-06-07 14:26:31 +09:00
board-mackerel.c ARM: shmobile: mackerel: Register pinctrl mapping for USBHS 2013-06-04 21:04:15 +09:00
board-marzen-reference.c ARM: shmobile: marzen: Reference DT implementation 2013-03-18 21:27:02 +09:00
board-marzen.c ARM SoC board specific changes 2013-07-02 14:10:26 -07:00
clock-emev2.c mach-shmobile: Emma Mobile EV2 DT support V3 2012-05-18 00:14:03 +02:00
clock-r8a73a4.c ARM: shmobile: r8a73a4: add clock definitions and aliases for MMCIF and SDHI 2013-06-12 21:07:38 +09:00
clock-r8a7740.c ARM: shmobile: r8a7740: add TPU PWM support 2013-06-07 14:24:44 +09:00
clock-r8a7778.c Second Round of Renesas ARM-based SoC updates for v3.11 2013-06-14 18:00:00 -07:00
clock-r8a7779.c ARM: shmobile: r8a7779: Add PCIe clocks 2013-06-07 14:24:46 +09:00
clock-r8a7790.c ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI 2013-06-12 21:07:38 +09:00
clock-sh73a0.c ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate 2013-06-07 14:24:52 +09:00
clock-sh7372.c ARM: shmobile: sh7372: use fixed ratio clock 2013-04-02 11:02:16 +09:00
clock.c ARM: shmobile: add struct clk_ratio and fixed ratio clock macro 2013-04-02 11:02:16 +09:00
console.c
cpuidle.c ARM: shmobile: cpuidle: use init/exit common routine 2013-04-23 13:45:22 +02:00
entry-intc.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
headsmp-scu.S ARM: shmobile: Remove old SCU boot code 2013-06-17 16:07:29 +09:00
headsmp.S ARM: shmobile: Add SMP boot function and argument 2013-06-17 16:07:27 +09:00
intc-r8a7740.c ARM: shmobile: r8a7740: Add OF support to initialze the GIC 2013-06-04 16:49:19 +09:00
intc-r8a7779.c ARM: shmobile: Make r8a7779 INTC irqpin platform data static 2013-03-18 21:26:06 +09:00
intc-sh73a0.c ARM: shmobile: INTC External IRQ pin driver on sh73a0 2013-03-18 21:26:05 +09:00
intc-sh7372.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
Kconfig ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
Makefile ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
Makefile.boot ARM: shmobile: Remove Bonito board support 2013-06-17 16:07:31 +09:00
platsmp.c ARM: remove mach .handle_irq for GIC users 2013-01-12 10:47:20 -06:00
pm-r8a7740.c ARM: shmobile: r8a7740: Add CPU sleep suspend 2013-01-25 12:43:46 +09:00
pm-r8a7779.c ARM: shmobile: Move r8a7779's PM domain objects to a table 2012-09-04 01:44:58 +02:00
pm-rmobile.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
pm-sh73a0.c ARM: shmobile: sh73a0: Add CPU sleep suspend 2013-01-25 12:43:46 +09:00
pm-sh7372.c ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys() 2013-06-17 16:06:47 +09:00
setup-emev2.c This is the 2nd part of ARM timer clean-ups for 3.10. This series has 2013-04-17 10:10:01 -07:00
setup-r8a73a4.c ARM: shmobile: r8a73a4: add thermal driver support 2013-04-02 10:58:25 +09:00
setup-r8a7740.c ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
setup-r8a7778.c Second Round of Renesas ARM-based SoC updates for v3.11 2013-06-14 18:00:00 -07:00
setup-r8a7779.c Second Round of Renesas ARM-based SoC updates for v3.11 2013-06-14 18:00:00 -07:00
setup-r8a7790.c ARM: shmobile: r8a7790: Configure R-Car GPIO for IRQ_TYPE_EDGE_BOTH 2013-06-05 17:18:22 +09:00
setup-sh73a0.c Merge branch 'renesas/soc' into next/boards 2013-06-11 00:32:57 -07:00
setup-sh7372.c ARM: convert arm/arm64 arch timer to use CLKSRC_OF init 2013-04-11 15:11:15 -05:00
sh-gpio.h ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
sleep-sh7372.S ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys() 2013-06-17 16:06:47 +09:00
smp-emev2.c ARM: shmobile: EMEV2 SMP with SCU boot fn and args 2013-06-17 16:07:28 +09:00
smp-r8a7779.c ARM: shmobile: r8a7779 SMP with SCU boot fn and args 2013-06-17 16:07:27 +09:00
smp-sh73a0.c ARM: shmobile: sh73a0 SMP with SCU boot fn and args 2013-06-17 16:07:28 +09:00
suspend.c arm: Use generic idle loop 2013-04-08 17:39:24 +02:00
timer.c ARM: convert arm/arm64 arch timer to use CLKSRC_OF init 2013-04-11 15:11:15 -05:00