Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

85d60490 · Linus Torvalds <[email protected]> · 2017-05-09 09:54:39 -07:00

Pull ARM Device-tree updates from Olof Johansson:
 "Device-tree continues to see lots of updates. The majority of patches
  here are smaller changes for new hardware on existing platforms, and
  there are a few larger changes worth pointing out.

  Major new platforms:

   - Gemini has been ported to DT, so a handful of "new" platforms moved
     over from board files

   - Rockchip RK3288 support for Tinkerboard and Phytec phyCORE-RK3288
     SoM and RDK

   - A bunch of embedded platforms, several Linksys platforms, Synology
     DS116,

   - Motorola Droid4 (really old OMAP-based phone) support is added.

  Some refactorings, i.e. Allwinner H3/H5 support is commonalized.

  And lots of smaller changes, cleanups, etc. See shortlog for more
  description

  We're adding ability to cross-include DT files between arm and arm64,
  by creating appropriate links in the dt-include directory, and using
  arm/ and arm64/ as include prefixes. This will avoid other local hacks
  such as per-file links between the two arch trees (this broke for
  external mirroring of DT contents). Now they can just provide their
  own appropriate dt-include hierarcy per platform"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (349 commits)
  ARM: dts: exynos: Use - instead of @ for DT OPP entries
  arm: spear6xx: add DT description of the ADC on SPEAr600
  arm: spear6xx: remove unneeded pinctrl properties in spear600-evb
  arm: spear6xx: switch spear600-evb to the new flash partition DT binding
  arm: spear6xx: fix spaces in spear600-evb.dts
  arm: spear6xx: use node labels in spear600-evb.dts
  arm: spear6xx: add labels to various nodes in spear600.dtsi
  ARM: dts: vexpress: fix few unit address format warnings
  ARM: dts: at91: sama5d3_xplained: not all ADC channels are available
  ARM: dts: at91: sama5d3_xplained: fix ADC vref
  ARM: dts: at91: add envelope detector mux to the Axentia TSE-850
  ARM: dts: armada-38x: label USB and SATA nodes
  ARM: dts: imx6q-utilite-pro: add hpd gpio
  ARM: dts: imx6qp-sabresd: Set reg_arm regulator supply
  ARM: dts: imx6qdl-sabresd: Set LDO regulator supply
  ARM: dts: imx: add Gateworks Ventana GW5903 support
  ARM: dts: i.MX25: add AIPS control registers
  ARM: dts: imx7-colibri: add Carrier Board 3.3V/5V regulators
  ARM: dts: imx7-colibri: remove 1.8V fixed regulator
  ARM: dts: imx7-colibri: allow to disable Ethernet rail
  ...

Commit: 85d604902eb28eaea4f9e0f3a655ae986fa4bd2e
Parents: 8d648aad · b9f34da7

Merge commit. Changes below are compared with the first parent: 8d648aad.

Changes

378 files changed · +13121 −2800

