Skip to content

Commit af6af87

Browse files
committed
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 ...
2 parents 8362fd6 + f90b8fd commit af6af87

File tree

445 files changed

+26661
-2403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+26661
-2403
lines changed

Documentation/devicetree/bindings/arm/amlogic.txt

Lines changed: 0 additions & 142 deletions
This file was deleted.
Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/amlogic.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic MesonX device tree bindings
8+
9+
maintainers:
10+
- Kevin Hilman <[email protected]>
11+
12+
description: |+
13+
Work in progress statement:
14+
15+
Device tree files and bindings applying to Amlogic SoCs and boards are
16+
considered "unstable". Any Amlogic device tree binding may change at
17+
any time. Be sure to use a device tree binary and a kernel image
18+
generated from the same source tree.
19+
20+
Please refer to Documentation/devicetree/bindings/ABI.txt for a definition of a
21+
stable binding/ABI.
22+
23+
properties:
24+
$nodename:
25+
const: '/'
26+
compatible:
27+
oneOf:
28+
- description: Boards with the Amlogic Meson6 SoC
29+
items:
30+
- enum:
31+
- geniatech,atv1200
32+
- const: amlogic,meson6
33+
34+
- description: Boards with the Amlogic Meson8 SoC
35+
items:
36+
- enum:
37+
- minix,neo-x8
38+
- const: amlogic,meson8
39+
40+
- description: Boards with the Amlogic Meson8m2 SoC
41+
items:
42+
- enum:
43+
- tronsmart,mxiii-plus
44+
- const: amlogic,meson8m2
45+
46+
- description: Boards with the Amlogic Meson8b SoC
47+
items:
48+
- enum:
49+
- endless,ec100
50+
- hardkernel,odroid-c1
51+
- tronfy,mxq
52+
- const: amlogic,meson8b
53+
54+
- description: Boards with the Amlogic Meson GXBaby SoC
55+
items:
56+
- enum:
57+
- amlogic,p200
58+
- amlogic,p201
59+
- friendlyarm,nanopi-k2
60+
- hardkernel,odroid-c2
61+
- nexbox,a95x
62+
- wetek,hub
63+
- wetek,play2
64+
- const: amlogic,meson-gxbb
65+
66+
- description: Tronsmart Vega S95 devices
67+
items:
68+
- enum:
69+
- tronsmart,vega-s95-pro
70+
- tronsmart,vega-s95-meta
71+
- tronsmart,vega-s95-telos
72+
- const: tronsmart,vega-s95
73+
- const: amlogic,meson-gxbb
74+
75+
- description: Boards with the Amlogic Meson GXL S805X SoC
76+
items:
77+
- enum:
78+
- amlogic,p241
79+
- libretech,aml-s805x-ac
80+
- const: amlogic,s805x
81+
- const: amlogic,meson-gxl
82+
83+
- description: Boards with the Amlogic Meson GXL S905W SoC
84+
items:
85+
- enum:
86+
- amlogic,p281
87+
- oranth,tx3-mini
88+
- const: amlogic,s905w
89+
- const: amlogic,meson-gxl
90+
91+
- description: Boards with the Amlogic Meson GXL S905X SoC
92+
items:
93+
- enum:
94+
- amediatech,x96-max
95+
- amlogic,p212
96+
- hwacom,amazetv
97+
- khadas,vim
98+
- libretech,cc
99+
- nexbox,a95x
100+
- seirobotics,sei510
101+
- const: amlogic,s905x
102+
- const: amlogic,meson-gxl
103+
104+
- description: Boards with the Amlogic Meson GXL S905D SoC
105+
items:
106+
- enum:
107+
- amlogic,p230
108+
- amlogic,p231
109+
- phicomm,n1
110+
- const: amlogic,s905d
111+
- const: amlogic,meson-gxl
112+
113+
- description: Boards with the Amlogic Meson GXM S912 SoC
114+
items:
115+
- enum:
116+
- amlogic,q200
117+
- amlogic,q201
118+
- khadas,vim2
119+
- kingnovel,r-box-pro
120+
- nexbox,a1
121+
- tronsmart,vega-s96
122+
- const: amlogic,s912
123+
- const: amlogic,meson-gxm
124+
125+
- description: Boards with the Amlogic Meson AXG A113D SoC
126+
items:
127+
- enum:
128+
- amlogic,s400
129+
- const: amlogic,a113d
130+
- const: amlogic,meson-axg
131+
132+
- description: Boards with the Amlogic Meson G12A S905D2 SoC
133+
items:
134+
- enum:
135+
- amlogic,u200
136+
- const: amlogic,g12a
137+
138+
- description: Boards with the Amlogic Meson G12B S922X SoC
139+
items:
140+
- enum:
141+
- hardkernel,odroid-n2
142+
- const: amlogic,g12b
143+
144+
...
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Amlogic Meson Firmware registers Interface
2+
------------------------------------------
3+
4+
The Meson SoCs have a register bank with status and data shared with the
5+
secure firmware.
6+
7+
Required properties:
8+
- compatible: For Meson GX SoCs, must be "amlogic,meson-gx-ao-secure", "syscon"
9+
10+
Properties should indentify components of this register interface :
11+
12+
Meson GX SoC Information
13+
------------------------
14+
A firmware register encodes the SoC type, package and revision information on
15+
the Meson GX SoCs.
16+
If present, the following property should be added :
17+
18+
Optional properties:
19+
- amlogic,has-chip-id: If present, the interface gives the current SoC version.
20+
21+
Example
22+
-------
23+
24+
ao-secure@140 {
25+
compatible = "amlogic,meson-gx-ao-secure", "syscon";
26+
reg = <0x0 0x140 0x0 0x140>;
27+
amlogic,has-chip-id;
28+
};

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

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)