Commit 195849ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM DT updates from Arnd Bergmann:
 "A total of 380 patches this time, mostly adding support for more
  hardware in the device tree descriptions. There is not much exciting
  here for 4.11, but I've tried my best to condense the information from
  the pull requests I got into a readable summary.

  Noteworthy changes to existing platforms include:

   - The GIC memory map was a bit wrong almost everywhere and now gets
     fixed up

   - The Allwinner platforms convert to the generic pinmux properties

   - The Marvell EBU platforms now use the new DSA binding

   - Samsung Exynos4212 was unused and gets removed

   - The Renesas power management got improved

  New production machines:

   - Lego Mindstorms EV3:
        https://www.lego.com/en-us/mindstorms/about-ev3

   - Beelink X2 Android media box:
        http://linux-sunxi.org/Beelink_X2

   - "Romulus" baseboard management controller for OpenPower

   - Axentia TSE-850 Data Radio Channel (DARC) encoder:
        http://www.axentia.se/db/equipment.html

   - Luxul XAP-1410 and XWR-1200 wireless access points:
        https://luxul.com/xap-1410

  New SoCs:

   - Allwinner H2+ and V3s, both minor variations of already supported
     chips:
        http://www.allwinnertech.com/index.php?c=product&a=index&id=38

   - Marvell Prestera DX packet processors based on Armada XP
     architecture:
        http://www.marvell.com/switching/prestera-dx/

   - Samsung Exynos4412 Prime gets added, a minor variation of
     Exynos4412

  New developer and reference boards:

   - Lichee Pi One, Lichee Pi Zero and Orange Pi Zero, all based on
     Allwinner SoCs:
        http://linux-sunxi.org/LicheePi_One
        http://www.orangepi.org/orangepizero/

   - SAMA5d36ek Reference platform:
        http://www.atmel.com/tools/sama5d36-ek.aspx

   - Beaglebone Green Wireless and Black Wireless:
        https://beagleboard.org/black-wireless
        https://beagleboard.org/green-wireless

   - phyCORE-AM335x System on Module:
        http://phytec.com/products/system-on-modules/phycore/am335x/

   - New revision of "vf610-zii" Zodiac Inflight Innovations board

   - Various i.MX System-on-Module: Is.IoT MX6UL, SavageBoard, Engicam
     i.Core:
        http://www.opossom.com/english/index.html
        http://www.savageboard.org/
        http://www.engicam.com/en/products/embedded/som/sodimm/is-iot-mx6ul
        http://www.engicam.com/en/products/embedded/som/sodimm/i-core-m6s-dl-d-q

   - Liebherr (LWN) monitor 6 based on i.MX6 Quad, no idea what this is

   - Cleanups and bugfixes on at91, bcm53xx, i.MX, mvebu, omap, oxnas,
     qcom, rockchip, sti, stm32 and tegra

  New device supports added to some boards and SoCs, briefly by platform:

   - Allwinner: SPDIF, A33 cpufreq, A33 Mali GPU

   - Aspeed: network, ipmi bt, gpio, pinmux

   - Broadcom: video encoder for raspberry pi, qspi, ethernet, sd/mmc

   - TI DaVinci: gpio, lcdc, usb, video-in, uart

   - TI Keystone 2: MSM RAM, power/reset, uart

   - Mediatek MT2701: clocks, iommu, spi, nand, adc, thermal

   - Marvell EBU: ethernet switch on Turris Omnia

   - NXP i.MX: otp ram, USB, wifi, bluetooth, spdif, spi, pmic, eeprom,
     mmc, nand

   - TI OMAP:

   - Qualcomm: coresight, gyro/accelerometer, hdmi

   - Renesas: pmic, soc-id

   - Rockchip: qos

   - Samsung: audio on Odroid-X

   - Socfpga: FPGA manager, i2c, led, can, watchdog, nand, power monitor

   - STi: video in/out

   - STM32: timer, pwm, i2c, rtc, add, i2s

   - NVIDIA Tegra: tpm

   - Uniphier: mmc/sd pinmux"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (380 commits)
  ARM: dts: armada-385-linksys: fix DSA compatible property
  ARM: dts: Fix typo in armada-xp-98dx4251
  ARM: DTS: Fix register map for virt-capable GIC
  dt-bindings: arm,gic: Fix binding example for a virt-capable GIC
  ARM: dts: sun8i: sinlinx: Enable audio nodes
  ARM: dts: sun8i: parrot: Enable audio nodes
  ARM: dts: sun8i: Add audio codec, dai and card for A33
  ARM: dts: Add EMAC AXI settings for Arria10
  ARM: dts: am335x-chiliboard: Support charger
  ARM: dts: am335x-chiliboard: Support power button
  ARM: sun8i: dt: Add mali node
  dt-bindings: gpu: Add Mali Utgard bindings
  ARM: dts: stm32: Add I2C1 support for STM32429 eval board
  ARM: dts: stm32: Add I2C1 support for STM32F429 SoC
  ARM: dts: stm32: Use clock DT binding definition on stm32f429 family
  dt-bindings: mfd: stm32f4: Add missing binding definition
  dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro
  ARM: dts: stm32: Enable pwm1 and pwm3 for stm32f469-disco
  ARM: dts: stm32: add Timers driver for stm32f429 MCU
  ARM: dts: add the AB8500 sysclk to the device trees
  ...
