Commit 5588aa81 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-dt64' of... 

Merge tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

arm64: dts: Amlogic updates for v5.5

Hightlights
- new board; ugoos am6, based on G12B SoC
- g12: add thermal driver and cooling properties
- sm1: enable audio on SEI610 board
- IR: add several keymaps
- sdio: add keep-power-in-suspend property for multiple boards
- pcie: add support for G12A
- multiple fixes, cleanups

* tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (62 commits)
  arm64: dts: meson-gx: fix i2c compatible
  arm64: dts: meson-gx: cec node should be disabled by default
  arm64: dts: meson-g12b-odroid-n2: add missing amlogic, s922x compatible
  arm64: dts: meson-gxm: fix gpu irq order
  arm64: dts: meson-g12a: fix gpu irq order
  ARM64: dts: amlogic: adds crypto hardware node
  arm64: dts: meson-gxbb-vega-s95: set rc-vega-s9x ir keymap
  arm64: dts: meson-gxm-vega-s96: set rc-vega-s9x ir keymap
  arm64: dts: meson: g12b: add cooling properties
  arm64: dts: meson: g12a: add cooling properties
  arm64: dts: meson: g12: Add minimal thermal zone
  arm64: dts: meson: g12: add temperature sensor
  arm64: dts: meson: sei610: enable audio
  arm64: dts: meson: sm1: add audio devices
  dt-bindings: clock: meson: add sm1 resets to the axg-audio controller
  dt-bindings: clk: axg-audio: add sm1 bindings
  arm64: dts: meson-g12: add support for simplefb
  arm64: dts: meson: g12a: add audio devices resets
  arm64: dts: meson: odroid-c2: Add missing regulator linked to HDMI supply
  arm64: dts: meson: odroid-c2: Add missing regulator linked to VDDIO_AO3V3 regulator
  ...

Link: https://lore.kernel.org/r/7hd0dzs0m1.fsf@baylibre.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 077f46db 87297878

Documentation/devicetree/bindings/arm/amlogic.yaml

+8 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ properties: 
              - amlogic,p212

              - hwacom,amazetv

              - khadas,vim

              - libretech,cc

              - libretech,aml-s905x-cc

              - nexbox,a95x

          - const: amlogic,s905x

          - const: amlogic,meson-gxl
@@ -147,6 +147,7 @@ properties: 
          - enum:

              - hardkernel,odroid-n2

              - khadas,vim3

              - ugoos,am6

          - const: amlogic,s922x

          - const: amlogic,g12b
@@ -156,4 +157,10 @@ properties: 
              - seirobotics,sei610

              - khadas,vim3l

          - const: amlogic,sm1



      - description: Boards with the Amlogic Meson A1 A113L SoC

        items:

          - enum:

              - amlogic,ad401

          - const: amlogic,a1

...

Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ devices. 
Required Properties:



- compatible	: should be "amlogic,axg-audio-clkc" for the A113X and A113D,

		  "amlogic,g12a-audio-clkc" for G12A.

		  "amlogic,g12a-audio-clkc" for G12A,

		  "amlogic,sm1-audio-clkc" for S905X3.

- reg		: physical base address of the clock controller and length of

		  memory mapped region.

- clocks	: a list of phandle + clock-specifier pairs for the clocks listed

Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ The Amlogic Audio ARB is a simple device which enables or 
disables the access of Audio FIFOs to DDR on AXG based SoC.



Required properties:

- compatible: 'amlogic,meson-axg-audio-arb'

- compatible: 'amlogic,meson-axg-audio-arb' or

	      'amlogic,meson-sm1-audio-arb'

- reg: physical base address of the controller and length of memory

       mapped region.

- clocks: phandle to the fifo peripheral clock provided by the audio

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -990,6 +990,8 @@ patternProperties: 
    description: Ubiquiti Networks

  "^udoo,.*":

    description: Udoo

  "^ugoos,.*":

    description: Ugoos Industrial Co., Ltd.

  "^uniwest,.*":

    description: United Western Technologies Corp (UniWest)

  "^upisemi,.*":

arch/arm64/boot/dts/amlogic/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
@@ -36,3 +37,4 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb

CRA Git | Maintained and supported by SUSTech CRA and CCSE