Unverified Commit 17102e75 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mtk-dts64-for-v6.20' of... 

Merge tag 'mtk-dts64-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into soc/dt

MediaTek ARM64 Device Tree updates

This adds support for new boards and variants based on different
already supported MediaTek SoCs, and improves support for current
boards.

In particular:
 - New machines:
   - Ezurio Tungsten 510 (MediaTek Genio 510 SoC)
   - Ezurio Tungsten 700 (MediaTek Genio 700 SoC)

...improvements for already supported SoCs and machines:
 - MT7981b gains support for PCI-Express, USB, Ethernet and for
   the "GED" WiFi HW offload
   - OpenWRT One board gains support for the same
 - MT8188/8195/8390/8395 gains support for the DPI1 interface
   and HDMI output from the SoC's HDMI Tx controller along with
   its HDMI PHY and DDC IPs, usable on a selection of boards
   that expose a HDMI connector, namely:
   - All MT8390 Genio EVK based boards
   - All MT8395 Genio EVK based boards
   - Radxa NIO-12L (MT8395)

...and dtbs_check warning fixes for many of the MTK devicetrees,
including MT6795, MT7981, MT7986, MT7988, MT8173, MT8183, MT8186,
MT8188, MT8192, and a dts coding style fix for Airoha EN7581-EVB.

This also includes a fix for the new devicetree overlay warnings,
adding dtbs with applied overlays for all of the devices having
at least one overlay.

* tag 'mtk-dts64-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux

: (47 commits)
  arm64: dts: mediatek: mt8192: Rename mt8192-afe-pcm to audio-controller
  dt-bindings: arm: mediatek: audsys: Support mt8192-audsys variant
  arm64: dts: mediatek: mt7988a: Fix PCI-Express T-PHY node address
  arm64: dts: mediatek: mt8186-evb: Add vproc fixed regulator
  arm64: dts: mediatek: mt7981b-openwrt-one: Add address/size cells to eth
  arm64: dts: mediatek: mt8183-kukui: Clean up IT6505 regulator supply
  arm64: dts: mediatek: mt7986a: Change compatible for SafeXcel crypto
  arm64: dts: mediatek: mt8173-evb: Add interrupts to DA9211 regulator
  arm64: dts: mediatek: mt6795-xperia-m5: Rename PMIC leds node
  arm64: dts: mediatek: mt6795: Fix issues in SCPSYS node
  arm64: dts: mediatek: mt6331: Fix VCAM IO regulator name
  arm64: dts: mediatek: mt6795-xperia-m5: Add UHS pins for MMC1 and 2
  arm64: dts: mediatek: mt8192-asurada: Remove unused clock-stretch-ns
  arm64: dts: mediatek: mt8173-elm: Remove regulators from thermal node
  arm64: dts: mediatek: mt8173-elm: Fix dsi0 ports warning
  arm64: dts: mediatek: mt8173-elm: Fix bluetooth node name and reorder
  arm64: dts: mediatek: mt8183-pumpkin: Fix pinmux node names
  arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
  arm64: dts: mediatek: mt7981b-openwrt-one: Remove useless cells from flash@0
  arm64: dts: mediatek: mt8183-evb: Fix dtbs_check warnings
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 16ea3c96 25556c12

Documentation/devicetree/bindings/arm/mediatek.yaml

+2 −0
Original line number Diff line number Diff line
@@ -438,12 +438,14 @@ properties: 
          - const: mediatek,mt8365

      - items:

          - enum:

              - ezurio,mt8370-tungsten-smarc

              - grinn,genio-510-sbc

              - mediatek,mt8370-evk

          - const: mediatek,mt8370

          - const: mediatek,mt8188

      - items:

          - enum:

              - ezurio,mt8390-tungsten-smarc

              - grinn,genio-700-sbc

              - mediatek,mt8390-evk

          - const: mediatek,mt8390

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml

+33 −13
Original line number Diff line number Diff line
@@ -48,7 +48,20 @@ required: 
  - compatible

  - '#clock-cells'



if:

allOf:

 - if:

     properties:

       compatible:

         contains:

           enum:

             - mediatek,mt2701-audsys

             - mediatek,mt7622-audsys

   then:

     properties:

       audio-controller:

         $ref: /schemas/sound/mediatek,mt2701-audio.yaml#



 - if:

     properties:

       compatible:

         contains:
@@ -57,10 +70,17 @@ then: 
     properties:

       audio-controller:

         $ref: /schemas/sound/mediatek,mt8183-audio.yaml#

else:



 - if:

     properties:

       compatible:

         contains:

           const: mediatek,mt8192-audsys

   then:

     properties:

       audio-controller:

      $ref: /schemas/sound/mediatek,mt2701-audio.yaml#

         $ref: /schemas/sound/mt8192-afe-pcm.yaml#





additionalProperties: false

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -557,6 +557,8 @@ patternProperties: 
    description: Exegin Technologies Limited

  "^ezchip,.*":

    description: EZchip Semiconductor

  "^ezurio,.*":

    description: Ezurio LLC

  "^facebook,.*":

    description: Facebook

  "^fairchild,.*":

arch/arm64/boot/dts/airoha/en7581-evb.dts

+3 −3
Original line number Diff line number Diff line
@@ -47,17 +47,17 @@ tclinux@600000 { 
			reg = <0x00600000 0x03200000>;

		};



		tclinux_slave@3800000 {

		tclinux-slave@3800000 {

			label = "tclinux_alt";

			reg = <0x03800000 0x03200000>;

		};



		rootfs_data@6a00000 {

		rootfs-data@6a00000 {

			label = "rootfs_data";

			reg = <0x06a00000 0x01400000>;

		};



		reserved_bmt@7e00000 {

		reserved-bmt@7e00000 {

			label = "reserved_bmt";

			reg = <0x07e00000 0x00200000>;

			read-only;

arch/arm64/boot/dts/mediatek/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -159,10 +159,12 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-evb.dtb 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8365-evk.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8370-genio-510-evk.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8370-grinn-genio-510-sbc.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8370-tungsten-smarc.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8395-genio-1200-evk.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8395-genio-1200-evk-ufs.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8390-genio-700-evk.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8390-grinn-genio-700-sbc.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8390-tungsten-smarc.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8395-kontron-3-5-sbc-i1200.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8395-radxa-nio-12l.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8395-radxa-nio-12l-8-hd-panel.dtbo