Commit 1849f800 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 Arnd Bergmann:
 "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.

  New machines:

   - The new Action Semi S500 platform is added along with initial
     support for the LeMaker Guitar board.

   - STM32 gains support for three new boards: stm32h743-disco,
     stm32f746-disco, and stm32f769-disco, along with new device support
     for the existing stm32f429 boards.

   - Renesas adds two new boards, the tiny GR-Peach based on RZ/A1H with
     10MB on-chip SRAM, and the iWave G20D-Q7 System-on-Module plus
     board.

   - On Marvell "mvebu", we gain support for the Linksys WRT3200ACM
     wireless router.

   - For NXP i.MX, we gain support for the Gateworks Ventana GW5600 and
     the Technexion Pico i.MX7D single-board computers.

   - The BeagleBone Blue is added for OMAP, it's the latest variation of
     the popular Beaglebone Black single-board computer.

   - The Allwinner based Lichee Pi Zero and NanoPi M1 Plus boards are
     added, these are the latest variations of a seemingly endless
     supply of similar single-board computers.

  Other updates:

   - Linus Walleij improves support for the "Faraday" based SoC
     platforms from various SoC makers (Moxart, Aspeed, Gemini)

   - The ARM Mali GPU is now describe on Rockchips SoCs

   - Mediatek MT7623 is extended significantly, making it much more
     useful.

   - Lots of individual updates on Renesas, OMAP, Rockchips, Broadcom,
     Allwinner, Qualcomm, iMX

   - For Amlogic, the clock support is extended a lot on meson8b.

   - We now build the devicetree file for the Raspberry Pi 3 on 32-bit
     ARM, in addition to the existing ARM64 support, to help users
     wanting to run a 32-bit system on it"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (345 commits)
  ARM: dts: socfpga: set the i2c frequency
  ARM: dts: socfpga: Add second ethernet alias to VINING FPGA
  ARM: dts: socfpga: Drop LED node from VINING FPGA
  ARM: dts: socfpga: Remove I2C EEPROMs from VINING FPGA
  ARM: dts: socfpga: Enable QSPI support on VINING FPGA
  ARM: dts: socfpga: Fix the ethernet clock phandle
  ARM: pxa: Use - instead of @ for DT OPP entries
  ARM: dts: owl-s500: Add SPS node
  ARM: dts: owl-s500: Set CPU enable-method
  dt-bindings: arm: cpus: Add S500 enable-method
  ARM: dts: Add Actions Semi S500 and LeMaker Guitar
  dt-bindings: arm: Document Actions Semi S900
  dt-bindings: timer: Document Owl timer
  ARM: dts: imx6q-cm-fx6: add sdio wifi/bt nodes
  dt-bindings: arm: Document Actions Semi S500
  dt-bindings: Add vendor prefix for Actions Semi
  ARM: dts: turris-omnia: Add generic compatible string for I2C EEPROM
  ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango)
  ARM: dts: armada-385-linksys: fixup button node names
  ARM: dts: armada-385-linksys: group pins in pinctrl
  ...
parents 8ca302e9 0c6cda58

Documentation/devicetree/bindings/arm/actions.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Actions Semi platforms device tree bindings

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





S500 SoC

========



Required root node properties:



 - compatible :  must contain "actions,s500"





Modules:



Root node property compatible must contain, depending on module:



 - LeMaker Guitar: "lemaker,guitar"





Boards:



Root node property compatible must contain, depending on board:



 - LeMaker Guitar Base Board rev. B: "lemaker,guitar-bb-rev-b", "lemaker,guitar"





S900 SoC

========



Required root node properties:



- compatible :  must contain "actions,s900"





Boards:



Root node property compatible must contain, depending on board:



 - uCRobotics Bubblegum-96: "ucrobotics,bubblegum-96"

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ nodes to be present and contain the properties described below. 
			     "spin-table"

			# On ARM 32-bit systems this property is optional and

			  can be one of:

			    "actions,s500-smp"

			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,realview-smp"

Documentation/devicetree/bindings/arm/gemini.txt

+23 −1
Original line number Diff line number Diff line
@@ -24,6 +24,19 @@ Required nodes: 
  global control registers, with the compatible string

  "cortina,gemini-syscon", "syscon";



  Required properties on the syscon:

  - reg: syscon register location and size.

  - #clock-cells: should be set to <1> - the system controller is also a

                  clock provider.

  - #reset-cells: should be set to <1> - the system controller is also a

                  reset line provider.



  The clock sources have shorthand defines in the include file:

  <dt-bindings/clock/cortina,gemini-clock.h>



  The reset lines have shorthand defines in the include file:

  <dt-bindings/reset/cortina,gemini-reset.h>



- 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
@@ -56,12 +69,15 @@ Example: 
		syscon: syscon@40000000 {

			compatible = "cortina,gemini-syscon", "syscon";

			reg = <0x40000000 0x1000>;

			#clock-cells = <1>;

			#reset-cells = <1>;

		};



		uart0: serial@42000000 {

			compatible = "ns16550a";

			reg = <0x42000000 0x100>;

			clock-frequency = <48000000>;

			resets = <&syscon GEMINI_RESET_UART>;

			clocks = <&syscon GEMINI_CLK_UART>;

			interrupts = <18 IRQ_TYPE_LEVEL_HIGH>;

			reg-shift = <2>;

		};
@@ -73,12 +89,18 @@ Example: 
			interrupts = <14 IRQ_TYPE_EDGE_FALLING>, /* Timer 1 */

				     <15 IRQ_TYPE_EDGE_FALLING>, /* Timer 2 */

				     <16 IRQ_TYPE_EDGE_FALLING>; /* Timer 3 */

			resets = <&syscon GEMINI_RESET_TIMER>;

			/* APB clock or RTC clock */

			clocks = <&syscon GEMINI_CLK_APB>,

				 <&syscon GEMINI_CLK_RTC>;

			clock-names = "PCLK", "EXTCLK";

			syscon = <&syscon>;

		};



		intcon: interrupt-controller@48000000 {

			compatible = "cortina,gemini-interrupt-controller";

			reg = <0x48000000 0x1000>;

			resets = <&syscon GEMINI_RESET_INTCON0>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};

Documentation/devicetree/bindings/arm/keystone/keystone.txt

+3 −0
Original line number Diff line number Diff line
@@ -37,3 +37,6 @@ Boards: 


-  K2G EVM

   compatible = "ti,k2g-evm", "ti,k2g", "ti-keystone"



-  K2G Industrial Communication Engine EVM

   compatible = "ti,k2g-ice", "ti,k2g", "ti-keystone"

Documentation/devicetree/bindings/arm/rockchip.txt

+2 −2
Original line number Diff line number Diff line
@@ -138,9 +138,9 @@ Rockchip platforms device tree bindings 
    Required root node properties:

      - compatible = "rockchip,px5-evb", "rockchip,px5", "rockchip,rk3368";



- Rockchip RK1108 Evaluation board

- Rockchip RV1108 Evaluation board

    Required root node properties:

      - compatible = "rockchip,rk1108-evb", "rockchip,rk1108";

      - compatible = "rockchip,rv1108-evb", "rockchip,rv1108";



- Rockchip RK3368 evb:

    Required root node properties:

CRA Git | Maintained and supported by SUSTech CRA and CCSE