diff options
| author |   Olof Johansson <olof@lixom.net> | 2018-07-21 14:49:25 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-21 14:49:25 -0700 |
| commit | 88657e9012fa907252512cfc8bd289da0ea599eb (patch) | |
| tree | 9f91383b83cb51f5260a910d1f5dc4186140d7bb /Documentation/devicetree/bindings/arm | |
| parent | Merge tag 'renesas-dt-bindings-for-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt (diff) | |
| parent | ARM64: dts: meson-axg: add pdm pins (diff) | |
| download | linux-dev-88657e9012fa907252512cfc8bd289da0ea599eb.tar.xz linux-dev-88657e9012fa907252512cfc8bd289da0ea599eb.zip | |
Merge tag 'amlogic-dt64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
Amlogic 64-bit DT updates for v4.19
- new SoC: S805x
- new board: S805x-based P241 board from Amlogic
- AXG: add ADC support w/buttons, add pins for PDM, SPDIF
- AXG: s400 board: preliminary support for audio
- GX: nanopi-k2: add HDMI, CEC, CVBS support
* tag 'amlogic-dt64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM64: dts: meson-axg: add pdm pins
ARM64: dts: meson-axg: add spdif input pins
ARM64: dts: meson-axg: remove spdif out from gpio a7
ARM64: dts: meson-axg: add adc buttons the S400
ARM64: dts: meson-axg: remove vddio_ao18 from SoC dtsi
ARM64: dts: meson-axg: add saradc support
ARM64: dts: add S805X based P241 board
dt-bindings: amlogic: Add support for GXL S805X and the P241 board
ARM64: dts: amlogic: Add missing cooling device properties for CPUs
ARM64: dts: meson-axg: add spdif output pins
ARM64: dts: meson-axg: add s400 speaker amplifier
ARM64: dts: meson-axg: add s400 main 12v supply
ARM64: dts: meson-axg: add s400 microphone card leds
ARM64: dts: meson-gxbb-nanopi-k2: Add HDMI, CEC and CVBS nodes
ARM64: dts: meson-gx-p23x-q20x: move the wifi node to each board's .dts
ARM64: dts: meson: enable the saradc node in meson-gx-p23x-q20x.dtsi
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index 69880560c0f0..849834cb1766 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -41,6 +41,10 @@ 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 GXM S912 SoC shall have the following properties: Required root node property: compatible: "amlogic,s912", "amlogic,meson-gxm"; @@ -79,6 +83,8 @@ Board compatible values (alphabetically, grouped by SoC): - "amlogic,p230" (Meson gxl s905d) - "amlogic,p231" (Meson gxl s905d) + - "amlogic,p241" (Meson gxl s805x) + - "amlogic,q200" (Meson gxm s912) - "amlogic,q201" (Meson gxm s912) - "khadas,vim2" (Meson gxm s912) |