Commit 34a07a8d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64' of... 

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

arm64: dts: Amlogic updates for v5.8

Highlights:
- new boards :Beelink GT-King Pro (G12B SoC), Smartlabs SML-5442TW
  (S905D), Hardkernel ODROID-C4 (SM1)
- audio: support for GX-family SoCs
- audio: internal DAC support
- use the new USB control driver for GXL and GXM

* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (33 commits)
  arm64: dts: meson-g12b-gtking-pro: add initial device-tree
  dt-bindings: arm: amlogic: add support for the Beelink GT-King Pro
  arm64: dts: meson-g12b-gtking: add initial device-tree
  dt-bindings: arm: amlogic: add support for the Beelink GT-King
  arm64: dts: meson: convert ugoos-am6 to common w400 dtsi
  arm64: dts: meson: add ethernet interrupt to wetek dtsi
  arm64: dts: meson: add support for the Smartlabs SML-5442TW
  dt-bindings: arm: amlogic: add support for the Smartlabs SML-5442TW
  dt-bindings: add vendor prefix for Smartlabs LLC
  arm64: dts: meson: g12: add internal DAC glue
  arm64: dts: meson: g12: add internal DAC
  arm64: dts: meson: libretech-pc: add internal DAC support
  arm64: dts: meson: libretech-ac: add internal DAC support
  arm64: dts: meson: libretech-cc: add internal DAC support
  arm64: dts: meson: p230-q200: add internal DAC support
  arm64: dts: meson: gxl: add acodec support
  arm64: dts: meson-sm1: add support for Hardkernel ODROID-C4
  dt-bindings: arm: amlogic: add odroid-c4 bindings
  arm64: dts: meson-sm1: add cpu thermal nodes
  arm64: dts: meson-g12b: move G12B thermal nodes to meson-g12b.dtsi
  ...

Link: https://lore.kernel.org/r/5ec6f56a.1c69fb81.fc5d5.9ca6@mx.google.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 06273547 0b928e4e

Documentation/devicetree/bindings/arm/amlogic.yaml

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ properties: 
              - amlogic,p231

              - libretech,aml-s905d-pc

              - phicomm,n1

              - smartlabs,sml5442tw

          - const: amlogic,s905d

          - const: amlogic,meson-gxl
@@ -148,6 +149,8 @@ properties: 
      - description: Boards with the Amlogic Meson G12B S922X SoC

        items:

          - enum:

              - azw,gtking

              - azw,gtking-pro

              - hardkernel,odroid-n2

              - khadas,vim3

              - ugoos,am6
@@ -159,6 +162,7 @@ properties: 
          - enum:

              - seirobotics,sei610

              - khadas,vim3l

              - hardkernel,odroid-c4

          - const: amlogic,sm1



      - description: Boards with the Amlogic Meson A1 A113L SoC

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -940,6 +940,8 @@ patternProperties: 
    description: Sitronix Technology Corporation

  "^skyworks,.*":

    description: Skyworks Solutions, Inc.

  "^smartlabs,.*":

    description: SmartLabs LLC

  "^smsc,.*":

    description: Standard Microsystems Corporation

  "^snps,.*":

arch/arm64/boot/dts/amlogic/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.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
@@ -27,6 +29,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb
@@ -40,4 +43,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.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-sm1-odroid-c4.dtb

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

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1735,18 +1735,18 @@ 
		};



		sram: sram@fffc0000 {

			compatible = "amlogic,meson-axg-sram", "mmio-sram";

			compatible = "mmio-sram";

			reg = <0x0 0xfffc0000 0x0 0x20000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x0 0xfffc0000 0x20000>;



			cpu_scp_lpri: scp-shmem@13000 {

			cpu_scp_lpri: scp-sram@13000 {

				compatible = "amlogic,meson-axg-scp-shmem";

				reg = <0x13000 0x400>;

			};



			cpu_scp_hpri: scp-shmem@13400 {

			cpu_scp_hpri: scp-sram@13400 {

				compatible = "amlogic,meson-axg-scp-shmem";

				reg = <0x13400 0x400>;

			};

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -250,6 +250,17 @@ 
				};

			};



			acodec: audio-controller@32000 {

				compatible = "amlogic,t9015";

				reg = <0x0 0x32000 0x0 0x14>;

				#sound-dai-cells = <0>;

				sound-name-prefix = "ACODEC";

				clocks = <&clkc CLKID_AUDIO_CODEC>;

				clock-names = "pclk";

				resets = <&reset RESET_AUDIO_CODEC>;

				status = "disabled";

			};



			periphs: bus@34400 {

				compatible = "simple-bus";

				reg = <0x0 0x34400 0x0 0x400>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE