Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f34a64a 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:
 "Business as usual -- the bulk of our changes are to devicetree files
  with new hardware support, new SoCs and platforms, and new board
  types.

  New SoCs/platforms:
   - Raspberry Pi Compute Module (CM1) and IO board
   - i.MX6SSL from NXP
   - Renesas RZ/N1D SoC (R9A06G032), Dual Cortex-A7 with Ethernet, CAN
     and PLC interfaces
   - TI AM654 SoC, Quad Cortex-A53, safety subsystem with Cortex-R5
     controllers, communication and PRU subsystem and lots of other
     interfaces (PCIe, USB3, etc).

  New boards and systems:
   - Several Atmel at91-based boards from Laird
   - Marvell Armada388-based Helios4 board from SolidRun
   - Samsung Aires-based phones (s5pv210)
   - Allwinner A64-based Pinebook laptop

  In addition to the above, there's the usual amount of new devices
  described on existing platforms, fixes and tweaks and new minor
  variants of boards/platforms"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (478 commits)
  arm64: dts: sdm845: Add tsens nodes
  arm64: dts: msm8996: thermal: Initialise via DT and add second controller
  arm64: dts: sprd: Add one suspend timer
  arm64: dts: sprd: Add SC27XX ADC device
  arm64: dts: sprd: Add SC27XX eFuse device
  arm64: dts: sprd: Add SC27XX vibrator device
  arm64: dts: sprd: Add SC27XX breathing light controller device
  arm64: dts: meson-axg: add spdif-dit codec
  arm64: dts: meson-axg: add lineout codec
  arm64: dts: meson-axg: add linein codec
  arm64: dts: meson-axg: add tdm interfaces
  arm64: dts: meson-axg: add tdmout formatters
  arm64: dts: meson-axg: add tdmin formatters
  arm64: dts: meson-axg: add spdifout
  arm64: dts: rockchip: add led support for Firefly-RK3399
  arm64: dts: rockchip: remove deprecated Type-C PHY properties on rk3399
  arm64: dts: rockchip: add power button support for Firefly-RK3399
  ARM: dts: aspeed: Add coprocessor interrupt controller
  arm64: dts: meson-axg: add audio arb reset controller
  arm64: dts: meson-axg: add usb power regulator
  ...
parents ee090756 afd3e3da

Documentation/devicetree/bindings/arm/adapteva.txt

deleted100644 → 0
+0 −7
Original line number Original line Diff line number Diff line 
Adapteva Platforms Device Tree Bindings

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



Parallella board



Required root node properties:

    - compatible = "adapteva,parallella";

Documentation/devicetree/bindings/arm/amlogic.txt

+13 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,14 @@ Boards with the Amlogic Meson GXL S905D SoC shall have the following properties: 
  Required root node property:

  Required root node property:

    compatible: "amlogic,s905d", "amlogic,meson-gxl";

    compatible: "amlogic,s905d", "amlogic,meson-gxl";





Boards with the Amlogic Meson GXL S805X SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,s805x", "amlogic,meson-gxl";



Boards with the Amlogic Meson GXL S905W SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,s905w", "amlogic,meson-gxl";



Boards with the Amlogic Meson GXM S912 SoC shall have the following properties:

Boards with the Amlogic Meson GXM S912 SoC shall have the following properties:

  Required root node property:

  Required root node property:

    compatible: "amlogic,s912", "amlogic,meson-gxm";

    compatible: "amlogic,s912", "amlogic,meson-gxm";
@@ -79,6 +87,11 @@ Board compatible values (alphabetically, grouped by SoC): 
  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)





  - "amlogic,p241" (Meson gxl s805x)



  - "amlogic,p281" (Meson gxl s905w)

  - "oranth,tx3-mini" (Meson gxl s905w)



  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

  - "khadas,vim2" (Meson gxm s912)

  - "khadas,vim2" (Meson gxm s912)

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

deleted100644 → 0
+0 −14
Original line number Original line Diff line number Diff line 
* Power Management Controller (PMC)



Required properties:

- compatible: Should be "atmel,<chip>-pmc".

	<chip> can be: at91rm9200, at91sam9260, at91sam9g45, at91sam9n12,

	at91sam9x5, sama5d3



- reg: Should contain PMC registers location and length



Examples:

	pmc: pmc@fffffc00 {

		compatible = "atmel,at91rm9200-pmc";

		reg = <0xfffffc00 0x100>;

	};

Documentation/devicetree/bindings/arm/cpus.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -183,6 +183,7 @@ described below. 
			    "marvell,sheeva-v5"

			    "marvell,sheeva-v5"

			    "nvidia,tegra132-denver"

			    "nvidia,tegra132-denver"

			    "nvidia,tegra186-denver"

			    "nvidia,tegra186-denver"

			    "nvidia,tegra194-carmel"

			    "qcom,krait"

			    "qcom,krait"

			    "qcom,kryo"

			    "qcom,kryo"

			    "qcom,kryo385"

			    "qcom,kryo385"
@@ -219,6 +220,7 @@ described below. 
			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "qcom,kpss-acc-v2"

			    "renesas,apmu"

			    "renesas,apmu"

			    "renesas,r9a06g032-smp"

			    "rockchip,rk3036-smp"

			    "rockchip,rk3036-smp"

			    "rockchip,rk3066-smp"

			    "rockchip,rk3066-smp"

			    "ste,dbx500-smp"

			    "ste,dbx500-smp"

Documentation/devicetree/bindings/arm/freescale/m4if.txt

0 → 100644
+12 −0
Original line number Original line Diff line number Diff line 
* Freescale Multi Master Multi Memory Interface (M4IF) module



Required properties:

- compatible : Should be "fsl,imx51-m4if"

- reg : Address and length of the register set for the device



Example:



m4if: m4if@83fd8000 {

	compatible = "fsl,imx51-m4if";

	reg = <0x83fd8000 0x1000>;

};