diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-28 12:50:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-28 12:50:02 -0700 |
| commit | 1e67323721f37f155f7b746c00e97432010769f8 (patch) | |
| tree | 58b24b1470f20f4493d307aacb64b23b37d71842 /Documentation/devicetree | |
| parent | 31c5d501b9f505a395d626a5500b8a6142d8ff89 (diff) | |
| parent | 659f2563d323b09ca12b0e70bb6a50c1b25af3ee (diff) | |
Merge tag 'amlogic-dt64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: Amlogic updates for v5.2, round 2
- add display/gfx support for G12a boards
- enable USB for g12a boards
* tag 'amlogic-dt64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (26 commits)
arm64: dts: meson-g12a-u200: Add support for Video Display
arm64: dts: meson-g12a-sei510: Add support for Video Display
arm64: dts: meson-g12a-x96-max: Add support for Video Display
arm64: dts: meson-g12a: Add AO-CEC nodes
arm64: dts: meson-g12a: Add VPU and HDMI related nodes
arm64: dts: meson-g12a-x96-max: Enable USB
arm64: dts: meson-g12a-u200: Enable USB
arm64: dts: meson-g12a-sei510: Enable USB
arm64: dts: meson-g12a-sei510: Add ADC Key and BT support
arm64: dts: meson-g12a-u200: add regulators
arm64: dts: meson: g12a: Add mali-g31 gpu node
arm64: dts: meson: g12a: Add G12A USB nodes
arm64: dts: meson: g12a: Add SAR ADC node
dt-bindings: power: amlogic, meson-gx-pwrc: Add G12A compatible
arm64: dts: meson-gxm: Add Mali-T820 node
dt-bindings: gpu: mali-midgard: Add resets property
dt-bindings: clock: meson8b: export the video decoder clocks
dt-bindings: clock: meson8b: export the VPU clock
dt-bindings: clock: g12a-aoclk: expose CLKID_AO_CTS_OSCIN
dt-bindings: clock: meson8b: drop the "ABP" clock definition
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt | 14 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt | 4 |
2 files changed, 17 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt index 18a2cde2e5f3..1b1a74129141 100644 --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt +++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt @@ -37,6 +37,20 @@ Optional properties: - operating-points-v2 : Refer to Documentation/devicetree/bindings/opp/opp.txt for details. +- resets : Phandle of the GPU reset line. + +Vendor-specific bindings +------------------------ + +The Mali GPU is integrated very differently from one SoC to +another. In order to accomodate those differences, you have the option +to specify one more vendor-specific compatible, among: + +- "amlogic,meson-gxm-mali" + Required properties: + - resets : Should contain phandles of : + + GPU reset line + + GPU APB glue reset line Example for a Mali-T760: diff --git a/Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt b/Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt index 1cd050b4054c..0fdc3dd1125e 100644 --- a/Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt +++ b/Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt @@ -16,7 +16,9 @@ Device Tree Bindings: --------------------- Required properties: -- compatible: should be "amlogic,meson-gx-pwrc-vpu" for the Meson GX SoCs +- compatible: should be one of the following : + - "amlogic,meson-gx-pwrc-vpu" for the Meson GX SoCs + - "amlogic,meson-g12a-pwrc-vpu" for the Meson G12A SoCs - #power-domain-cells: should be 0 - amlogic,hhi-sysctrl: phandle to the HHI sysctrl node - resets: phandles to the reset lines needed for this power demain sequence |