diff options
| author | Olof Johansson | 2018-12-01 00:18:30 +0100 |
|---|---|---|
| committer | Olof Johansson | 2018-12-01 00:18:30 +0100 |
| commit | f6332990f6df9a217a94e1543d5d387abc0cd0e9 (patch) | |
| tree | cdc469df004bcb78952e0397dd9ed11db754fad5 /Documentation/devicetree/bindings/arm | |
| parent | Merge tag 'amlogic-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/khi... (diff) | |
| parent | arm64: dts: meson-gx: Add Internal Clock Measurer node (diff) | |
| download | kernel-qcow2-linux-f6332990f6df9a217a94e1543d5d387abc0cd0e9.tar.gz kernel-qcow2-linux-f6332990f6df9a217a94e1543d5d387abc0cd0e9.tar.xz kernel-qcow2-linux-f6332990f6df9a217a94e1543d5d387abc0cd0e9.zip | |
Merge tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
arm64: Amlogic DT updates for v4.21
Some highlights:
- new boards: Phicomm N1 (S905D), Libretech S805-AC
- fixes for pinmux pad bias, GPIO line names
- AXG: enable SCPI, add secure monitor
* tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (26 commits)
arm64: dts: meson-gx: Add Internal Clock Measurer node
arm64: dts: amlogic: Add all CPUs in cooling maps
arm64: dts: meson: add libretech aml-s805x-ac board
dt-bindings: arm: amlogic: add libretech aml-s805x-ac bindings
dt-bindings: arm: amlogic: Add Phicomm N1
dt-bindings: Add vendor prefix for PHICOMM Co., Ltd.
arm64: dts: meson-gxl: add support for phicomm n1
arm64: dts: meson: consistently disable pin bias
arm64: dts: meson: disable pad bias for mmc pinmuxes
arm64: dts: meson: remove extra subnode in mmc clk_gate pinmux
arm64: dts: meson: s400: add bcm bluetooth device
arm64: dts: meson: p230: disable advertisement EEE for GbE.
arm64: dts: meson-axg: enable SCPI
Documentation: bindings: Add missing Amlogic SCPI sensor bindings
arm64: dts: meson-axg: correct sram shared mem unit-address
arm64: dts: meson-axg: fix mailbox address
arm64: dts: meson-gx: Add hdmi_5v regulator as hdmi tx supply
arm64: dts: meson-axg: add secure monitor
arm64: dts: meson-axg: s400: add cts-rts to the bluetooth uart
arm64: dts: meson-gxl-khadas-vim: fix GPIO lines names
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic,scpi.txt | 7 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.txt | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic,scpi.txt b/Documentation/devicetree/bindings/arm/amlogic,scpi.txt index 7b9a861e9306..5ab59da052df 100644 --- a/Documentation/devicetree/bindings/arm/amlogic,scpi.txt +++ b/Documentation/devicetree/bindings/arm/amlogic,scpi.txt @@ -17,4 +17,11 @@ Required sub-node properties: - compatible : should be "amlogic,meson-gxbb-scp-shmem" for SRAM based shared memory on Amlogic GXBB SoC. +Sensor bindings for the sensors based on SCPI Message Protocol +-------------------------------------------------------------- +SCPI provides an API to access the various sensors on the SoC. + +Required properties: +- compatible : should be "amlogic,meson-gxbb-scpi-sensors". + [0] Documentation/devicetree/bindings/arm/arm,scpi.txt diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index 4498292b833d..8dbc259081e4 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -91,8 +91,10 @@ Board compatible values (alphabetically, grouped by SoC): - "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) |