Unverified Commit aaeb1b63 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.4-next-soc' of... 

Merge tag 'v6.4-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into soc/drivers

PMIC wrapper
- support companion device
- add support for MT6795

SPMI:
- add support for MT8186

SVS:
- change gpu node name to match binding

* tag 'v6.4-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  soc: mediatek: remove DDP_DOMPONENT_DITHER from enum
  soc: mediatek: SVS: Fix MT8192 GPU node name
  soc: mediatek: mtk-mutex: Remove unnecessary .owner
  dt-bindings: phy: mediatek,dsi-phy: Add compatible for MT6795 Helio X10
  dt-bindings: pwm: Add compatible for MediaTek MT6795
  dt-bindings: spmi: spmi-mtk-pmif: Document mediatek,mt8195-spmi as fallback of mediatek,mt8186-spmi
  soc: mediatek: pwrap: Add support for MT6795 Helio X10
  soc: mediatek: mtk-pmic-wrap: Add support for MT6331 w/ MT6332 companion
  soc: mediatek: mtk-pmic-wrap: Add support for companion PMICs
  soc: mediatek: pwrap: Add kerneldoc for struct pwrap_slv_type
  soc: mediatek: pwrap: Move PMIC read test sequence in function
  dt-bindings: soc: mediatek: pwrap: Add compatible for MT6795 Helio X10

Link: https://lore.kernel.org/r/1ed1e5ae-6305-e63a-84a0-3c43f69c8f8b@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a08000d5 21d4631e

Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ properties: 
          - enum:

              - mediatek,mt7623-mipi-tx

          - const: mediatek,mt2701-mipi-tx

      - items:

          - enum:

              - mediatek,mt6795-mipi-tx

          - const: mediatek,mt8173-mipi-tx

      - items:

          - enum:

              - mediatek,mt8365-mipi-tx

Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml

+3 −1
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ properties: 
          - mediatek,mt8173-disp-pwm

          - mediatek,mt8183-disp-pwm

      - items:

          - const: mediatek,mt8167-disp-pwm

          - enum:

              - mediatek,mt6795-disp-pwm

              - mediatek,mt8167-disp-pwm

          - const: mediatek,mt8173-disp-pwm

      - items:

          - enum:

Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
              - mediatek,mt2701-pwrap

              - mediatek,mt6765-pwrap

              - mediatek,mt6779-pwrap

              - mediatek,mt6795-pwrap

              - mediatek,mt6797-pwrap

              - mediatek,mt6873-pwrap

              - mediatek,mt7622-pwrap

Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml

+8 −3
Original line number Diff line number Diff line
@@ -18,9 +18,14 @@ allOf: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - mediatek,mt6873-spmi

          - mediatek,mt8195-spmi

      - items:

          - enum:

              - mediatek,mt8186-spmi

          - const: mediatek,mt8195-spmi



  reg:

    maxItems: 2

drivers/soc/mediatek/mtk-mutex.c

+0 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,6 @@ static struct platform_driver mtk_mutex_driver = { 
	.probe		= mtk_mutex_probe,

	.driver		= {

		.name	= "mediatek-mutex",

		.owner	= THIS_MODULE,

		.of_match_table = mutex_driver_dt_match,

	},

};