mirror of
https://github.com/torvalds/linux
synced 2024-10-21 18:59:26 +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 | ||
| anubis.h | ||
| bast-ide.c | ||
| bast-irq.c | ||
| bast.h | ||
| clock-dclk.c | ||
| clock-s3c244x.c | ||
| clock-s3c2410.c | ||
| clock-s3c2412.c | ||
| clock-s3c2416.c | ||
| clock-s3c2440.c | ||
| clock-s3c2443.c | ||
| common-s3c2443.c | ||
| common-smdk.c | ||
| common-smdk.h | ||
| common.c | ||
| common.h | ||
| cpufreq-debugfs.c | ||
| cpufreq-s3c2410.c | ||
| cpufreq-s3c2412.c | ||
| cpufreq-s3c2440.c | ||
| cpufreq-utils.c | ||
| cpufreq.c | ||
| dma-s3c2410.c | ||
| dma-s3c2412.c | ||
| dma-s3c2440.c | ||
| dma-s3c2443.c | ||
| dma.c | ||
| gta02.h | ||
| h1940-bluetooth.c | ||
| h1940.h | ||
| iotiming-s3c2410.c | ||
| iotiming-s3c2412.c | ||
| irq-pm.c | ||
| Kconfig | ||
| mach-amlm5900.c | ||
| mach-anubis.c | ||
| mach-at2440evb.c | ||
| mach-bast.c | ||
| mach-gta02.c | ||
| mach-h1940.c | ||
| mach-jive.c | ||
| mach-mini2440.c | ||
| mach-n30.c | ||
| mach-nexcoder.c | ||
| mach-osiris-dvs.c | ||
| mach-osiris.c | ||
| mach-otom.c | ||
| mach-qt2410.c | ||
| mach-rx1950.c | ||
| mach-rx3715.c | ||
| mach-s3c2416-dt.c | ||
| mach-smdk2410.c | ||
| mach-smdk2413.c | ||
| mach-smdk2416.c | ||
| mach-smdk2440.c | ||
| mach-smdk2443.c | ||
| mach-tct_hammer.c | ||
| mach-vr1000.c | ||
| mach-vstms.c | ||
| Makefile | ||
| Makefile.boot | ||
| osiris.h | ||
| otom.h | ||
| pll-s3c2410.c | ||
| pll-s3c2440-12000000.c | ||
| pll-s3c2440-16934400.c | ||
| pm-h1940.S | ||
| pm-s3c2410.c | ||
| pm-s3c2412.c | ||
| pm-s3c2416.c | ||
| pm.c | ||
| regs-dsc.h | ||
| regs-mem.h | ||
| s3c244x.c | ||
| s3c2410.c | ||
| s3c2412-power.h | ||
| s3c2412.c | ||
| s3c2412.h | ||
| s3c2416.c | ||
| s3c2440.c | ||
| s3c2442.c | ||
| s3c2443.c | ||
| setup-i2c.c | ||
| setup-sdhci-gpio.c | ||
| setup-spi.c | ||
| setup-ts.c | ||
| simtec-audio.c | ||
| simtec-nor.c | ||
| simtec-pm.c | ||
| simtec-usb.c | ||
| simtec.h | ||
| sleep-s3c2410.S | ||
| sleep-s3c2412.S | ||
| sleep.S | ||
| vr1000.h | ||