File	Status	Add	Del	Content
Documentation/devicetree/bindings/arm/atmel-at91.txt	modified	+2	−1	View file
Documentation/devicetree/bindings/arm/gemini.txt	added	+86	−0	View file
Documentation/devicetree/bindings/arm/i2se.txt	added	+22	−0	View file
Documentation/devicetree/bindings/arm/rockchip.txt	modified	+7	−0	View file
Documentation/devicetree/bindings/arm/shmobile.txt	modified	+4	−0	View file
Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt	modified	+7	−1	View file
Documentation/devicetree/bindings/clock/mvebu-core-clock.txt	modified	+7	−0	View file
Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt	modified	+11	−0	View file
Documentation/devicetree/bindings/devfreq/exynos-bus.txt	modified	+23	−23	View file
Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt	modified	+8	−0	View file
Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt	modified	+24	−1	View file
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/net/marvell,prestera.txt	modified	+5	−8	View file
Documentation/devicetree/bindings/usb/dwc2.txt	modified	+4	−0	View file
Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt	added	+17	−0	View file
arch/arm/boot/dts/Makefile	modified	+52	−21	View file
arch/arm/boot/dts/alpine.dtsi	modified	+10	−10	View file
arch/arm/boot/dts/am335x-baltos-ir2110.dts	modified	+1	−0	View file
arch/arm/boot/dts/am335x-baltos-ir3220.dts	modified	+1	−0	View file
arch/arm/boot/dts/am335x-baltos-ir5221.dts	modified	+1	−0	View file
arch/arm/boot/dts/am335x-baltos-leds.dtsi	added	+50	−0	View file
arch/arm/boot/dts/am335x-boneblack.dts	modified	+11	−0	View file
arch/arm/boot/dts/am335x-icev2.dts	modified	+154	−0	View file
arch/arm/boot/dts/am33xx.dtsi	modified	+74	−13	View file
arch/arm/boot/dts/am3517.dtsi	modified	+12	−0	View file
arch/arm/boot/dts/am4372.dtsi	modified	+3	−4	View file
arch/arm/boot/dts/am437x-gp-evm.dts	modified	+15	−0	View file
arch/arm/boot/dts/am57xx-idk-common.dtsi	modified	+24	−0	View file
arch/arm/boot/dts/armada-385-linksys-shelby.dts	added	+114	−0	View file
arch/arm/boot/dts/armada-385-linksys.dtsi	modified	+17	−1	View file
arch/arm/boot/dts/armada-385-synology-ds116.dts	added	+321	−0	View file
arch/arm/boot/dts/armada-385.dtsi	modified	+9	−11	View file
arch/arm/boot/dts/armada-388-clearfog.dts	modified	+19	−19	View file
arch/arm/boot/dts/armada-388.dtsi	modified	+4	−5	View file
arch/arm/boot/dts/armada-38x.dtsi	modified	+25	−24	View file
arch/arm/boot/dts/armada-xp-98dx3236.dtsi	modified	+157	−54	View file
arch/arm/boot/dts/armada-xp-98dx3336.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/armada-xp-98dx4251.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/armada-xp-db-dxbc2.dts	modified	+1	−1	View file
arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts	modified	+1	−1	View file
arch/arm/boot/dts/armada-xp-linksys-mamba.dts	modified	+17	−1	View file
arch/arm/boot/dts/aspeed-ast2500-evb.dts	modified	+22	−0	View file
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts	modified	+18	−0	View file
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts	modified	+36	−0	View file
arch/arm/boot/dts/aspeed-g4.dtsi	modified	+78	−31	View file
arch/arm/boot/dts/aspeed-g5.dtsi	modified	+117	−39	View file
arch/arm/boot/dts/at91-sama5d2_xplained.dts	modified	+1	−0	View file
arch/arm/boot/dts/at91-sama5d3_xplained.dts	modified	+2	−3	View file
arch/arm/boot/dts/at91-tse850-3.dts	modified	+28	−1	View file
arch/arm/boot/dts/at91sam9261.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/at91sam9x5ek.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/axp209.dtsi	modified	+5	−0	View file
arch/arm/boot/dts/axp22x.dtsi	modified	+5	−0	View file
arch/arm/boot/dts/bcm-cygnus.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/bcm-nsp.dtsi	modified	+33	−3	View file
arch/arm/boot/dts/bcm2835-rpi.dtsi	modified	+14	−0	View file
arch/arm/boot/dts/bcm283x.dtsi	modified	+57	−3	View file
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts	modified	+11	−6	View file
arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts	modified	+11	−3	View file
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts	modified	+0	−5	View file
arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts	added	+41	−0	View file
arch/arm/boot/dts/bcm4708-netgear-r6250.dts	modified	+0	−3	View file
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts	modified	+11	−4	View file
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts	modified	+0	−10	View file
arch/arm/boot/dts/bcm4708.dtsi	modified	+8	−0	View file
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts	modified	+11	−3	View file
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts	modified	+11	−5	View file
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts	modified	+11	−1	View file
arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts	added	+98	−0	View file
arch/arm/boot/dts/bcm47081.dtsi	modified	+19	−1	View file
arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts	modified	+11	−3	View file
arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts	modified	+0	−8	View file
arch/arm/boot/dts/bcm4709-linksys-ea9200.dts	added	+42	−0	View file
arch/arm/boot/dts/bcm4709-netgear-r7000.dts	modified	+11	−8	View file
arch/arm/boot/dts/bcm4709-netgear-r8000.dts	modified	+30	−11	View file
arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts	modified	+0	−8	View file
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts	modified	+11	−7	View file
arch/arm/boot/dts/bcm47094-linksys-panamera.dts	added	+36	−0	View file
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts	modified	+0	−8	View file
arch/arm/boot/dts/bcm47094-netgear-r8500.dts	modified	+0	−6	View file
arch/arm/boot/dts/bcm47189-tenda-ac9.dts	modified	+36	−3	View file
arch/arm/boot/dts/bcm5301x.dtsi	modified	+58	−21	View file
arch/arm/boot/dts/bcm53573.dtsi	modified	+9	−1	View file
arch/arm/boot/dts/bcm94708.dts	modified	+0	−8	View file
arch/arm/boot/dts/bcm94709.dts	modified	+0	−8	View file
arch/arm/boot/dts/bcm953012er.dts	modified	+0	−8	View file
arch/arm/boot/dts/bcm953012hr.dts	added	+97	−0	View file
arch/arm/boot/dts/bcm953012k.dts	modified	+58	−4	View file
arch/arm/boot/dts/bcm958522er.dts	modified	+9	−1	View file
arch/arm/boot/dts/bcm958525er.dts	modified	+9	−1	View file
arch/arm/boot/dts/bcm958525xmc.dts	modified	+10	−0	View file
arch/arm/boot/dts/bcm958622hr.dts	modified	+9	−1	View file
arch/arm/boot/dts/bcm958623hr.dts	modified	+9	−1	View file
arch/arm/boot/dts/bcm958625hr.dts	modified	+8	−0	View file
arch/arm/boot/dts/bcm958625k.dts	modified	+8	−0	View file
arch/arm/boot/dts/bcm988312hr.dts	modified	+9	−1	View file
arch/arm/boot/dts/da850-evm.dts	modified	+21	−10	View file
arch/arm/boot/dts/da850-lego-ev3.dts	modified	+52	−7	View file
arch/arm/boot/dts/da850.dtsi	modified	+28	−3	View file
arch/arm/boot/dts/dm8168-evm.dts	modified	+10	−0	View file
arch/arm/boot/dts/dm816x.dtsi	modified	+7	−0	View file
arch/arm/boot/dts/dra7.dtsi	modified	+36	−5	View file
arch/arm/boot/dts/dra74x.dtsi	modified	+5	−0	View file
arch/arm/boot/dts/exynos3250-rinato.dts	modified	+2	−0	View file
arch/arm/boot/dts/exynos3250.dtsi	modified	+23	−23	View file
arch/arm/boot/dts/exynos4.dtsi	modified	+0	−9	View file
arch/arm/boot/dts/exynos4210-origen.dts	modified	+0	−4	View file
arch/arm/boot/dts/exynos4210-trats.dts	modified	+2	−0	View file
arch/arm/boot/dts/exynos4210.dtsi	modified	+24	−16	View file
arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi	modified	+0	−4	View file
arch/arm/boot/dts/exynos4412-odroid-common.dtsi	modified	+0	−4	View file
arch/arm/boot/dts/exynos4412-origen.dts	modified	+0	−4	View file
arch/arm/boot/dts/exynos4412-prime.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/exynos4412-trats2.dts	modified	+2	−0	View file
arch/arm/boot/dts/exynos4412.dtsi	modified	+42	−33	View file
arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi	added	+25	−0	View file
arch/arm/boot/dts/exynos5420.dtsi	modified	+25	−25	View file
arch/arm/boot/dts/exynos5440.dtsi	modified	+21	−11	View file
arch/arm/boot/dts/exynos5800.dtsi	modified	+28	−28	View file
arch/arm/boot/dts/gemini-nas4220b.dts	added	+102	−0	View file
arch/arm/boot/dts/gemini-rut1xx.dts	added	+65	−0	View file
arch/arm/boot/dts/gemini-sq201.dts	added	+118	−0	View file
arch/arm/boot/dts/gemini-wbd111.dts	added	+102	−0	View file
arch/arm/boot/dts/gemini-wbd222.dts	added	+102	−0	View file
arch/arm/boot/dts/gemini.dtsi	added	+156	−0	View file
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts	modified	+0	−2	View file
arch/arm/boot/dts/imx25-pdk.dts	modified	+0	−2	View file
arch/arm/boot/dts/imx25-pinfunc.h	modified	+2	−3	View file
arch/arm/boot/dts/imx25.dtsi	modified	+12	−0	View file
arch/arm/boot/dts/imx28-duckbill-2-485.dts	added	+189	−0	View file
arch/arm/boot/dts/imx28-duckbill-2-enocean.dts	added	+220	−0	View file
arch/arm/boot/dts/imx28-duckbill-2-spi.dts	added	+199	−0	View file
arch/arm/boot/dts/imx28-duckbill-2.dts	added	+183	−0	View file
arch/arm/boot/dts/imx28-duckbill.dts	modified	+56	−25	View file
arch/arm/boot/dts/imx28-m28cu3.dts	modified	+1	−1	View file
arch/arm/boot/dts/imx28.dtsi	modified	+27	−1	View file
arch/arm/boot/dts/imx50.dtsi	modified	+4	−4	View file
arch/arm/boot/dts/imx53-qsb.dts	modified	+2	−2	View file
arch/arm/boot/dts/imx53-qsrb.dts	modified	+2	−2	View file
arch/arm/boot/dts/imx6dl-gw5903.dts	added	+55	−0	View file
arch/arm/boot/dts/imx6dl-gw5904.dts	added	+55	−0	View file
arch/arm/boot/dts/imx6q-b450v3.dts	modified	+7	−0	View file
arch/arm/boot/dts/imx6q-b650v3.dts	modified	+7	−0	View file
arch/arm/boot/dts/imx6q-b850v3.dts	modified	+70	−0	View file
arch/arm/boot/dts/imx6q-bx50v3.dtsi	modified	+1	−15	View file
arch/arm/boot/dts/imx6q-cm-fx6.dts	modified	+83	−0	View file
arch/arm/boot/dts/imx6q-gw5903.dts	added	+55	−0	View file
arch/arm/boot/dts/imx6q-gw5904.dts	added	+59	−0	View file
arch/arm/boot/dts/imx6q-icore-ofcap10.dts	added	+76	−0	View file
arch/arm/boot/dts/imx6q-icore-ofcap12.dts	added	+76	−0	View file
arch/arm/boot/dts/imx6q-icore.dts	modified	+34	−0	View file
arch/arm/boot/dts/imx6q-utilite-pro.dts	modified	+9	−1	View file
arch/arm/boot/dts/imx6q-zii-rdu2.dts	added	+50	−0	View file
arch/arm/boot/dts/imx6qdl-gw5903.dtsi	added	+654	−0	View file
arch/arm/boot/dts/imx6qdl-gw5904.dtsi	added	+641	−0	View file
arch/arm/boot/dts/imx6qdl-icore.dtsi	modified	+19	−0	View file
arch/arm/boot/dts/imx6qdl-sabresd.dtsi	modified	+12	−0	View file
arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi	added	+932	−0	View file
arch/arm/boot/dts/imx6qdl.dtsi	modified	+2	−1	View file
arch/arm/boot/dts/imx6qp-nitrogen6_som2.dts	added	+55	−0	View file
arch/arm/boot/dts/imx6qp-sabresd.dts	modified	+2	−2	View file
arch/arm/boot/dts/imx6qp-zii-rdu2.dts	added	+50	−0	View file
arch/arm/boot/dts/imx6qp.dtsi	modified	+68	−31	View file
arch/arm/boot/dts/imx6sx.dtsi	modified	+14	−7	View file
arch/arm/boot/dts/imx6ul-14x14-evk.dts	modified	+0	−5	View file
arch/arm/boot/dts/imx6ul-geam.dtsi	modified	+45	−0	View file
arch/arm/boot/dts/imx6ul-isiot-common.dtsi	added	+141	−0	View file
arch/arm/boot/dts/imx6ul-isiot-emmc.dts	modified	+1	−0	View file
arch/arm/boot/dts/imx6ul-isiot-nand.dts	modified	+1	−0	View file
arch/arm/boot/dts/imx6ul-isiot.dtsi	modified	+73	−0	View file
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi	modified	+31	−24	View file
arch/arm/boot/dts/imx7-colibri.dtsi	modified	+19	−26	View file
arch/arm/boot/dts/imx7d-colibri-eval-v3.dts	modified	+1	−0	View file
arch/arm/boot/dts/imx7d-sdb-sht11.dts	added	+74	−0	View file
arch/arm/boot/dts/imx7s.dtsi	modified	+3	−4	View file
arch/arm/boot/dts/include/arm	added	+1	−0	View file
arch/arm/boot/dts/include/arm64	added	+1	−0	View file
arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi	added	+243	−0	View file
arch/arm/boot/dts/moxart-uc7112lx.dts	modified	+1	−1	View file
arch/arm/boot/dts/moxart.dtsi	modified	+11	−10	View file
arch/arm/boot/dts/omap3-cpu-thermal.dtsi	added	+20	−0	View file
arch/arm/boot/dts/omap3-igep.dtsi	modified	+52	−0	View file
arch/arm/boot/dts/omap3-n900.dts	modified	+21	−2	View file
arch/arm/boot/dts/omap3-n950-n9.dtsi	modified	+32	−0	View file
arch/arm/boot/dts/omap34xx.dtsi	modified	+6	−2	View file
arch/arm/boot/dts/omap36xx.dtsi	modified	+6	−2	View file
arch/arm/boot/dts/omap4-droid4-xt894.dts	modified	+352	−23	View file
arch/arm/boot/dts/omap443x.dtsi	modified	+4	−0	View file
arch/arm/boot/dts/omap4460.dtsi	modified	+4	−0	View file
arch/arm/boot/dts/omap5.dtsi	modified	+9	−0	View file
arch/arm/boot/dts/qcom-apq8060-dragonboard.dts	modified	+3	−3	View file
arch/arm/boot/dts/qcom-msm8660.dtsi	modified	+30	−0	View file
arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts	modified	+0	−8	View file
arch/arm/boot/dts/qcom-msm8974.dtsi	modified	+274	−32	View file
arch/arm/boot/dts/r7s72100-genmai.dts	modified	+8	−0	View file
arch/arm/boot/dts/r7s72100-rskrza1.dts	modified	+8	−0	View file
arch/arm/boot/dts/r7s72100.dtsi	modified	+59	−6	View file
arch/arm/boot/dts/r8a73a4.dtsi	modified	+11	−8	View file
arch/arm/boot/dts/r8a7743.dtsi	modified	+26	−3	View file
arch/arm/boot/dts/r8a7745.dtsi	modified	+26	−3	View file
arch/arm/boot/dts/r8a7778-bockw.dts	modified	+0	−1	View file
arch/arm/boot/dts/r8a7779-marzen.dts	modified	+0	−1	View file
arch/arm/boot/dts/r8a7790-lager.dts	modified	+0	−1	View file
arch/arm/boot/dts/r8a7790.dtsi	modified	+16	−12	View file
arch/arm/boot/dts/r8a7791-koelsch.dts	modified	+1	−3	View file
arch/arm/boot/dts/r8a7791-porter.dts	modified	+2	−3	View file
arch/arm/boot/dts/r8a7791.dtsi	modified	+15	−10	View file
arch/arm/boot/dts/r8a7792.dtsi	modified	+18	−7	View file
arch/arm/boot/dts/r8a7793-gose.dts	modified	+0	−1	View file
arch/arm/boot/dts/r8a7793.dtsi	modified	+16	−9	View file
arch/arm/boot/dts/r8a7794-alt.dts	modified	+1	−2	View file
arch/arm/boot/dts/r8a7794-silk.dts	modified	+1	−2	View file
arch/arm/boot/dts/r8a7794.dtsi	modified	+21	−9	View file
arch/arm/boot/dts/rk3036.dtsi	modified	+6	−0	View file
arch/arm/boot/dts/rk3188.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/rk322x.dtsi	modified	+2	−0	View file
arch/arm/boot/dts/rk3288-miqi.dts	modified	+2	−10	View file
arch/arm/boot/dts/rk3288-phycore-rdk.dts	added	+298	−0	View file
arch/arm/boot/dts/rk3288-phycore-som.dtsi	added	+497	−0	View file
arch/arm/boot/dts/rk3288-rock2-som.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/rk3288-rock2-square.dts	modified	+62	−0	View file
arch/arm/boot/dts/rk3288-tinker.dts	added	+536	−0	View file
arch/arm/boot/dts/rk3288.dtsi	modified	+8	−0	View file
arch/arm/boot/dts/rk3xxx.dtsi	modified	+14	−2	View file
arch/arm/boot/dts/s3c64xx.dtsi	modified	+1	−2	View file
arch/arm/boot/dts/s5pv210.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/sama5d2.dtsi	modified	+5	−0	View file
arch/arm/boot/dts/socfpga.dtsi	modified	+32	−24	View file
arch/arm/boot/dts/socfpga_arria10.dtsi	modified	+25	−26	View file
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi	modified	+6	−1	View file
arch/arm/boot/dts/socfpga_arria5_socdk.dts	modified	+1	−1	View file
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts	modified	+1	−1	View file
arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts	modified	+0	−1	View file
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts	modified	+1	−1	View file
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts	modified	+1	−1	View file
arch/arm/boot/dts/socfpga_cyclone5_socrates.dts	modified	+4	−4	View file
arch/arm/boot/dts/socfpga_cyclone5_sodia.dts	modified	+22	−1	View file
arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts	modified	+1	−1	View file
arch/arm/boot/dts/socfpga_vt.dts	modified	+1	−1	View file
arch/arm/boot/dts/spear600-evb.dts	modified	+72	−76	View file
arch/arm/boot/dts/spear600.dtsi	modified	+18	−10	View file
arch/arm/boot/dts/stih407-family.dtsi	modified	+16	−2	View file
arch/arm/boot/dts/stm32429i-eval.dts	modified	+28	−0	View file
arch/arm/boot/dts/stm32746g-eval.dts	modified	+4	−0	View file
arch/arm/boot/dts/stm32f429-disco.dts	modified	+16	−0	View file
arch/arm/boot/dts/stm32f429.dtsi	modified	+37	−0	View file
arch/arm/boot/dts/stm32f469-disco.dts	modified	+16	−0	View file
arch/arm/boot/dts/stm32f746.dtsi	modified	+69	−27	View file
arch/arm/boot/dts/stm32h743-pinctrl.dtsi	added	+156	−0	View file
arch/arm/boot/dts/stm32h743.dtsi	added	+83	−0	View file
arch/arm/boot/dts/stm32h743i-eval.dts	added	+74	−0	View file
arch/arm/boot/dts/sun4i-a10-a1000.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-cubieboard.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-hackberry.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-inet1.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-marsboard.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-mk802.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-pcduino.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun4i-a10.dtsi	modified	+26	−14	View file
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts	modified	+2	−3	View file
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts	modified	+1	−2	View file
arch/arm/boot/dts/sun5i-a10s.dtsi	modified	+3	−74	View file
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun5i-a13-olinuxino.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun5i-a13.dtsi	modified	+0	−140	View file
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts	modified	+2	−2	View file
arch/arm/boot/dts/sun5i-gr8-evb.dts	modified	+2	−2	View file
arch/arm/boot/dts/sun5i-gr8.dtsi	modified	+29	−589	View file
arch/arm/boot/dts/sun5i-r8-chip.dts	modified	+5	−1	View file
arch/arm/boot/dts/sun5i-r8.dtsi	modified	+0	−40	View file
arch/arm/boot/dts/sun5i.dtsi	modified	+282	−2	View file
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-a31-colombus.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-a31-hummingbird.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-a31-i7.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-a31-m9.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-a31.dtsi	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-a31s-cs908.dts	modified	+0	−2	View file
arch/arm/boot/dts/sun6i-a31s-primo81.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-a31s-sina31s.dts	modified	+23	−0	View file
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts	modified	+57	−0	View file
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-bananapi.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-cubietruck.dts	modified	+8	−1	View file
arch/arm/boot/dts/sun7i-a20-hummingbird.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-m3.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-mk808c.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts	modified	+31	−5	View file
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-orangepi.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20-pcduino3.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun7i-a20.dtsi	modified	+30	−16	View file
arch/arm/boot/dts/sun8i-a23-a33.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/sun8i-a23-evb.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun8i-a23-q8-tablet.dts	modified	+0	−10	View file
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts	modified	+22	−1	View file
arch/arm/boot/dts/sun8i-a33.dtsi	modified	+155	−0	View file
arch/arm/boot/dts/sun8i-a83t.dtsi	modified	+0	−2	View file
arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts	modified	+19	−2	View file
arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts	modified	+10	−1	View file
arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts	added	+96	−0	View file
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi	modified	+0	−1	View file
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts	modified	+21	−2	View file
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun8i-h3.dtsi	modified	+40	−562	View file
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun9i-a80-optimus.dts	modified	+0	−1	View file
arch/arm/boot/dts/sun9i-a80.dtsi	modified	+0	−2	View file
arch/arm/boot/dts/sunxi-common-regulators.dtsi	modified	+0	−1	View file
arch/arm/boot/dts/sunxi-h3-h5.dtsi	added	+618	−0	View file
arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi	modified	+0	−1	View file
arch/arm/boot/dts/uniphier-ld4-ref.dts	modified	+5	−5	View file
arch/arm/boot/dts/uniphier-ld4.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/uniphier-ld6b-ref.dts	modified	+5	−5	View file
arch/arm/boot/dts/uniphier-pinctrl.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/uniphier-pro4-ace.dts	modified	+6	−5	View file
arch/arm/boot/dts/uniphier-pro4-ref.dts	modified	+5	−5	View file
arch/arm/boot/dts/uniphier-pro4-sanji.dts	modified	+6	−5	View file
arch/arm/boot/dts/uniphier-pro4.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/uniphier-pro5.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/uniphier-pxs2-gentil.dts	modified	+6	−5	View file
arch/arm/boot/dts/uniphier-pxs2-vodka.dts	modified	+5	−5	View file
arch/arm/boot/dts/uniphier-pxs2.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/uniphier-ref-daughter.dtsi	modified	+3	−1	View file
arch/arm/boot/dts/uniphier-sld3-ref.dts	modified	+6	−6	View file
arch/arm/boot/dts/uniphier-sld3.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/uniphier-sld8-ref.dts	modified	+5	−5	View file
arch/arm/boot/dts/uniphier-sld8.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/uniphier-support-card.dtsi	modified	+3	−2	View file
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi	modified	+12	−12	View file
arch/arm/boot/dts/vexpress-v2m.dtsi	modified	+12	−12	View file
arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts	modified	+1	−1	View file
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts	modified	+9	−9	View file
arch/arm/boot/dts/vexpress-v2p-ca5s.dts	modified	+1	−1	View file
arch/arm/boot/dts/vexpress-v2p-ca9.dts	modified	+1	−1	View file
arch/arm/boot/dts/vf610-zii-dev-rev-b.dts	modified	+1	−13	View file
arch/arm/boot/dts/vf610-zii-dev-rev-c.dts	modified	+77	−0	View file
arch/arm/boot/dts/vf610-zii-dev.dtsi	modified	+12	−0	View file
arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi	modified	+41	−2	View file
arch/arm64/boot/dts/exynos/exynos5433-tm2.dts	modified	+17	−0	View file
arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts	modified	+18	−0	View file
arch/arm64/boot/dts/include/arm	added	+1	−0	View file
arch/arm64/boot/dts/include/arm64	added	+1	−0	View file
include/dt-bindings/clock/r7s72100-clock.h	modified	+7	−2	View file
include/dt-bindings/clock/r8a73a4-clock.h	modified	+1	−0	View file
include/dt-bindings/clock/r8a7790-clock.h	modified	+1	−0	View file
include/dt-bindings/clock/r8a7791-clock.h	modified	+1	−0	View file
include/dt-bindings/clock/r8a7792-clock.h	modified	+1	−1	View file
include/dt-bindings/clock/r8a7793-clock.h	modified	+3	−2	View file
include/dt-bindings/clock/r8a7794-clock.h	modified	+2	−0	View file
include/dt-bindings/mfd/stm32f7-rcc.h	added	+112	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/arm/atmel-at91.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt
index 29737b9..799af90 100644
--- a/Documentation/devicetree/bindings/arm/atmel-at91.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt
@@ -217,7 +217,8 @@ memory, bridge implementations, processor and other functionality not controlled
 elsewhere.
 
 required properties:
