Commit 85d60490 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 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
  ...
parents 8d648aad b9f34da7

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

+2 −1
Original line number Diff line number Diff line
@@ -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

0 → 100644
+86 −0
Original line number Diff line number Diff line 
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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
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

+7 −0
Original line number Diff line number Diff line 
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

+4 −0
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE