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

Commit af6af87d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM Devicetree updates from Olof Johansson:
 "We continue to see a lot of new material. I've highlighted some of it
  below, but there's been more beyond that as well.

  One of the sweeping changes is that many boards have seen their ARM
  Mali GPU devices added to device trees, since the DRM drivers have now
  been merged.

  So, with the caveat that I have surely missed several great
  contributions, here's a collection of the material this time around:

  New SoCs:

   - Mediatek mt8183 (4x Cortex-A73 + 4x Cortex-A53)

   - TI J721E (2x Cortex-A72 + 3x Cortex-R5F + 3 DSPs + MMA)

   - Amlogic G12B (4x Cortex-A73 + 2x Cortex-A53)

  New Boards / platforms:

   - Aspeed BMC support for a number of new server platforms

   - Kontron SMARC SoM (several i.MX6 versions)

   - Novtech's Meerkat96 (i.MX7)

   - ST Micro Avenger96 board

   - Hardkernel ODROID-N2 (Amlogic G12B)

   - Purism Librem5 devkit (i.MX8MQ)

   - Google Cheza (Qualcomm SDM845)

   - Qualcomm Dragonboard 845c (Qualcomm SDM845)

   - Hugsun X99 TV Box (Rockchip RK3399)

   - Khadas Edge/Edge-V/Captain (Rockchip RK3399)

  Updated / expanded boards and platforms:

   - Renesas r7s9210 has a lot of new peripherals added

   - Fixes and polish for Rockchip-based Chromebooks

   - Amlogic G12A has a lot of peripherals added

   - Nvidia Jetson Nano sees various fixes and improvements, and is now
     at feature parity with TX1"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (586 commits)
  ARM: dts: gemini: Set DIR-685 SPI CS as active low
  ARM: dts: exynos: Adjust buck[78] regulators to supported values on Arndale Octa
  ARM: dts: exynos: Adjust buck[78] regulators to supported values on Odroid XU3 family
  ARM: dts: exynos: Move Mali400 GPU node to "/soc"
  ARM: dts: exynos: Fix imprecise abort on Mali GPU probe on Exynos4210
  arm64: dts: qcom: qcs404: Add missing space for cooling-cells property
  arm64: dts: rockchip: Fix USB3 Type-C on rk3399-sapphire
  arm64: dts: rockchip: Update DWC3 modules on RK3399 SoCs
  arm64: dts: rockchip: enable rk3328 watchdog clock
  ARM: dts: rockchip: add display nodes for rk322x
  ARM: dts: rockchip: fix vop iommu-cells on rk322x
  arm64: dts: rockchip: Add support for Hugsun X99 TV Box
  arm64: dts: rockchip: Define values for the IPA governor for rock960
  arm64: dts: rockchip: Fix multiple thermal zones conflict in rk3399.dtsi
  arm64: dts: rockchip: add core dtsi file for RK3399Pro SoCs
  arm64: dts: rockchip: improve rk3328-roc-cc rgmii performance.
  Revert "ARM: dts: rockchip: set PWM delay backlight settings for Minnie"
  ARM: dts: rockchip: Configure BT_DEV_WAKE in on rk3288-veyron
  arm64: dts: qcom: sdm845-cheza: add initial cheza dt
  ARM: dts: msm8974-FP2: Add vibration motor
  ...
parents 8362fd64 f90b8fda

Documentation/devicetree/bindings/arm/amlogic.txt

deleted100644 → 0
+0 −142
Original line number Diff line number Diff line 
Amlogic MesonX device tree bindings

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



Work in progress statement:



Device tree files and bindings applying to Amlogic SoCs and boards are

considered "unstable". Any Amlogic device tree binding may change at

any time. Be sure to use a device tree binary and a kernel image

generated from the same source tree.



Please refer to Documentation/devicetree/bindings/ABI.txt for a definition of a

stable binding/ABI.



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



Boards with the Amlogic Meson6 SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,meson6"



Boards with the Amlogic Meson8 SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,meson8";



Boards with the Amlogic Meson8b SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,meson8b";



Boards with the Amlogic Meson8m2 SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,meson8m2";



Boards with the Amlogic Meson GXBaby SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,meson-gxbb";



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

  Required root node property:

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



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

  Required root node property:

    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:

  Required root node property:

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



Boards with the Amlogic Meson AXG A113D SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,a113d", "amlogic,meson-axg";



Boards with the Amlogic Meson G12A S905D2 SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,g12a";



Board compatible values (alphabetically, grouped by SoC):



  - "geniatech,atv1200" (Meson6)



  - "minix,neo-x8" (Meson8)



  - "endless,ec100" (Meson8b)

  - "hardkernel,odroid-c1" (Meson8b)

  - "tronfy,mxq" (Meson8b)



  - "tronsmart,mxiii-plus" (Meson8m2)



  - "amlogic,p200" (Meson gxbb)

  - "amlogic,p201" (Meson gxbb)

  - "friendlyarm,nanopi-k2" (Meson gxbb)

  - "hardkernel,odroid-c2" (Meson gxbb)

  - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)

  - "tronsmart,vega-s95-pro", "tronsmart,vega-s95" (Meson gxbb)

  - "tronsmart,vega-s95-meta", "tronsmart,vega-s95" (Meson gxbb)

  - "tronsmart,vega-s95-telos", "tronsmart,vega-s95" (Meson gxbb)

  - "wetek,hub" (Meson gxbb)

  - "wetek,play2" (Meson gxbb)



  - "amlogic,p212" (Meson gxl s905x)

  - "hwacom,amazetv" (Meson gxl s905x)

  - "khadas,vim" (Meson gxl s905x)

  - "libretech,cc" (Meson gxl s905x)



  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

  - "phicomm,n1" (Meson gxl s905d)



  - "amlogic,p241" (Meson gxl s805x)

  - "libretech,aml-s805x-ac" (Meson gxl s805x)



  - "amlogic,p281" (Meson gxl s905w)

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



  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

  - "khadas,vim2" (Meson gxm s912)

  - "kingnovel,r-box-pro" (Meson gxm S912)

  - "nexbox,a1" (Meson gxm s912)

  - "tronsmart,vega-s96" (Meson gxm s912)



  - "amlogic,s400" (Meson axg a113d)



  - "amlogic,u200" (Meson g12a s905d2)

  - "amediatech,x96-max" (Meson g12a s905x2)

  - "seirobotics,sei510" (Meson g12a s905x2)



Amlogic Meson Firmware registers Interface

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



The Meson SoCs have a register bank with status and data shared with the

secure firmware.



Required properties:

 - compatible: For Meson GX SoCs, must be "amlogic,meson-gx-ao-secure", "syscon"



Properties should indentify components of this register interface :



Meson GX SoC Information

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

A firmware register encodes the SoC type, package and revision information on

the Meson GX SoCs.

If present, the following property should be added :



Optional properties:

  - amlogic,has-chip-id: If present, the interface gives the current SoC version.



Example

-------



ao-secure@140 {

	compatible = "amlogic,meson-gx-ao-secure", "syscon";

	reg = <0x0 0x140 0x0 0x140>;

	amlogic,has-chip-id;

};

Documentation/devicetree/bindings/arm/amlogic.yaml

0 → 100644
+144 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/amlogic.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Amlogic MesonX device tree bindings



maintainers:

  - Kevin Hilman <khilman@baylibre.com>



description: |+

  Work in progress statement:



  Device tree files and bindings applying to Amlogic SoCs and boards are

  considered "unstable". Any Amlogic device tree binding may change at

  any time. Be sure to use a device tree binary and a kernel image

  generated from the same source tree.



  Please refer to Documentation/devicetree/bindings/ABI.txt for a definition of a

  stable binding/ABI.



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - description: Boards with the Amlogic Meson6 SoC

        items:

          - enum:

              - geniatech,atv1200

          - const: amlogic,meson6



      - description: Boards with the Amlogic Meson8 SoC

        items:

          - enum:

              - minix,neo-x8

          - const: amlogic,meson8



      - description: Boards with the Amlogic Meson8m2 SoC

        items:

          - enum:

              - tronsmart,mxiii-plus

          - const: amlogic,meson8m2



      - description: Boards with the Amlogic Meson8b SoC

        items:

          - enum:

              - endless,ec100

              - hardkernel,odroid-c1

              - tronfy,mxq

          - const: amlogic,meson8b



      - description: Boards with the Amlogic Meson GXBaby SoC

        items:

          - enum:

              - amlogic,p200

              - amlogic,p201

              - friendlyarm,nanopi-k2

              - hardkernel,odroid-c2

              - nexbox,a95x

              - wetek,hub

              - wetek,play2

          - const: amlogic,meson-gxbb



      - description: Tronsmart Vega S95 devices

        items:

          - enum:

              - tronsmart,vega-s95-pro

              - tronsmart,vega-s95-meta

              - tronsmart,vega-s95-telos

          - const: tronsmart,vega-s95

          - const: amlogic,meson-gxbb



      - description: Boards with the Amlogic Meson GXL S805X SoC

        items:

          - enum:

              - amlogic,p241

              - libretech,aml-s805x-ac

          - const: amlogic,s805x

          - const: amlogic,meson-gxl



      - description: Boards with the Amlogic Meson GXL S905W SoC

        items:

          - enum:

              - amlogic,p281

              - oranth,tx3-mini

          - const: amlogic,s905w

          - const: amlogic,meson-gxl



      - description: Boards with the Amlogic Meson GXL S905X SoC

        items:

          - enum:

              - amediatech,x96-max

              - amlogic,p212

              - hwacom,amazetv

              - khadas,vim

              - libretech,cc

              - nexbox,a95x

              - seirobotics,sei510

          - const: amlogic,s905x

          - const: amlogic,meson-gxl



      - description: Boards with the Amlogic Meson GXL S905D SoC

        items:

          - enum:

              - amlogic,p230

              - amlogic,p231

              - phicomm,n1

          - const: amlogic,s905d

          - const: amlogic,meson-gxl



      - description: Boards with the Amlogic Meson GXM S912 SoC

        items:

          - enum:

              - amlogic,q200

              - amlogic,q201

              - khadas,vim2

              - kingnovel,r-box-pro

              - nexbox,a1

              - tronsmart,vega-s96

          - const: amlogic,s912

          - const: amlogic,meson-gxm



      - description: Boards with the Amlogic Meson AXG A113D SoC

        items:

          - enum:

              - amlogic,s400

          - const: amlogic,a113d

          - const: amlogic,meson-axg



      - description: Boards with the Amlogic Meson G12A S905D2 SoC

        items:

          - enum:

              - amlogic,u200

          - const: amlogic,g12a



      - description: Boards with the Amlogic Meson G12B S922X SoC

        items:

          - enum:

              - hardkernel,odroid-n2

          - const: amlogic,g12b



...

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Amlogic Meson Firmware registers Interface

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



The Meson SoCs have a register bank with status and data shared with the

secure firmware.



Required properties:

 - compatible: For Meson GX SoCs, must be "amlogic,meson-gx-ao-secure", "syscon"



Properties should indentify components of this register interface :



Meson GX SoC Information

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

A firmware register encodes the SoC type, package and revision information on

the Meson GX SoCs.

If present, the following property should be added :



Optional properties:

  - amlogic,has-chip-id: If present, the interface gives the current SoC version.



Example

-------



ao-secure@140 {

	compatible = "amlogic,meson-gx-ao-secure", "syscon";

	reg = <0x0 0x140 0x0 0x140>;

	amlogic,has-chip-id;

};

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

deleted100644 → 0
+0 −73
Original line number Diff line number Diff line 
Atmel AT91 device tree bindings.

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



Boards with a SoC of the Atmel AT91 or SMART family shall have the following

properties:



Required root node properties:

compatible: must be one of:

 * "atmel,at91rm9200"



 * "atmel,at91sam9" for SoCs using an ARM926EJ-S core, shall be extended with

   the specific SoC family or compatible:

    o "atmel,at91sam9260"

    o "atmel,at91sam9261"

    o "atmel,at91sam9263"

    o "atmel,at91sam9x5" for the 5 series, shall be extended with the specific

      SoC compatible:

       - "atmel,at91sam9g15"

       - "atmel,at91sam9g25"

       - "atmel,at91sam9g35"

       - "atmel,at91sam9x25"

       - "atmel,at91sam9x35"

    o "atmel,at91sam9g20"

    o "atmel,at91sam9g45"

    o "atmel,at91sam9n12"

    o "atmel,at91sam9rl"

    o "atmel,at91sam9xe"

    o "microchip,sam9x60"

 * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific

   SoC family:

    o "atmel,sama5d2" shall be extended with the specific SoC compatible:

       - "atmel,sama5d27"

    o "atmel,sama5d3" shall be extended with the specific SoC compatible:

       - "atmel,sama5d31"

       - "atmel,sama5d33"

       - "atmel,sama5d34"

       - "atmel,sama5d35"

       - "atmel,sama5d36"

    o "atmel,sama5d4" shall be extended with the specific SoC compatible:

       - "atmel,sama5d41"

       - "atmel,sama5d42"

       - "atmel,sama5d43"

       - "atmel,sama5d44"



 * "atmel,samv7" for MCUs using a Cortex-M7, shall be extended with the specific

   SoC family:

    o "atmel,sams70" shall be extended with the specific MCU compatible:

       - "atmel,sams70j19"

       - "atmel,sams70j20"

       - "atmel,sams70j21"

       - "atmel,sams70n19"

       - "atmel,sams70n20"

       - "atmel,sams70n21"

       - "atmel,sams70q19"

       - "atmel,sams70q20"

       - "atmel,sams70q21"

    o "atmel,samv70" shall be extended with the specific MCU compatible:

       - "atmel,samv70j19"

       - "atmel,samv70j20"

       - "atmel,samv70n19"

       - "atmel,samv70n20"

       - "atmel,samv70q19"

       - "atmel,samv70q20"

    o "atmel,samv71" shall be extended with the specific MCU compatible:

       - "atmel,samv71j19"

       - "atmel,samv71j20"

       - "atmel,samv71j21"

       - "atmel,samv71n19"

       - "atmel,samv71n20"

       - "atmel,samv71n21"

       - "atmel,samv71q19"

       - "atmel,samv71q20"

       - "atmel,samv71q21"

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

0 → 100644
+134 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/atmel-at91.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Atmel AT91 device tree bindings.



maintainers:

  - Alexandre Belloni <alexandre.belloni@bootlin.com>

  - Ludovic Desroches <ludovic.desroches@microchip.com>



description: |

  Boards with a SoC of the Atmel AT91 or SMART family shall have the following



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - items:

          - const: atmel,at91rm9200

      - items:

          - enum:

              - olimex,sam9-l9260

          - enum:

              - atmel,at91sam9260

              - atmel,at91sam9261

              - atmel,at91sam9263

              - atmel,at91sam9g20

              - atmel,at91sam9g45

              - atmel,at91sam9n12

              - atmel,at91sam9rl

              - atmel,at91sam9xe

              - atmel,at91sam9x60

          - const: atmel,at91sam9



      - items:

          - enum:

              - atmel,at91sam9g15

              - atmel,at91sam9g25

              - atmel,at91sam9g35

              - atmel,at91sam9x25

              - atmel,at91sam9x35

          - const: atmel,at91sam9x5

          - const: atmel,at91sam9



      - items:

          - const: atmel,sama5d27

          - const: atmel,sama5d2

          - const: atmel,sama5



      - description: Nattis v2 board with Natte v2 power board

        items:

          - const: axentia,nattis-2

          - const: axentia,natte-2

          - const: axentia,linea

          - const: atmel,sama5d31

          - const: atmel,sama5d3

          - const: atmel,sama5



      - description: TSE-850 v3 board

        items:

          - const: axentia,tse850v3

          - const: axentia,linea

          - const: atmel,sama5d31

          - const: atmel,sama5d3

          - const: atmel,sama5



      - items:

          - const: axentia,linea

          - const: atmel,sama5d31

          - const: atmel,sama5d3

          - const: atmel,sama5



      - items:

          - enum:

              - atmel,sama5d31

              - atmel,sama5d33

              - atmel,sama5d34

              - atmel,sama5d35

              - atmel,sama5d36

          - const: atmel,sama5d3

          - const: atmel,sama5



      - items:

          - enum:

              - atmel,sama5d41

              - atmel,sama5d42

              - atmel,sama5d43

              - atmel,sama5d44

          - const: atmel,sama5d4

          - const: atmel,sama5



      - items:

          - enum:

              - atmel,sams70j19

              - atmel,sams70j20

              - atmel,sams70j21

              - atmel,sams70n19

              - atmel,sams70n20

              - atmel,sams70n21

              - atmel,sams70q19

              - atmel,sams70q20

              - atmel,sams70q21

          - const: atmel,sams70

          - const: atmel,samv7



      - items:

          - enum:

              - atmel,samv70j19

              - atmel,samv70j20

              - atmel,samv70n19

              - atmel,samv70n20

              - atmel,samv70q19

              - atmel,samv70q20

          - const: atmel,samv70

          - const: atmel,samv7



      - items:

          - enum:

              - atmel,samv71j19

              - atmel,samv71j20

              - atmel,samv71j21

              - atmel,samv71n19

              - atmel,samv71n20

              - atmel,samv71n21

              - atmel,samv71q19

              - atmel,samv71q20

              - atmel,samv71q21

          - const: atmel,samv71

          - const: atmel,samv7



...