-- compatible: Should be "atmel,<chip>-sfr", "syscon".
+- compatible: Should be "atmel,<chip>-sfr", "syscon" or
+	"atmel,<chip>-sfrbu", "syscon"
   <chip> can be "sama5d3", "sama5d4" or "sama5d2".
 - reg: Should contain registers location and length
 

Documentation/devicetree/bindings/arm/gemini.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/gemini.txt b/Documentation/devicetree/bindings/arm/gemini.txt
new file mode 100644
index 0000000..0041eb0
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/gemini.txt
@@ -0,0 +1,86 @@
+Cortina systems Gemini platforms
+
+The Gemini SoC is the project name for an ARMv4 FA525-based SoC originally
+produced by Storlink Semiconductor around 2005. The company was renamed
+later renamed Storm Semiconductor. The chip product name is Storlink SL3516.
+It was derived from earlier products from Storm named SL3316 (Centroid) and
+SL3512 (Bulverde).
+
+Storm Semiconductor was acquired by Cortina Systems in 2008 and the SoC was
+produced and used for NAS and similar usecases. In 2014 Cortina Systems was
+in turn acquired by Inphi, who seem to have discontinued this product family.
+
+Many of the IP blocks used in the SoC comes from Faraday Technology.
+
+Required properties (in root node):
+	compatible = "cortina,gemini";
+
+Required nodes:
+
+- soc: the SoC should be represented by a simple bus encompassing all the
+  onchip devices, this is referred to as the soc bus node.
+
+- syscon: the soc bus node must have a system controller node pointing to the
+  global control registers, with the compatible string
+  "cortina,gemini-syscon", "syscon";
+
+- timer: the soc bus node must have a timer node pointing to the SoC timer
+  block, with the compatible string "cortina,gemini-timer"
+  See: clocksource/cortina,gemini-timer.txt
+
+- interrupt-controller: the sob bus node must have an interrupt controller
+  node pointing to the SoC interrupt controller block, with the compatible
+  string "cortina,gemini-interrupt-controller"
+  See interrupt-controller/cortina,gemini-interrupt-controller.txt
+
+Example:
+
+/ {
+	model = "Foo Gemini Machine";
+	compatible = "cortina,gemini";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x8000000>;
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+		compatible = "simple-bus";
+		interrupt-parent = <&intcon>;
+
+		syscon: syscon@40000000 {
+			compatible = "cortina,gemini-syscon", "syscon";
+			reg = <0x40000000 0x1000>;
+		};
+
+		uart0: serial@42000000 {
+			compatible = "ns16550a";
+			reg = <0x42000000 0x100>;
+			clock-frequency = <48000000>;
+			interrupts = <18 IRQ_TYPE_LEVEL_HIGH>;
+			reg-shift = <2>;
+		};
+
+		timer@43000000 {
+			compatible = "cortina,gemini-timer";
+			reg = <0x43000000 0x1000>;
+			interrupt-parent = <&intcon>;
+			interrupts = <14 IRQ_TYPE_EDGE_FALLING>, /* Timer 1 */
+				     <15 IRQ_TYPE_EDGE_FALLING>, /* Timer 2 */
+				     <16 IRQ_TYPE_EDGE_FALLING>; /* Timer 3 */
+			syscon = <&syscon>;
+		};
+
+		intcon: interrupt-controller@48000000 {
+			compatible = "cortina,gemini-interrupt-controller";
+			reg = <0x48000000 0x1000>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+		};
+	};
+};

Documentation/devicetree/bindings/arm/i2se.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/i2se.txt b/Documentation/devicetree/bindings/arm/i2se.txt
new file mode 100644
index 0000000..dbd54a3
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/i2se.txt
@@ -0,0 +1,22 @@
+I2SE Device Tree Bindings
+-------------------------
+
+Duckbill Board
+Required root node properties:
+    - compatible = "i2se,duckbill", "fsl,imx28";
+
+Duckbill 2 Board
+Required root node properties:
+    - compatible = "i2se,duckbill-2", "fsl,imx28";
+
+Duckbill 2 485 Board
+Required root node properties:
+    - compatible = "i2se,duckbill-2-485", "i2se,duckbill-2", "fsl,imx28";
+
+Duckbill 2 EnOcean Board
+Required root node properties:
+    - compatible = "i2se,duckbill-2-enocean", "i2se,duckbill-2", "fsl,imx28";
+
+Duckbill 2 SPI Board
+Required root node properties:
+    - compatible = "i2se,duckbill-2-spi", "i2se,duckbill-2", "fsl,imx28";

Documentation/devicetree/bindings/arm/rockchip.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index cc4ace6..6b8d50a 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -1,5 +1,8 @@
 Rockchip platforms device tree bindings
 ---------------------------------------
+- Asus Tinker board
+    Required root node properties:
+      - compatible = "asus,rk3288-tinker", "rockchip,rk3288";
 
 - Kylin RK3036 board:
     Required root node properties:
@@ -103,6 +106,10 @@ Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "mqmaker,miqi", "rockchip,rk3288";
 
+- Phytec phyCORE-RK3288: Rapid Development Kit
+    Required root node properties:
+     - compatible = "phytec,rk3288-pcm-947", "phytec,rk3288-phycore-som", "rockchip,rk3288";
+
 - Rockchip PX3 Evaluation board:
     Required root node properties:
       - compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";

Documentation/devicetree/bindings/arm/shmobile.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index c950263..170fe05 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -13,8 +13,12 @@ SoCs:
     compatible = "renesas,r8a73a4"
   - R-Mobile A1 (R8A77400)
     compatible = "renesas,r8a7740"
+  - RZ/G1H (R8A77420)
+    compatible = "renesas,r8a7742"
   - RZ/G1M (R8A77430)
     compatible = "renesas,r8a7743"
+  - RZ/G1N (R8A77440)
+    compatible = "renesas,r8a7744"
   - RZ/G1E (R8A77450)
     compatible = "renesas,r8a7745"
   - R-Car M1A (R8A77781)

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt
index ccf0add..a855c1b 100644
--- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt
@@ -1,7 +1,13 @@
 NVIDIA Tegra Flow Controller
 
 Required properties:
-- compatible: Should be "nvidia,tegra<chip>-flowctrl"
+- compatible: Should contain one of the following:
+  - "nvidia,tegra20-flowctrl": for Tegra20
+  - "nvidia,tegra30-flowctrl": for Tegra30
+  - "nvidia,tegra114-flowctrl": for Tegra114
+  - "nvidia,tegra124-flowctrl": for Tegra124
+  - "nvidia,tegra132-flowctrl", "nvidia,tegra124-flowctrl": for Tegra132
+  - "nvidia,tegra210-flowctrl": for Tegra210
 - reg: Should contain one register range (address and length)
 
 Example:

Documentation/devicetree/bindings/clock/mvebu-core-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
index eb985a6..796c260 100644
--- a/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
+++ b/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
@@ -31,6 +31,12 @@ The following is a list of provided IDs and clock names on Armada 39x:
  4 = dclk    (SDRAM Interface Clock)
  5 = refclk  (Reference Clock)
 
+The following is a list of provided IDs and clock names on 98dx3236:
+ 0 = tclk    (Internal Bus clock)
+ 1 = cpuclk  (CPU clock)
+ 2 = ddrclk   (DDR clock)
+ 3 = mpll    (MPLL Clock)
+
 The following is a list of provided IDs and clock names on Kirkwood and Dove:
  0 = tclk   (Internal Bus clock)
  1 = cpuclk (CPU0 clock)
@@ -49,6 +55,7 @@ Required properties:
 	"marvell,armada-380-core-clock" - For Armada 380/385 SoC core clocks
 	"marvell,armada-390-core-clock" - For Armada 39x SoC core clocks
 	"marvell,armada-xp-core-clock" - For Armada XP SoC core clocks
+	"marvell,mv98dx3236-core-clock" - For 98dx3236 family SoC core clocks
 	"marvell,dove-core-clock" - for Dove SoC core clocks
 	"marvell,kirkwood-core-clock" - for Kirkwood SoC (except mv88f6180)
 	"marvell,mv88f6180-core-clock" - for Kirkwood MV88f6180 SoC

Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt
index 5142efc..de562da 100644
--- a/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt
+++ b/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt
@@ -119,6 +119,16 @@ ID	Clock	Peripheral
 29	sata1lnk
 30	sata1	SATA Host 1
 
+The following is a list of provided IDs for 98dx3236:
+ID	Clock	Peripheral
+-----------------------------------
+3	ge1	Gigabit Ethernet 1
+4	ge0	Gigabit Ethernet 0
+5	pex0	PCIe Cntrl 0
+17	sdio	SDHCI Host
+18	usb0	USB Host 0
+22	xor0	XOR DMA 0
+
 The following is a list of provided IDs for Dove:
 ID	Clock	Peripheral
 -----------------------------------
@@ -169,6 +179,7 @@ Required properties:
 	"marvell,armada-380-gating-clock" - for Armada 380/385 SoC clock gating
 	"marvell,armada-390-gating-clock" - for Armada 39x SoC clock gating
 	"marvell,armada-xp-gating-clock" - for Armada XP SoC clock gating
+	"marvell,mv98dx3236-gating-clock" - for 98dx3236 SoC clock gating
 	"marvell,dove-gating-clock" - for Dove SoC clock gating
 	"marvell,kirkwood-gating-clock" - for Kirkwood SoC clock gating
 - reg : shall be the register address of the Clock Gating Control register

Documentation/devicetree/bindings/devfreq/exynos-bus.txt

View file

diff --git a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
index d085ef9..f8e9464 100644
--- a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
+++ b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
@@ -202,23 +202,23 @@ Example2 :
 		compatible = "operating-points-v2";
 		opp-shared;
 
-		opp@50000000 {
+		opp-50000000 {
 			opp-hz = /bits/ 64 <50000000>;
 			opp-microvolt = <800000>;
 		};
-		opp@100000000 {
+		opp-100000000 {
 			opp-hz = /bits/ 64 <100000000>;
 			opp-microvolt = <800000>;
 		};
-		opp@134000000 {
+		opp-134000000 {
 			opp-hz = /bits/ 64 <134000000>;
 			opp-microvolt = <800000>;
 		};
-		opp@200000000 {
+		opp-200000000 {
 			opp-hz = /bits/ 64 <200000000>;
 			opp-microvolt = <825000>;
 		};
-		opp@400000000 {
+		opp-400000000 {
 			opp-hz = /bits/ 64 <400000000>;
 			opp-microvolt = <875000>;
 		};
@@ -292,23 +292,23 @@ Example2 :
 		compatible = "operating-points-v2";
 		opp-shared;
 
-		opp@50000000 {
+		opp-50000000 {
 			opp-hz = /bits/ 64 <50000000>;
 			opp-microvolt = <900000>;
 		};
-		opp@80000000 {
+		opp-80000000 {
 			opp-hz = /bits/ 64 <80000000>;
 			opp-microvolt = <900000>;
 		};
-		opp@100000000 {
+		opp-100000000 {
 			opp-hz = /bits/ 64 <100000000>;
 			opp-microvolt = <1000000>;
 		};
-		opp@134000000 {
+		opp-134000000 {
 			opp-hz = /bits/ 64 <134000000>;
 			opp-microvolt = <1000000>;
 		};
-		opp@200000000 {
+		opp-200000000 {
 			opp-hz = /bits/ 64 <200000000>;
 			opp-microvolt = <1000000>;
 		};
@@ -318,19 +318,19 @@ Example2 :
 		compatible = "operating-points-v2";
 		opp-shared;
 
-		opp@50000000 {
+		opp-50000000 {
 			opp-hz = /bits/ 64 <50000000>;
 		};
-		opp@80000000 {
+		opp-80000000 {
 			opp-hz = /bits/ 64 <80000000>;
 		};
-		opp@100000000 {
+		opp-100000000 {
 			opp-hz = /bits/ 64 <100000000>;
 		};
-		opp@200000000 {
+		opp-200000000 {
 			opp-hz = /bits/ 64 <200000000>;
 		};
-		opp@400000000 {
+		opp-400000000 {
 			opp-hz = /bits/ 64 <400000000>;
 		};
 	};
@@ -339,19 +339,19 @@ Example2 :
 		compatible = "operating-points-v2";
 		opp-shared;
 
-		opp@50000000 {
+		opp-50000000 {
 			opp-hz = /bits/ 64 <50000000>;
 		};
-		opp@80000000 {
+		opp-80000000 {
 			opp-hz = /bits/ 64 <80000000>;
 		};
-		opp@100000000 {
+		opp-100000000 {
 			opp-hz = /bits/ 64 <100000000>;
 		};
-		opp@200000000 {
+		opp-200000000 {
 			opp-hz = /bits/ 64 <200000000>;
 		};
-		opp@300000000 {
+		opp-300000000 {
 			opp-hz = /bits/ 64 <300000000>;
 		};
 	};
@@ -360,13 +360,13 @@ Example2 :
 		compatible = "operating-points-v2";
 		opp-shared;
 
-		opp@50000000 {
+		opp-50000000 {
 			opp-hz = /bits/ 64 <50000000>;
 		};
-		opp@80000000 {
+		opp-80000000 {
 			opp-hz = /bits/ 64 <80000000>;
 		};
-		opp@100000000 {
+		opp-100000000 {
 			opp-hz = /bits/ 64 <100000000>;
 		};
 	};

Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt

View file

diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
index b82c004..57a8d06 100644
--- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
+++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
@@ -94,6 +94,7 @@ Required properties:
     * allwinner,sun6i-a31-display-backend
     * allwinner,sun8i-a33-display-backend
   - reg: base address and size of the memory-mapped region.
+  - interrupts: interrupt associated to this IP
   - clocks: phandles to the clocks feeding the frontend and backend
     * ahb: the backend interface clock
     * mod: the backend module clock
@@ -265,6 +266,7 @@ fe0: display-frontend@1e00000 {
 be0: display-backend@1e60000 {
 	compatible = "allwinner,sun5i-a13-display-backend";
 	reg = <0x01e60000 0x10000>;
+	interrupts = <47>;
 	clocks = <&ahb_gates 44>, <&de_be_clk>,
 		 <&dram_gates 26>;
 	clock-names = "ahb", "mod",

Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt

View file

diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
index 476f5ea..2b6243e 100644
--- a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
@@ -35,6 +35,14 @@ Optional properties:
   - interrupt-names and interrupts:
     * pmu: Power Management Unit interrupt, if implemented in hardware
 
+  - memory-region:
+    Memory region to allocate from, as defined in
+    Documentation/devicetree/bindi/reserved-memory/reserved-memory.txt
+
+  - operating-points-v2:
+    Operating Points for the GPU, as defined in
+    Documentation/devicetree/bindings/opp/opp.txt
+
 Vendor-specific bindings
 ------------------------
 

Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt

View file

diff --git a/Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt b/Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
index ff3db65..b7e4c74 100644
--- a/Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
+++ b/Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
@@ -5,6 +5,7 @@ Required properties:
   Currently recognized values:
   - nvidia,gk20a
   - nvidia,gm20b
+  - nvidia,gp10b
 - reg: Physical base address and length of the controller's registers.
   Must contain two entries:
   - first entry for bar0
@@ -14,7 +15,8 @@ Required properties:
 - interrupt-names: Must include the following entries:
   - stall
   - nonstall
-- vdd-supply: regulator for supply voltage.
+- vdd-supply: regulator for supply voltage. Only required for GPUs not using
+  power domains.
 - clocks: Must contain an entry for each entry in clock-names.
   See ../clocks/clock-bindings.txt for details.
 - clock-names: Must include the following entries:
@@ -27,6 +29,8 @@ is also required:
   See ../reset/reset.txt for details.
 - reset-names: Must include the following entries:
   - gpu
+- power-domains: GPUs that make use of power domains can define this property
+  instead of vdd-supply. Currently "nvidia,gp10b" makes use of this.
 
 Optional properties:
 - iommus: A reference to the IOMMU. See ../iommu/iommu.txt for details.
@@ -68,3 +72,22 @@ Example for GM20B:
 		iommus = <&mc TEGRA_SWGROUP_GPU>;
 		status = "disabled";
 	};
+
+Example for GP10B:
+
+	gpu@17000000 {
+		compatible = "nvidia,gp10b";
+		reg = <0x0 0x17000000 0x0 0x1000000>,
+		      <0x0 0x18000000 0x0 0x1000000>;
+		interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH
+			      GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "stall", "nonstall";
+		clocks = <&bpmp TEGRA186_CLK_GPCCLK>,
+			 <&bpmp TEGRA186_CLK_GPU>;
+		clock-names = "gpu", "pwr";
+		resets = <&bpmp TEGRA186_RESET_GPU>;
+		reset-names = "gpu";
+		power-domains = <&bpmp TEGRA186_POWER_DOMAIN_GPU>;
+		iommus = <&smmu TEGRA186_SID_GPU>;
+		status = "disabled";
+	};

Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

View file

diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
index 3e920ec..9ce35af 100644
--- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
+++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
@@ -40,6 +40,7 @@ Required properties:
                  w25x80
                  w25x32
                  w25q32
+                 w25q64
                  w25q32dw
                  w25q80bl
                  w25q128

Documentation/devicetree/bindings/net/marvell,prestera.txt

View file

diff --git a/Documentation/devicetree/bindings/net/marvell,prestera.txt b/Documentation/devicetree/bindings/net/marvell,prestera.txt
index 5fbab29..c329608 100644
--- a/Documentation/devicetree/bindings/net/marvell,prestera.txt
+++ b/Documentation/devicetree/bindings/net/marvell,prestera.txt
@@ -32,19 +32,16 @@ DFX Server bindings
 -------------------
 
 Required properties:
-- compatible: must be "marvell,dfx-server"
+- compatible: must be "marvell,dfx-server", "simple-bus"
+- ranges: describes the address mapping of a memory-mapped bus.
 - reg: address and length of the register set for the device.
 
 Example:
 
-dfx-registers {
-	compatible = "simple-bus";
+dfx-server {
+	compatible = "marvell,dfx-server", "simple-bus";
 	#address-cells = <1>;
 	#size-cells = <1>;
 	ranges = <0 MBUS_ID(0x08, 0x00) 0 0x100000>;
-
-	dfx: dfx@0 {
-		compatible = "marvell,dfx-server";
-		reg = <0 0x100000>;
-	};
+	reg = <MBUS_ID(0x08, 0x00) 0 0x100000>;
 };

Documentation/devicetree/bindings/usb/dwc2.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
index 6c7c2bc..00bea03 100644
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@ -14,6 +14,10 @@ Required properties:
   - "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;
   - "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;
   - snps,dwc2: A generic DWC2 USB controller with default parameters.
+  - "st,stm32f4x9-fsotg": The DWC2 USB FS/HS controller instance in STM32F4x9 SoCs
+  configured in FS mode;
+  - "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs
+  configured in HS mode;
 - reg : Should contain 1 register range (address and length)
 - interrupts : Should contain 1 interrupt
 - clocks: clock provider specifier

Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt

View file

diff --git a/Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt b/Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt
new file mode 100644
index 0000000..bc4b865
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt
@@ -0,0 +1,17 @@
+Cortina Systems Gemini SoC Watchdog
+
+Required properties:
+- compatible : must be "cortina,gemini-watchdog"
+- reg : shall contain base register location and length
+- interrupts : shall contain the interrupt for the watchdog
+
+Optional properties:
+- timeout-sec : the default watchdog timeout in seconds.
+
+Example:
+
+watchdog@41000000 {
+	compatible = "cortina,gemini-watchdog";
+	reg = <0x41000000 0x1000>;
+	interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
+};

arch/arm/boot/dts/Makefile

View file

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 0118084..9c5e1d9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -77,6 +77,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
 	bcm4708-asus-rt-ac56u.dtb \
 	bcm4708-asus-rt-ac68u.dtb \
 	bcm4708-buffalo-wzr-1750dhp.dtb \
+	bcm4708-linksys-ea6300-v1.dtb \
 	bcm4708-luxul-xap-1510.dtb \
 	bcm4708-luxul-xwc-1000.dtb \
 	bcm4708-netgear-r6250.dtb \
@@ -87,17 +88,21 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
 	bcm47081-buffalo-wzr-900dhp.dtb \
 	bcm47081-luxul-xap-1410.dtb \
 	bcm47081-luxul-xwr-1200.dtb \
+	bcm47081-tplink-archer-c5-v2.dtb \
 	bcm4709-asus-rt-ac87u.dtb \
 	bcm4709-buffalo-wxr-1900dhp.dtb \
+	bcm4709-linksys-ea9200.dtb \
 	bcm4709-netgear-r7000.dtb \
 	bcm4709-netgear-r8000.dtb \
 	bcm4709-tplink-archer-c9-v1.dtb \
 	bcm47094-dlink-dir-885l.dtb \
+	bcm47094-linksys-panamera.dtb \
 	bcm47094-luxul-xwr-3100.dtb \
 	bcm47094-netgear-r8500.dtb \
 	bcm94708.dtb \
 	bcm94709.dtb \
 	bcm953012er.dtb \
+	bcm953012hr.dtb \
 	bcm953012k.dtb
 dtb-$(CONFIG_ARCH_BCM_53573) += \
 	bcm47189-tenda-ac9.dtb
@@ -173,6 +178,12 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \
 	exynos5440-sd5v1.dtb \
 	exynos5440-ssdk5440.dtb \
 	exynos5800-peach-pi.dtb
+dtb-$(CONFIG_ARCH_GEMINI) += \
+	gemini-nas4220b.dtb \
+	gemini-rut1xx.dtb \
+	gemini-sq201.dtb \
+	gemini-wbd111.dtb \
+	gemini-wbd222.dtb
 dtb-$(CONFIG_ARCH_HI3xxx) += \
 	hi3620-hi4511.dtb
 dtb-$(CONFIG_ARCH_HIGHBANK) += \
@@ -352,6 +363,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
 	imx6dl-gw551x.dtb \
 	imx6dl-gw552x.dtb \
 	imx6dl-gw553x.dtb \