mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 20:32:22 +00:00
ee1a8d402e
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 ... |
||
|---|---|---|
| .. | ||
| include/mach | ||
| at91_aic.h | ||
| at91_rstc.h | ||
| at91_shdwc.h | ||
| at91_tc.h | ||
| at91rm9200_devices.c | ||
| at91rm9200_time.c | ||
| at91rm9200.c | ||
| at91sam9_alt_reset.S | ||
| at91sam9g45_devices.c | ||
| at91sam9g45_reset.S | ||
| at91sam9g45.c | ||
| at91sam9n12.c | ||
| at91sam9rl_devices.c | ||
| at91sam9rl.c | ||
| at91sam9x5.c | ||
| at91sam926x_time.c | ||
| at91sam9260_devices.c | ||
| at91sam9260.c | ||
| at91sam9261_devices.c | ||
| at91sam9261.c | ||
| at91sam9263_devices.c | ||
| at91sam9263.c | ||
| at91x40_time.c | ||
| at91x40.c | ||
| board-1arm.c | ||
| board-afeb-9260v1.c | ||
| board-cam60.c | ||
| board-carmeva.c | ||
| board-cpu9krea.c | ||
| board-cpuat91.c | ||
| board-csb337.c | ||
| board-csb637.c | ||
| board-dt-rm9200.c | ||
| board-dt-sam9.c | ||
| board-dt-sama5.c | ||
| board-eb01.c | ||
| board-eb9200.c | ||
| board-ecbat91.c | ||
| board-eco920.c | ||
| board-flexibity.c | ||
| board-foxg20.c | ||
| board-gsia18s.c | ||
| board-kafa.c | ||
| board-kb9202.c | ||
| board-pcontrol-g20.c | ||
| board-picotux200.c | ||
| board-qil-a9260.c | ||
| board-rm9200ek.c | ||
| board-rsi-ews.c | ||
| board-sam9-l9260.c | ||
| board-sam9g20ek.c | ||
| board-sam9m10g45ek.c | ||
| board-sam9rlek.c | ||
| board-sam9260ek.c | ||
| board-sam9261ek.c | ||
| board-sam9263ek.c | ||
| board-snapper9260.c | ||
| board-stamp9g20.c | ||
| board-yl-9200.c | ||
| board.h | ||
| clock.c | ||
| clock.h | ||
| cpuidle.c | ||
| generic.h | ||
| gpio.c | ||
| gsia18s.h | ||
| irq.c | ||
| Kconfig | ||
| Kconfig.non_dt | ||
| leds.c | ||
| Makefile | ||
| Makefile.boot | ||
| pm_slowclock.S | ||
| pm.c | ||
| pm.h | ||
| sam9_smc.c | ||
| sam9_smc.h | ||
| sama5d3.c | ||
| setup.c | ||
| soc.h | ||
| stamp9g20.h | ||