Unverified Commit 426082a2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Introduce MediaTek regulator coupler driver to ensure that the SRAM
voltage in par with the GPU voltage. This allows for a stable use of the
GPU.

mtk-mutex:
- add support for MT8188 vdosys0 path
- allow it to be build as module
- add support for MT8195 vdosys1 path

mmsys:
- add MT8188 vdosys0 path
- allow to be build as a module
- add MT8195 vdosys1 path
- add support for CMDQ
- allow for up to 64 reset bits
- add supprot for the MT8195 vppsys[0,1] pathes

pm-domains:
- keep power for the MT8186 ADSP on by default
- add support for MT8188
- add support for buck isolation needed in specific pm-domains for
  MT8188 and MT8192

mtk-svs:
- enable IRQ later to allow using kexec
- several improvments on the code base
- fix modalias

pmic wrapper:
- convert binding to yaml. As this is thightly coupled to the MT6357
  PMIC, I took patches regarding it as well.

* tag 'v6.2-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: (41 commits)
  soc: mediatek: mtk-svs: add missing MODULE_DEVICE_TABLE
  soc: mediatek: mtk-devapc: Switch to devm_clk_get_enabled()
  soc: mtk-svs: mt8183: refactor o_slope calculation
  soc: mediatek: mtk-svs: delete superfluous platform data entries
  soc: mediatek: mtk-svs: move svs_platform_probe into probe
  soc: mediatek: mtk-svs: improve readability of platform_probe
  soc: mediatek: mtk-svs: clean up platform probing
  soc: mediatek: mtk-svs: keep svs alive if CONFIG_DEBUG_FS not supported
  soc: mediatek: mtk-svs: Use pm_runtime_resume_and_get() in svs_init01()
  soc: mediatek: mtk-svs: reset svs when svs_resume() fail
  soc: mediatek: mtk-svs: restore default voltages when svs_init02() fail
  soc: mediatek: mmsys: add support for MT8195 VPPSYS
  dt-bindings: arm: mediatek: mmsys: Add support for MT8195 VPPSYS
  soc: mediatek: Introduce mediatek-regulator-coupler driver
  soc: mediatek: mtk-svs: Enable the IRQ later
  soc: mediatek: add mtk-mutex support for mt8195 vdosys1
  soc: mediatek: add mtk-mutex component - dp_intf1
  soc: mediatek: mmsys: add reset control for MT8195 vdosys1
  soc: mediatek: mmsys: add mmsys for support 64 reset bits
  soc: mediatek: add cmdq support of mtk-mmsys config API for mt8195 vdosys1
  ...

Link: https://lore.kernel.org/r/396d51fc-81f3-4a2b-d7a7-b966bfe3002a@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a64c36b8 6f42f5e7

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

+4 −0
Original line number Diff line number Diff line
@@ -31,7 +31,11 @@ properties: 
              - mediatek,mt8173-mmsys

              - mediatek,mt8183-mmsys

              - mediatek,mt8186-mmsys

              - mediatek,mt8188-vdosys0

              - mediatek,mt8192-mmsys

              - mediatek,mt8195-vdosys1

              - mediatek,mt8195-vppsys0

              - mediatek,mt8195-vppsys1

              - mediatek,mt8365-mmsys

          - const: syscon

Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
    enum:

      - mediatek,mt6323-keys

      - mediatek,mt6331-keys

      - mediatek,mt6357-keys

      - mediatek,mt6358-keys

      - mediatek,mt6397-keys

Documentation/devicetree/bindings/leds/leds-mt6323.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ MT6323 PMIC hardware. 
For MT6323 MFD bindings see:

Documentation/devicetree/bindings/mfd/mt6397.txt

For MediaTek PMIC wrapper bindings see:

Documentation/devicetree/bindings/soc/mediatek/pwrap.txt

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



Required properties:

- compatible : Must be "mediatek,mt6323-led"

Documentation/devicetree/bindings/mfd/mediatek,mt6357.yaml

0 → 100644
+111 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/mfd/mediatek,mt6357.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: MediaTek MT6357 PMIC



maintainers:

  - Flora Fu <flora.fu@mediatek.com>

  - Alexandre Mergnat <amergnat@baylibre.com>



description: |

  MT6357 is a power management system chip containing 5 buck

  converters and 29 LDOs. Supported features are audio codec,

  USB battery charging, fuel gauge, RTC



  This is a multifunction device with the following sub modules:

  - Regulator

  - RTC

  - Keys



  It is interfaced to host controller using SPI interface by a proprietary hardware

  called PMIC wrapper or pwrap. This MFD is a child device of pwrap.

  See the following for pwrap node definitions:

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



properties:

  compatible:

    const: mediatek,mt6357



  interrupts:

    maxItems: 1



  interrupt-controller: true



  "#interrupt-cells":

    const: 2



  regulators:

    type: object

    $ref: /schemas/regulator/mediatek,mt6357-regulator.yaml

    description:

      List of MT6357 BUCKs and LDOs regulators.



  rtc:

    type: object

    $ref: /schemas/rtc/rtc.yaml#

    description:

      MT6357 Real Time Clock.

    properties:

      compatible:

        const: mediatek,mt6357-rtc

      start-year: true

    required:

      - compatible



  keys:

    type: object

    $ref: /schemas/input/mediatek,pmic-keys.yaml

    description:

      MT6357 power and home keys.



required:

  - compatible

  - regulators



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    pwrap {

        pmic {

            compatible = "mediatek,mt6357";



            interrupt-parent = <&pio>;

            interrupts = <145 IRQ_TYPE_LEVEL_HIGH>;

            interrupt-controller;

            #interrupt-cells = <2>;



            regulators {

                mt6357_vproc_reg: buck-vproc {

                    regulator-name = "vproc";

                    regulator-min-microvolt = <518750>;

                    regulator-max-microvolt = <1312500>;

                    regulator-ramp-delay = <6250>;

                    regulator-enable-ramp-delay = <220>;

                    regulator-always-on;

                };



                // ...



                mt6357_vusb33_reg: ldo-vusb33 {

                    regulator-name = "vusb33";

                    regulator-min-microvolt = <3000000>;

                    regulator-max-microvolt = <3100000>;

                    regulator-enable-ramp-delay = <264>;

                };

            };



            rtc {

                compatible = "mediatek,mt6357-rtc";

            };



            keys {

                compatible = "mediatek,mt6357-keys";

            };

        };

    };

Documentation/devicetree/bindings/mfd/mt6397.txt

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ MT6397/MT6323 is a multifunction device with the following sub modules: 
It is interfaced to host controller using SPI interface by a proprietary hardware

called PMIC wrapper or pwrap. MT6397/MT6323 MFD is a child device of pwrap.

See the following for pwarp node definitions:

../soc/mediatek/pwrap.txt

../soc/mediatek/mediatek,pwrap.yaml



This document describes the binding for MFD device and its sub module.