Commit 7d534c3a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.12-next-dts64' of... 

Merge tag 'v5.12-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt

- add trivial bindings for MT8195
- fix dtbs_check warnings
- add pinmux for build-in Wifi on MT7622 evaluation borad

MT8183:
- fix USB wakeup register
- add regulator for EVB board
- add registers to mailbox consumers
- add thermal zone and trip points for CPU cooling
- Add new boards:
  * ASUS Chromebook Flip CM3
  * ASUS Chromebook Detachable CM3
  * Acer Chromebook Spin 311
  * Lenovo 10e Chromebook Tablet

MT8173:
- fix PHY property in DSI
- fix power-domain for PMIC wrapper

Pumkin:
- add MT8516 based board
- add MT8183 based board
- fix reset pin for MT8167 and MT8516 based boards

* tag 'v5.12-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: (29 commits)
  arm64: dts: mediatek: fix reset GPIO level on pumpkin
  arm64: dts: mt8183: add mt8183 pumpkin board
  dt-bindings: arm64: dts: mediatek: Add mt8183-pumpkin board
  arm64: dts: mt8183: Add kukui kodama board
  arm64: dts: mt8183: Add kukui kakadu board
  dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-kodama
  dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-kakadu
  dt-bindings: arm64: dts: mediatek: Add mt8516-pumpkin board
  arm64: dts: mt7622: add ePA/eLNA pinmux for built-in WiFi
  dt-bindings: nvmem: mediatek: add support for MediaTek mt8192 SoC
  arm64: dts: mt8173: fix wrong power-domain phandle of pmic
  arm64: dts: mt8183: Configure CPU cooling
  arm64: dts: mt8183: add thermal zone node
  arm64: dts: mt8183: Add gce client reg for display subcomponents
  arm64: dts: mediatek: mt8183: fix dtbs_check warning
  arm64: dts: mediatek: mt7622: harmonize node names and compatibles
  arm64: dts: mediatek: mt8516: harmonize node names and compatibles
  arm64: dts: mediatek: mt2712: harmonize node names
  arm64: dts: mediatek: mt8173: fix dtbs_check warning
  arm64: dts: mt8173: fix property typo of 'phys' in dsi node
  ...

Link: https://lore.kernel.org/r/d1121630-5778-0955-fac7-f921174defe7@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8028548b a7dceafe

Documentation/devicetree/bindings/arm/mediatek.yaml

+36 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ properties: 
          - enum:

              - mediatek,mt8183-evb

          - const: mediatek,mt8183

      - items:

          - enum:

              - mediatek,mt8195-evb

          - const: mediatek,mt8195

      - description: Google Krane (Lenovo IdeaPad Duet, 10e,...)

        items:

          - enum:
@@ -125,6 +129,38 @@ properties: 
              - google,krane-sku176

          - const: google,krane

          - const: mediatek,mt8183

      - description: Google Damu (ASUS Chromebook Flip CM3)

        items:

          - const: google,damu

          - const: mediatek,mt8183

      - description: Google Juniper (Acer Chromebook Spin 311)

        items:

          - const: google,juniper-sku16

          - const: google,juniper

          - const: mediatek,mt8183

      - description: Google Kakadu (ASUS Chromebook Detachable CM3)

        items:

          - const: google,kakadu-rev3

          - const: google,kakadu-rev2

          - const: google,kakadu

          - const: mediatek,mt8183

      - description: Google Kodama (Lenovo 10e Chromebook Tablet)

        items:

          - enum:

              - google,kodama-sku16

              - google,kodama-sku272

              - google,kodama-sku288

              - google,kodama-sku32

          - const: google,kodama

          - const: mediatek,mt8183

      - items:

          - enum:

              - mediatek,mt8183-pumpkin

          - const: mediatek,mt8183

      - items:

          - enum:

              - mediatek,mt8516-pumpkin

          - const: mediatek,mt8516



additionalProperties: true

Documentation/devicetree/bindings/nvmem/mtk-efuse.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
	      "mediatek,mt7622-efuse", "mediatek,efuse": for MT7622

	      "mediatek,mt7623-efuse", "mediatek,efuse": for MT7623

	      "mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173

	      "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192

	      "mediatek,mt8516-efuse", "mediatek,efuse": for MT8516

- reg: Should contain registers location and length

Documentation/devicetree/bindings/serial/mtk-uart.txt

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Required properties: 
  * "mediatek,mt8173-uart" for MT8173 compatible UARTS

  * "mediatek,mt8183-uart", "mediatek,mt6577-uart" for MT8183 compatible UARTS

  * "mediatek,mt8192-uart", "mediatek,mt6577-uart" for MT8192 compatible UARTS

  * "mediatek,mt8195-uart", "mediatek,mt6577-uart" for MT8195 compatible UARTS

  * "mediatek,mt8516-uart" for MT8516 compatible UARTS

  * "mediatek,mt6577-uart" for MT6577 and all of the above

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Required properties: 
	For those SoCs that use SYST

	* "mediatek,mt8183-timer" for MT8183 compatible timers (SYST)

	* "mediatek,mt8192-timer" for MT8192 compatible timers (SYST)

	* "mediatek,mt8195-timer" for MT8195 compatible timers (SYST)

	* "mediatek,mt7629-timer" for MT7629 compatible timers (SYST)

	* "mediatek,mt6765-timer" for MT6765 and all above compatible timers (SYST)

arch/arm64/boot/dts/mediatek/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -13,7 +13,15 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana-rev7.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-damu.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-juniper-sku16.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kakadu.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku16.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku272.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku288.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku32.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku0.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku176.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-pumpkin.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8516-pumpkin.dtb