parents 54fff785 a25996e7

Documentation/devicetree/bindings/arm/axentia.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Device tree bindings for Axentia ARM devices

============================================



Linea CPU module

----------------



Required root node properties:

compatible = "axentia,linea",

	     "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";

and following the rules from atmel-at91.txt for a sama5d31 SoC.





TSE-850 v3 board

----------------



Required root node properties:

compatible = "axentia,tse850v3", "axentia,linea",

	     "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";

and following the rules from above for the axentia,linea CPU module.

Documentation/devicetree/bindings/arm/davinci.txt

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ EnBW AM1808 based CMC board 
Required root node properties:

    - compatible = "enbw,cmc", "ti,da850;



LEGO MINDSTORMS EV3 (AM1808 based)

Required root node properties:

    - compatible = "lego,ev3", "ti,da850";



Generic DaVinci Boards

----------------------

Documentation/devicetree/bindings/arm/marvell/98dx3236.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Marvell 98DX3236, 98DX3336 and 98DX4251 Platforms Device Tree Bindings

----------------------------------------------------------------------



Boards with a SoC of the Marvell 98DX3236, 98DX3336 and 98DX4251 families

shall have the following property:



Required root node property:



compatible: must contain "marvell,armadaxp-98dx3236"



In addition, boards using the Marvell 98DX3336 SoC shall have the

following property:



Required root node property:



compatible: must contain "marvell,armadaxp-98dx3336"



In addition, boards using the Marvell 98DX4251 SoC shall have the

following property:



Required root node property:



compatible: must contain "marvell,armadaxp-98dx4251"

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ Boards: 
- AM335X SBC-T335 : single board computer, built around the Sitara AM3352/4

  compatible = "compulab,sbc-t335", "compulab,cm-t335", "ti,am33xx"



- AM335X phyCORE-AM335x: Development kit

  compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx"



- OMAP5 EVM : Evaluation Module

  compatible = "ti,omap5-evm", "ti,omap5"

Documentation/devicetree/bindings/ata/ahci-da850.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Device tree binding for the TI DA850 AHCI SATA Controller

---------------------------------------------------------



Required properties:

  - compatible: must be "ti,da850-ahci"

  - reg: physical base addresses and sizes of the two register regions

         used by the controller: the register map as defined by the

         AHCI 1.1 standard and the Power Down Control Register (PWRDN)

         for enabling/disabling the SATA clock receiver

  - interrupts: interrupt specifier (refer to the interrupt binding)



Example:



	sata: sata@218000 {

		compatible = "ti,da850-ahci";

		reg = <0x218000 0x2000>, <0x22c018 0x4>;

		interrupts = <67>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE