mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +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 ... |
||
|---|---|---|
| .. | ||
| 88pm8607.c | ||
| aat2870-regulator.c | ||
| ab3100.c | ||
| ab8500-ext.c | ||
| ab8500.c | ||
| ad5398.c | ||
| anatop-regulator.c | ||
| arizona-ldo1.c | ||
| arizona-micsupp.c | ||
| as3711-regulator.c | ||
| core.c | ||
| da903x.c | ||
| da9052-regulator.c | ||
| da9055-regulator.c | ||
| db8500-prcmu.c | ||
| dbx500-prcmu.c | ||
| dbx500-prcmu.h | ||
| dummy.c | ||
| dummy.h | ||
| fan53555.c | ||
| fixed-helper.c | ||
| fixed.c | ||
| gpio-regulator.c | ||
| isl6271a-regulator.c | ||
| Kconfig | ||
| lp872x.c | ||
| lp3971.c | ||
| lp3972.c | ||
| lp8755.c | ||
| lp8788-buck.c | ||
| lp8788-ldo.c | ||
| Makefile | ||
| max1586.c | ||
| max8649.c | ||
| max8660.c | ||
| max8907-regulator.c | ||
| max8925-regulator.c | ||
| max8952.c | ||
| max8973-regulator.c | ||
| max8997.c | ||
| max8998.c | ||
| max77686.c | ||
| mc13xxx-regulator-core.c | ||
| mc13xxx.h | ||
| mc13783-regulator.c | ||
| mc13892-regulator.c | ||
| of_regulator.c | ||
| palmas-regulator.c | ||
| pcap-regulator.c | ||
| pcf50633-regulator.c | ||
| rc5t583-regulator.c | ||
| s2mps11.c | ||
| s5m8767.c | ||
| tps6105x-regulator.c | ||
| tps6507x-regulator.c | ||
| tps6524x-regulator.c | ||
| tps6586x-regulator.c | ||
| tps51632-regulator.c | ||
| tps62360-regulator.c | ||
| tps65023-regulator.c | ||
| tps65090-regulator.c | ||
| tps65217-regulator.c | ||
| tps65910-regulator.c | ||
| tps65912-regulator.c | ||
| tps80031-regulator.c | ||
| twl-regulator.c | ||
| userspace-consumer.c | ||
| vexpress.c | ||
| virtual.c | ||
| wm831x-dcdc.c | ||
| wm831x-isink.c | ||
| wm831x-ldo.c | ||
| wm8350-regulator.c | ||
| wm8400-regulator.c | ||
| wm8994-regulator.c | ||