]> Git Repo - J-linux.git/commitdiff
Merge tag 'mfd-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
authorLinus Torvalds <[email protected]>
Fri, 7 Oct 2022 18:24:20 +0000 (11:24 -0700)
committerLinus Torvalds <[email protected]>
Fri, 7 Oct 2022 18:24:20 +0000 (11:24 -0700)
Pull MFD updates from Lee Jones:
 "Core Frameworks:
   - Fix 'mfd_of_node_list' OF node entry resource leak

  New Drivers:
   - Add support for Ocelot VSC7512 Networking Chip
   - Add support for MediaTek MT6370 subPMIC
   - Add support for Richtek RT5120 (I2C) PMIC

  New Device Support:
   - Add support for Rockchip RV1126 and RK3588 to Syscon
   - Add support for Rockchip RK817 Battery Charger to RK808
   - Add support for Silergy SY7636a Voltage Regulator to Simple MFD
   - Add support for Qualcomm PMP8074 PMIC to QCOM SPMI
   - Add support for Secure Update to Intel M10 BMC

  New Functionality:
   - Provide SSP type to Intel's LPSS (PCI) SPI driver

  Fix-ups:
   - Remove legacy / unused code; stmpe, intel_soc_pmic_crc, syscon
   - Unify / simplify; intel_soc_pmic_crc
   - Trivial reordering / spelling, etc; Makefile, twl-core
   - Convert to managed resources; intel_soc_pmic_crc
   - Use appropriate APIs; intel_soc_pmic_crc
   - strscpy() conversion; htc-i2cpld, lpc_ich, mfd-core
   - GPIOD conversion; htc-i2cpld, stmpe
   - Add missing header file includes; twl4030-irq
   - DT goodies; stmpe, mediatek,mt6370, x-powers,axp152,
     aspeed,ast2x00-scu, mediatek,mt8195-scpsys, qcom,spmi-pmic, syscon,
     qcom,tcsr, rockchip,rk817, sprd,ums512-glbreg, dlg,da9063

  Bug Fixes:
   - Properly check return values; sm501, htc-i2cpld
   - Repair Two-Wire Bus Mode; da9062-core
   - Fix error handling; intel_soc_pmic_core, fsl-imx25-tsadc, lp8788,
     lp8788-irq"

* tag 'mfd-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (60 commits)
  mfd: syscon: Remove repetition of the regmap_get_val_endian()
  mfd: ocelot-spi: Add missing MODULE_DEVICE_TABLE
  power: supply: Add charger driver for Rockchip RK817
  dt-bindings: mfd: mt6370: Fix the indentation in the example
  mfd: da9061: Fix Failed to set Two-Wire Bus Mode.
  mfd: htc-i2cpld: Fix an IS_ERR() vs NULL bug in htcpld_core_probe()
  dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018
  mfd: sm501: Add check for platform_driver_register()
  dt-bindings: mfd: mediatek: Add scpsys compatible for mt8186
  mfd: twl4030: Add missed linux/device.h header
  dt-bindings: mfd: dlg,da9063: Add missing regulator patterns
  dt-bindings: mfd: sprd: Add bindings for ums512 global registers
  mfd: intel_soc_pmic_chtdc_ti: Switch from __maybe_unused to pm_sleep_ptr() etc
  dt-bindings: mfd: syscon: Add rk3588 QoS register compatible
  mfd: stmpe: Switch to using gpiod API
  mfd: qcom-spmi-pmic: Add pm7250b compatible
  dt-bindings: mfd: Add missing (unevaluated|additional)Properties on child nodes
  mfd/omap1: htc-i2cpld: Convert to a pure GPIO driver
  mfd: intel-m10-bmc: Add d5005 bmc secure update driver
  dt-bindings: mfd: syscon: Drop ref from reg-io-width
  ...

1  2 
Documentation/devicetree/bindings/mfd/syscon.yaml
Documentation/devicetree/bindings/power/mediatek,power-controller.yaml
MAINTAINERS
drivers/hwmon/Kconfig
drivers/mfd/da9062-core.c
drivers/mfd/intel_soc_pmic_crc.c
drivers/mfd/lp8788.c
drivers/mfd/rk808.c
drivers/mfd/twl-core.c
drivers/regulator/Kconfig

index 5cbf2c5978b3aa5db7b8f53258352788981c0f0e,e29dd98b82cee448095dab8c87426ce5dce2b7c9..4fc483b1aee76718a885f0bf10df7f5fa07a5375
@@@ -40,8 -40,6 +40,8 @@@ properties
                - allwinner,sun50i-a64-system-controller
                - brcm,cru-clkset
                - freecom,fsg-cs2-system-controller
 +              - fsl,imx93-aonmix-ns-syscfg
 +              - fsl,imx93-wakeupmix-syscfg
                - hisilicon,dsa-subctrl
                - hisilicon,hi6220-sramctrl
                - hisilicon,pcie-sas-subctrl
@@@ -61,6 -59,8 +61,8 @@@
                - rockchip,rk3368-qos
                - rockchip,rk3399-qos
                - rockchip,rk3568-qos
+               - rockchip,rk3588-qos
+               - rockchip,rv1126-qos
                - samsung,exynos3-sysreg
                - samsung,exynos4-sysreg
                - samsung,exynos5-sysreg
@@@ -73,7 -73,7 +75,7 @@@
        - contains:
            const: syscon
          minItems: 2
-         maxItems: 4  # Should be enough
+         maxItems: 5  # Should be enough
  
    reg:
      maxItems: 1
@@@ -82,7 -82,6 +84,6 @@@
      description: |
        The size (in bytes) of the IO accesses that should be performed
        on the device.
-     $ref: /schemas/types.yaml#/definitions/uint32
      enum: [1, 2, 4, 8]
  
    hwlocks:
@@@ -94,6 -93,18 +95,18 @@@ required
    - compatible
    - reg
  
+ allOf:
+   - if:
+       properties:
+         compatible:
+           contains:
+             const: simple-mfd
+     then:
+       properties:
+         compatible:
+           minItems: 3
+           maxItems: 5
  additionalProperties: true
  
  examples:
index 03b7f6aa591d4ebc5b6d2efe87dabd0e5a3febb9,9ceb2b28af36e3fd7b71d0b8e7c4e8209bc235e0..605ec7ab5f6331847f53c0a91da533fcfd376d01
@@@ -7,7 -7,7 +7,7 @@@ $schema: http://devicetree.org/meta-sch
  title: Mediatek Power Domains Controller
  
  maintainers:
 -  - Weiyi Lu <weiyi.l[email protected]>
 +  - MandyJH Liu <mandyjh.li[email protected]>
    - Matthias Brugger <[email protected]>
  
  description: |
@@@ -19,7 -19,7 +19,7 @@@
  
  properties:
    $nodename:
 -    const: power-controller
 +    pattern: '^power-controller(@[0-9a-f]+)?$'
  
    compatible:
      enum:
  
  patternProperties:
    "^power-domain@[0-9a-f]+$":
 +    $ref: "#/$defs/power-domain-node"
 +    patternProperties:
 +      "^power-domain@[0-9a-f]+$":
 +        $ref: "#/$defs/power-domain-node"
 +        patternProperties:
 +          "^power-domain@[0-9a-f]+$":
 +            $ref: "#/$defs/power-domain-node"
 +            patternProperties:
 +              "^power-domain@[0-9a-f]+$":
 +                $ref: "#/$defs/power-domain-node"
 +                unevaluatedProperties: false
 +            unevaluatedProperties: false
 +        unevaluatedProperties: false
 +    unevaluatedProperties: false
 +
 +$defs:
 +  power-domain-node:
      type: object
      description: |
        Represents the power domains within the power controller node as documented
          $ref: /schemas/types.yaml#/definitions/phandle
          description: phandle to the device containing the SMI register range.
  
 -    patternProperties:
 -      "^power-domain@[0-9a-f]+$":
 -        type: object
 -        description: |
 -          Represents a power domain child within a power domain parent node.
 -
 -        properties:
 -
 -          '#power-domain-cells':
 -            description:
 -              Must be 0 for nodes representing a single PM domain and 1 for nodes
 -              providing multiple PM domains.
 -
 -          '#address-cells':
 -            const: 1
 -
 -          '#size-cells':
 -            const: 0
 -
 -          reg:
 -            maxItems: 1
 -
 -          clocks:
 -            description: |
 -              A number of phandles to clocks that need to be enabled during domain
 -              power-up sequencing.
 -
 -          clock-names:
 -            description: |
 -              List of names of clocks, in order to match the power-up sequencing
 -              for each power domain we need to group the clocks by name. BASIC
 -              clocks need to be enabled before enabling the corresponding power
 -              domain, and should not have a '-' in their name (i.e mm, mfg, venc).
 -              SUSBYS clocks need to be enabled before releasing the bus protection,
 -              and should contain a '-' in their name (i.e mm-0, isp-0, cam-0).
 -
 -              In order to follow properly the power-up sequencing, the clocks must
 -              be specified by order, adding first the BASIC clocks followed by the
 -              SUSBSYS clocks.
 -
 -          domain-supply:
 -            description: domain regulator supply.
 -
 -          mediatek,infracfg:
 -            $ref: /schemas/types.yaml#/definitions/phandle
 -            description: phandle to the device containing the INFRACFG register range.
 -
 -          mediatek,smi:
 -            $ref: /schemas/types.yaml#/definitions/phandle
 -            description: phandle to the device containing the SMI register range.
 -
 -        patternProperties:
 -          "^power-domain@[0-9a-f]+$":
 -            type: object
 -            description: |
 -              Represents a power domain child within a power domain parent node.
 -
 -            properties:
 -
 -              '#power-domain-cells':
 -                description:
 -                  Must be 0 for nodes representing a single PM domain and 1 for nodes
 -                  providing multiple PM domains.
 -
 -              '#address-cells':
 -                const: 1
 -
 -              '#size-cells':
 -                const: 0
 -
 -              reg:
 -                maxItems: 1
 -
 -              clocks:
 -                description: |
 -                  A number of phandles to clocks that need to be enabled during domain
 -                  power-up sequencing.
 -
 -              clock-names:
 -                description: |
 -                  List of names of clocks, in order to match the power-up sequencing
 -                  for each power domain we need to group the clocks by name. BASIC
 -                  clocks need to be enabled before enabling the corresponding power
 -                  domain, and should not have a '-' in their name (i.e mm, mfg, venc).
 -                  SUSBYS clocks need to be enabled before releasing the bus protection,
 -                  and should contain a '-' in their name (i.e mm-0, isp-0, cam-0).
 -
 -                  In order to follow properly the power-up sequencing, the clocks must
 -                  be specified by order, adding first the BASIC clocks followed by the
 -                  SUSBSYS clocks.
 -
 -              domain-supply:
 -                description: domain regulator supply.
 -
 -              mediatek,infracfg:
 -                $ref: /schemas/types.yaml#/definitions/phandle
 -                description: phandle to the device containing the INFRACFG register range.
 -
 -              mediatek,smi:
 -                $ref: /schemas/types.yaml#/definitions/phandle
 -                description: phandle to the device containing the SMI register range.
 -
 -            required:
 -              - reg
 -
 -            additionalProperties: false
 -
 -        required:
 -          - reg
 -
 -        additionalProperties: false
 -
      required:
        - reg
  
 -    additionalProperties: false
 -
  required:
    - compatible
  
@@@ -135,7 -232,7 +135,7 @@@ examples
          #size-cells = <2>;
  
          scpsys: syscon@10006000 {
-             compatible = "syscon", "simple-mfd";
+             compatible = "mediatek,mt8173-scpsys", "syscon", "simple-mfd";
              reg = <0 0x10006000 0 0x1000>;
  
              spm: power-controller {
diff --combined MAINTAINERS
index 43ba66d26a30d61b37d2af8611e8471d304cc827,b533ef85db35a04cf67c80a8e554274f89b666ea..a79d3f97a91439c5db068604789234e1c06a3e7d
@@@ -348,6 -348,7 +348,6 @@@ M: "Rafael J. Wysocki" <[email protected]
  R:    Len Brown <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linux-acpi
  Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  B:    https://bugzilla.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
@@@ -426,6 -427,7 +426,6 @@@ M: Rafael J. Wysocki <[email protected]
  R:    Zhang Rui <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linux-acpi
  B:    https://bugzilla.kernel.org
  F:    drivers/acpi/*thermal*
  
@@@ -669,8 -671,7 +669,8 @@@ F: fs/afs
  F:    include/trace/events/afs.h
  
  AGPGART DRIVER
 -M:    David Airlie <[email protected]>
 +M:    David Airlie <[email protected]>
 +L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm
  F:    drivers/char/agp/
@@@ -748,12 -749,6 +748,12 @@@ S:       Supporte
  F:    drivers/infiniband/hw/erdma
  F:    include/uapi/rdma/erdma-abi.h
  
 +ALIBABA PMU DRIVER
 +M:    Shuai Xue <[email protected]>
 +S:    Supported
 +F:    Documentation/admin-guide/perf/alibaba_pmu.rst
 +F:    drivers/perf/alibaba_uncore_dwr_pmu.c
 +
  ALIENWARE WMI DRIVER
  L:    [email protected]
  S:    Maintained
@@@ -825,13 -820,6 +825,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/staging/media/sunxi/cedrus/
  
 +ALLWINNER DMIC DRIVERS
 +M:    Ban Tao <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml
 +F:    sound/soc/sunxi/sun50i-dmic.c
 +
  ALPHA PORT
  M:    Richard Henderson <[email protected]>
  M:    Ivan Kokshaysky <[email protected]>
@@@ -890,13 -878,6 +890,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/altera/
  
 +ALTERA TSE PCS
 +M:    Maxime Chevallier <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/pcs/pcs-altera-tse.c
 +F:    include/linux/pcs-altera-tse.h
 +
  ALTERA UART/JTAG UART SERIAL DRIVERS
  M:    Tobias Klauser <[email protected]>
  L:    [email protected]
@@@ -1029,6 -1010,7 +1029,6 @@@ F:      drivers/spi/spi-amd.
  
  AMD MP2 I2C DRIVER
  M:    Elie Morisse <[email protected]>
 -M:    Nehal Shah <[email protected]>
  M:    Shyam Sundar S K <[email protected]>
  L:    [email protected]
  S:    Maintained
  S:    Maintained
  F:    drivers/platform/x86/amd/pmc.c
  
 +AMD PMF DRIVER
 +M:    Shyam Sundar S K <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-amd-pmf
 +F:    drivers/platform/x86/amd/pmf/
 +
  AMD HSMP DRIVER
  M:    Naveen Krishna Chatradhi <[email protected]>
  R:    Carlos Bilbao <[email protected]>
@@@ -1070,7 -1045,6 +1070,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/admin-guide/pm/amd-pstate.rst
  F:    drivers/cpufreq/amd-pstate*
 +F:    include/linux/amd-pstate.h
  F:    tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
  
  AMD PTDMA DRIVER
@@@ -1360,15 -1334,6 +1360,15 @@@ F:    drivers/iio/amplifiers/hmc425a.
  F:    drivers/staging/iio/*/ad*
  X:    drivers/iio/*/adjd*
  
 +ANALOG DEVICES INC MAX31760 DRIVER
 +M:    Ibrahim Tilki <[email protected]>
 +S:    Maintained
 +W:    http://wiki.analog.com/
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/hwmon/adi,max31760.yaml
 +F:    Documentation/hwmon/max31760.rst
 +F:    drivers/hwmon/max31760.c
 +
  ANALOGBITS PLL LIBRARIES
  M:    Paul Walmsley <[email protected]>
  S:    Supported
@@@ -1838,7 -1803,7 +1838,7 @@@ N:      sun[x456789]
  N:    sun50i
  
  ARM/Amlogic Meson SoC CLOCK FRAMEWORK
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  M:    Jerome Brunet <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -1863,7 -1828,7 +1863,7 @@@ F:      Documentation/devicetree/bindings/so
  F:    sound/soc/meson/
  
  ARM/Amlogic Meson SoC support
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  M:    Kevin Hilman <[email protected]>
  R:    Jerome Brunet <[email protected]>
  R:    Martin Blumenstingl <[email protected]>
@@@ -1934,15 -1899,6 +1934,15 @@@ F:    include/dt-bindings/pinctrl/apple.
  F:    include/linux/apple-mailbox.h
  F:    include/linux/soc/apple/*
  
 +ARM/APPLE MACHINE SOUND DRIVERS
 +M:    Martin PoviÅ¡er <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/apple,*
 +F:    sound/soc/apple/*
 +F:    sound/soc/codecs/cs42l83-i2c.c
 +
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <[email protected]>
  M:    Lars Persson <[email protected]>
@@@ -2222,7 -2178,7 +2222,7 @@@ M:      Jean-Marie Verdun <[email protected]
  M:    Nick Hawkins <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/hpe,gxp.yaml
 -F:    Documentation/devicetree/bindings/spi/hpe,gxp-spi.yaml
 +F:    Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
  F:    Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
  F:    arch/arm/boot/dts/hpe-bmc*
  F:    arch/arm/boot/dts/hpe-gxp*
@@@ -2438,7 -2394,6 +2438,7 @@@ N:      atme
  ARM/Microchip Sparx5 SoC support
  M:    Lars Povlsen <[email protected]>
  M:    Steen Hegelund <[email protected]>
 +M:    Daniel Machon <[email protected]>
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -2576,7 -2531,7 +2576,7 @@@ W:      http://www.digriz.org.uk/ts78xx/kern
  F:    arch/arm/mach-orion5x/ts78xx-*
  
  ARM/OXNAS platform support
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2624,7 -2579,7 +2624,7 @@@ W:      http://www.armlinux.org.uk
  
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <[email protected]>
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  R:    Konrad Dybcio <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -2633,7 -2588,6 +2633,7 @@@ F:      Documentation/devicetree/bindings/*/
  F:    Documentation/devicetree/bindings/soc/qcom/
  F:    arch/arm/boot/dts/qcom-*.dts
  F:    arch/arm/boot/dts/qcom-*.dtsi
 +F:    arch/arm/configs/qcom_defconfig
  F:    arch/arm/mach-qcom/
  F:    arch/arm64/boot/dts/qcom/
  F:    drivers/*/*/qcom*
@@@ -2696,7 -2650,7 +2696,7 @@@ F:      arch/arm/boot/dts/rtd
  F:    arch/arm/mach-realtek/
  F:    arch/arm64/boot/dts/realtek/
  
 -ARM/RENESAS ARM64 ARCHITECTURE
 +ARM/RENESAS ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
  M:    Magnus Damm <[email protected]>
  L:    [email protected]
@@@ -2707,16 -2661,6 +2707,16 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
  F:    Documentation/devicetree/bindings/soc/renesas/
 +F:    arch/arm/boot/dts/emev2*
 +F:    arch/arm/boot/dts/gr-peach*
 +F:    arch/arm/boot/dts/iwg20d-q7*
 +F:    arch/arm/boot/dts/r7s*
 +F:    arch/arm/boot/dts/r8a*
 +F:    arch/arm/boot/dts/r9a*
 +F:    arch/arm/boot/dts/sh*
 +F:    arch/arm/configs/shmobile_defconfig
 +F:    arch/arm/include/debug/renesas-scif.S
 +F:    arch/arm/mach-shmobile/
  F:    arch/arm64/boot/dts/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
@@@ -2726,6 -2670,7 +2726,6 @@@ M:      Russell King <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    http://www.armlinux.org.uk/
 -F:    arch/arm/include/asm/hardware/entry-macro-iomd.S
  F:    arch/arm/include/asm/hardware/ioc.h
  F:    arch/arm/include/asm/hardware/iomd.h
  F:    arch/arm/include/asm/hardware/memc.h
  S:    Maintained
  F:    drivers/media/platform/samsung/s5p-mfc/
  
 -ARM/SHMOBILE ARM ARCHITECTURE
 -M:    Geert Uytterhoeven <[email protected]>
 -M:    Magnus Damm <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
 -C:    irc://irc.libera.chat/renesas-soc
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
 -F:    Documentation/devicetree/bindings/arm/renesas.yaml
 -F:    Documentation/devicetree/bindings/soc/renesas/
 -F:    arch/arm/boot/dts/emev2*
 -F:    arch/arm/boot/dts/gr-peach*
 -F:    arch/arm/boot/dts/iwg20d-q7*
 -F:    arch/arm/boot/dts/r7s*
 -F:    arch/arm/boot/dts/r8a*
 -F:    arch/arm/boot/dts/r9a*
 -F:    arch/arm/boot/dts/sh*
 -F:    arch/arm/configs/shmobile_defconfig
 -F:    arch/arm/include/debug/renesas-scif.S
 -F:    arch/arm/mach-shmobile/
 -F:    drivers/soc/renesas/
 -F:    include/linux/soc/renesas/
 -
  ARM/SOCFPGA ARCHITECTURE
  M:    Dinh Nguyen <[email protected]>
  S:    Maintained
@@@ -3119,8 -3087,6 +3119,8 @@@ W:      http://wiki.xilinx.co
  T:    git https://github.com/Xilinx/linux-xlnx.git
  F:    Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
  F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
 +F:    Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml
  F:    Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/clocksource/timer-cadence-ttc.c
  S:    Maintained
  F:    drivers/hwmon/asus_wmi_sensors.c
  
 -ASUS WMI EC HARDWARE MONITOR DRIVER
 -M:    Eugene Shalygin <[email protected]>
 -M:    Denis Pauk <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/hwmon/asus_wmi_ec_sensors.c
 -
  ASUS EC HARDWARE MONITOR DRIVER
  M:    Eugene Shalygin <[email protected]>
  L:    [email protected]
@@@ -3639,7 -3612,6 +3639,7 @@@ F:      include/linux/find.
  F:    include/linux/nodemask.h
  F:    lib/bitmap.c
  F:    lib/cpumask.c
 +F:    lib/cpumask_kunit.c
  F:    lib/find_bit.c
  F:    lib/find_bit_benchmark.c
  F:    lib/test_bitmap.c
@@@ -3707,7 -3679,6 +3707,7 @@@ F:      Documentation/networking/bonding.rs
  F:    drivers/net/bonding/
  F:    include/net/bond*
  F:    include/uapi/linux/if_bonding.h
 +F:    tools/testing/selftests/drivers/net/bonding/
  
  BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
  M:    Dan Robertson <[email protected]>
@@@ -3852,7 -3823,6 +3852,7 @@@ F:      kernel/bpf/dispatcher.
  F:    kernel/bpf/trampoline.c
  F:    include/linux/bpf*
  F:    include/linux/filter.h
 +F:    include/linux/tnum.h
  
  BPF [BTF]
  M:    Martin KaFai Lau <[email protected]>
@@@ -3978,7 -3948,6 +3978,7 @@@ M:      William Zhang <william.zhang@broadco
  M:    Anand Gore <[email protected]>
  M:    Kursad Oney <[email protected]>
  M:    Florian Fainelli <[email protected]>
 +M:    RafaÅ‚ MiÅ‚ecki <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -4925,7 -4894,6 +4925,7 @@@ M:      Prashant Malani <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/chrome/cros_ec_typec.c
 +F:    drivers/platform/chrome/cros_typec_switch.c
  
  CHROMEOS EC USB PD NOTIFY DRIVER
  M:    Prashant Malani <[email protected]>
@@@ -5177,7 -5145,6 +5177,7 @@@ T:      git git://git.samba.org/sfrench/cifs
  F:    Documentation/admin-guide/cifs/
  F:    fs/cifs/
  F:    fs/smbfs_common/
 +F:    include/uapi/linux/cifs
  
  COMPACTPCI HOTPLUG CORE
  M:    Scott Murray <[email protected]>
@@@ -5275,7 -5242,6 +5275,7 @@@ F:      block/blk-throttle.
  F:    include/linux/blk-cgroup.h
  
  CONTROL GROUP - CPUSET
 +M:    Waiman Long <[email protected]>
  M:    Zefan Li <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5404,8 -5370,8 +5404,8 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/cpuidle/cpuidle-big_little.c
  
  CPUIDLE DRIVER - ARM EXYNOS
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  M:    Daniel Lezcano <[email protected]>
 +R:    Krzysztof Kozlowski <[email protected]>
  M:    Kukjin Kim <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -5753,6 -5719,13 +5753,6 @@@ F:     include/linux/tfrc.
  F:    include/uapi/linux/dccp.h
  F:    net/dccp/
  
 -DECnet NETWORK LAYER
 -L:    [email protected]
 -S:    Orphan
 -W:    http://linux-decnet.sourceforge.net
 -F:    Documentation/networking/decnet.rst
 -F:    net/decnet/
 -
  DECSTATION PLATFORM SUPPORT
  M:    "Maciej W. Rozycki" <[email protected]>
  L:    [email protected]
@@@ -6205,7 -6178,7 +6205,7 @@@ F:      Documentation/devicetree/bindings/me
  F:    drivers/memory/samsung/exynos5422-dmc.c
  
  DME1737 HARDWARE MONITOR DRIVER
 -M:    Juerg Haefliger <juergh@gmail.com>
 +M:    Juerg Haefliger <juergh@proton.me>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/dme1737.rst
@@@ -6445,11 -6418,6 +6445,11 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
  F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
 +DRM DRIVER FOR GENERIC EDP PANELS
 +R:    Douglas Anderson <[email protected]>
 +F:    Documentation/devicetree/bindings/display/panel/panel-edp.yaml
 +F:    drivers/gpu/drm/panel/panel-edp.c
 +
  DRM DRIVER FOR GENERIC USB DISPLAY
  M:    Noralf Trønnes <[email protected]>
  S:    Maintained
@@@ -6782,7 -6750,7 +6782,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/panel/panel-widechips-ws2401.c
  
  DRM DRIVERS
 -M:    David Airlie <airlied@linux.ie>
 +M:    David Airlie <airlied@gmail.com>
  M:    Daniel Vetter <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -6821,7 -6789,7 +6821,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/sun4i/
  
  DRM DRIVERS FOR AMLOGIC SOCS
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -6843,7 -6811,7 +6843,7 @@@ F:      drivers/gpu/drm/atmel-hlcdc
  
  DRM DRIVERS FOR BRIDGE CHIPS
  M:    Andrzej Hajda <[email protected]>
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  M:    Robert Foss <[email protected]>
  R:    Laurent Pinchart <[email protected]>
  R:    Jonas Karlman <[email protected]>
@@@ -7563,7 -7531,7 +7563,7 @@@ M:      Adrian Hunter <[email protected]
  M:    Ritesh Harjani <[email protected]>
  M:    Asutosh Das <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/mmc/host/cqhci*
  
  EMULEX 10Gbps iSCSI - OneConnect DRIVER
@@@ -7716,6 -7684,7 +7716,6 @@@ R:      Kees Cook <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
 -F:    arch/alpha/kernel/binfmt_loader.c
  F:    fs/*binfmt_*.c
  F:    fs/exec.c
  F:    include/linux/binfmts.h
@@@ -8032,7 -8001,6 +8032,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    include/linux/fortify-string.h
 +F:    lib/fortify_kunit.c
  F:    lib/test_fortify/*
  F:    scripts/test_fortify.sh
  K:    \b__NO_FORTIFY\b
@@@ -8475,7 -8443,6 +8475,6 @@@ F:      tools/testing/selftests/futex
  
  GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
  M:    Tim Harvey <[email protected]>
- M:    Robert Jones <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
  F:    drivers/mfd/gateworks-gsc.c
@@@ -8681,8 -8648,8 +8680,8 @@@ F:      drivers/input/touchscreen/goodix
  
  GOOGLE ETHERNET DRIVERS
  M:    Jeroen de Borst <[email protected]>
 -R:    Catherine Sullivan <[email protected]>
 -R:    David Awogbemila <awogbemila@google.com>
 +M:    Catherine Sullivan <[email protected]>
 +R:    Shailend Chand <shailend@google.com>
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/google/gve.rst
@@@ -8936,7 -8903,7 +8935,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 -F:    drivers/staging/media/hantro/
 +F:    drivers/media/platform/verisilicon/
  
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <[email protected]>
@@@ -8972,7 -8939,7 +8971,7 @@@ F:      include/linux/hw_random.
  
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <[email protected]>
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  R:    Baolin Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
  S:    Supported
  F:    drivers/hid/hid-playstation.c
  
 +HID PHOENIX RC FLIGHT CONTROLLER
 +M:    Marcus Folkesson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-pxrc.c
 +
  HID SENSOR HUB DRIVERS
  M:    Jiri Kosina <[email protected]>
  M:    Jonathan Cameron <[email protected]>
@@@ -9100,12 -9061,6 +9099,12 @@@ F:    drivers/hid/hid-sensor-
  F:    drivers/iio/*/hid-*
  F:    include/linux/hid-sensor-*
  
 +HID VRC-2 CAR CONTROLLER DRIVER
 +M:    Marcus Folkesson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-vrc2.c
 +
  HID WACOM DRIVER
  M:    Ping Cheng <[email protected]>
  M:    Jason Gerecke  <[email protected]>
@@@ -9163,7 -9118,7 +9162,7 @@@ S:      Maintaine
  F:    drivers/dma/hisi_dma.c
  
  HISILICON GPIO DRIVER
 -M:    Luo Jiaxing <luojiaxing@huawei.com>
 +M:    Jay Fang <f.fangjian@huawei.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-hisi.c
@@@ -9249,8 -9204,8 +9248,8 @@@ F:      Documentation/ABI/testing/debugfs-hi
  F:    drivers/crypto/hisilicon/zip/
  
  HISILICON ROCE DRIVER
 +M:    Haoyue Xu <[email protected]>
  M:    Wenpeng Liang <[email protected]>
 -M:    Weihang Li <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt
@@@ -9824,7 -9779,7 +9823,7 @@@ M:      Christian Brauner <[email protected]
  M:    Seth Forshee <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git
  F:    Documentation/filesystems/idmappings.rst
  F:    tools/testing/selftests/mount_setattr/
  F:    include/linux/mnt_idmapping.h
@@@ -10073,7 -10028,6 +10072,7 @@@ F:   Documentation/devicetree/bindings/in
  F:    Documentation/devicetree/bindings/serio/
  F:    Documentation/input/
  F:    drivers/input/
 +F:    include/dt-bindings/input/
  F:    include/linux/input.h
  F:    include/linux/input/
  F:    include/uapi/linux/input-event-codes.h
@@@ -10419,6 -10373,7 +10418,6 @@@ INTEL MENLOW THERMAL DRIVE
  M:    Sujith Thomas <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linux-acpi
  F:    drivers/thermal/intel/intel_menlow.c
  
  INTEL P-Unit IPC DRIVER
@@@ -10701,7 -10656,6 +10700,7 @@@ T:   git git://git.kernel.dk/linux-bloc
  T:    git git://git.kernel.dk/liburing
  F:    io_uring/
  F:    include/linux/io_uring.h
 +F:    include/linux/io_uring_types.h
  F:    include/uapi/linux/io_uring.h
  F:    tools/io_uring/
  
@@@ -10868,7 -10822,7 +10867,7 @@@ F:   drivers/media/tuners/it913x
  
  ITE IT66121 HDMI BRIDGE DRIVER
  M:    Phong LE <[email protected]>
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
@@@ -11113,8 -11067,8 +11112,8 @@@ F:   tools/testing/selftests
  KERNEL SMB3 SERVER (KSMBD)
  M:    Namjae Jeon <[email protected]>
  M:    Steve French <[email protected]>
 -M:    Hyunchul Lee <[email protected]>
  R:    Sergey Senozhatsky <[email protected]>
 +R:    Tom Talpey <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.samba.org/ksmbd.git
@@@ -11387,7 -11341,7 +11386,7 @@@ F:   kernel/debug
  F:    kernel/module/kdb.c
  
  KHADAS MCU MFD DRIVER
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
@@@ -11596,15 -11550,6 +11595,15 @@@ F: drivers/ata/ahci_platform.
  F:    drivers/ata/libahci_platform.c
  F:    include/linux/ahci_platform.h
  
 +LIBATA SATA AHCI SYNOPSYS DWC CONTROLLER DRIVER
 +M:    Serge Semin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
 +F:    Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml
 +F:    Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml
 +F:    drivers/ata/ahci_dwc.c
 +
  LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
  M:    Mikael Pettersson <[email protected]>
  L:    [email protected]
@@@ -12459,6 -12404,7 +12458,6 @@@ F:   drivers/power/supply/max77976_charge
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
  B:    mailto:[email protected]
@@@ -12470,6 -12416,7 +12469,6 @@@ F:   drivers/power/supply/max77693_charge
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
  B:    mailto:[email protected]
@@@ -13030,9 -12977,9 +13029,9 @@@ F:   drivers/input/touchscreen/melfas_mip
  
  MELLANOX BLUEFIELD I2C DRIVER
  M:    Khalil Blaiech <[email protected]>
 +M:    Asmaa Mnebhi <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.yaml
  F:    drivers/i2c/busses/i2c-mlxbf.c
  
  MELLANOX ETHERNET DRIVER (mlx4_en)
@@@ -13265,7 -13212,7 +13264,7 @@@ S:   Maintaine
  F:    drivers/watchdog/menz69_wdt.c
  
  MESON AO CEC DRIVER FOR AMLOGIC SOCS
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -13276,7 -13223,7 +13275,7 @@@ F:   drivers/media/cec/platform/meson/ao-
  F:    drivers/media/cec/platform/meson/ao-cec.c
  
  MESON GE2D DRIVER FOR AMLOGIC SOCS
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -13292,7 -13239,7 +13291,7 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/meson_*
  
  MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
 -M:    Neil Armstrong <n[email protected]>
 +M:    Neil Armstrong <n[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -13481,14 -13428,6 +13480,14 @@@ F: Documentation/devicetree/bindings/nv
  F:    drivers/nvmem/microchip-otpc.c
  F:    include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
  
 +MICROCHIP PCI1XXXX I2C DRIVER
 +M:    Tharun Kumar P <[email protected]>
 +M:    Kumaravel Thiagarajan <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-mchp-pci1xxxx.c
 +
  MICROCHIP PWM DRIVER
  M:    Claudiu Beznea <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -13835,7 -13774,7 +13834,7 @@@ MOTION EYE VAIO PICTUREBOOK CAMERA DRIV
  S:    Orphan
  W:    http://popies.net/meye/
  F:    Documentation/userspace-api/media/drivers/meye*
 -F:    drivers/media/pci/meye/
 +F:    drivers/staging/media/deprecated/meye/
  F:    include/uapi/linux/meye.h
  
  MOTORCOMM PHY DRIVER
@@@ -14504,7 -14443,6 +14503,7 @@@ M:   Willy Tarreau <[email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
  F:    tools/include/nolibc/
 +F:    tools/testing/selftests/nolibc/
  
  NSDEPS
  M:    Matthias Maennich <[email protected]>
@@@ -14587,7 -14525,6 +14586,7 @@@ M:   Daniel Dadap <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/platform/x86/nvidia-wmi-ec-backlight.c
 +F:    include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h
  
  NVM EXPRESS DRIVER
  M:    Keith Busch <[email protected]>
@@@ -14603,15 -14540,6 +14602,15 @@@ F: drivers/nvme/common
  F:    include/linux/nvme*
  F:    include/uapi/linux/nvme_ioctl.h
  
 +NVM EXPRESS FABRICS AUTHENTICATION
 +M:    Hannes Reinecke <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/nvme/host/auth.c
 +F:    drivers/nvme/target/auth.c
 +F:    drivers/nvme/target/fabrics-cmd-auth.c
 +F:    include/linux/nvme-auth.h
 +
  NVM EXPRESS FC TRANSPORT DRIVERS
  M:    James Smart <[email protected]>
  L:    [email protected]
@@@ -14761,15 -14689,6 +14760,15 @@@ S: Orpha
  F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
 +NXP i.MX 8MP DW100 V4L2 DRIVER
 +M:    Xavier Roumegue <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/nxp,dw100.yaml
 +F:    Documentation/userspace-api/media/drivers/dw100.rst
 +F:    drivers/media/platform/nxp/dw100/
 +F:    include/uapi/linux/dw100.h
 +
  NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
  M:    Mirela Rabulea <[email protected]>
  R:    NXP Linux Team <[email protected]>
@@@ -15022,7 -14941,6 +15021,7 @@@ F:   drivers/regulator/palmas-regulator*.
  F:    drivers/regulator/pbias-regulator.c
  F:    drivers/regulator/tps65217-regulator.c
  F:    drivers/regulator/tps65218-regulator.c
 +F:    drivers/regulator/tps65219-regulator.c
  F:    drivers/regulator/tps65910-regulator.c
  F:    drivers/regulator/twl-regulator.c
  F:    drivers/regulator/twl6030-regulator.c
@@@ -16208,7 -16126,7 +16207,7 @@@ F:   drivers/gpio/gpio-sama5d2-piobu.
  F:    drivers/pinctrl/pinctrl-at91*
  
  PIN CONTROLLER - QUALCOMM
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/qcom,*.txt
@@@ -16621,6 -16539,14 +16620,6 @@@ T:  git git://linuxtv.org/media_tree.gi
  F:    drivers/media/usb/pwc/*
  F:    include/trace/events/pwc.h
  
 -PWM FAN DRIVER
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
 -F:    Documentation/hwmon/pwm-fan.rst
 -F:    drivers/hwmon/pwm-fan.c
 -
  PWM IR Transmitter
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -16689,9 -16615,6 +16688,9 @@@ M:   Srinivas Kandagatla <srinivas.kandag
  M:    Banajit Goswami <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml
 +F:    Documentation/devicetree/bindings/sound/qcom,*
 +F:    drivers/soc/qcom/apr.c
  F:    include/dt-bindings/sound/qcom,wcd9335.h
  F:    sound/soc/codecs/lpass-rx-macro.*
  F:    sound/soc/codecs/lpass-tx-macro.*
@@@ -16896,7 -16819,7 +16895,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CLOCK DRIVERS
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -16935,7 -16858,6 +16934,7 @@@ F:   drivers/net/ethernet/qualcomm/emac
  
  QUALCOMM ETHQOS ETHERNET DRIVER
  M:    Vinod Koul <[email protected]>
 +R:    Bhupesh Sharma <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/qcom,ethqos.txt
@@@ -17386,7 -17308,7 +17385,7 @@@ S:   Supporte
  F:    fs/reiserfs/
  
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  M:    Mathieu Poirier <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17399,7 -17321,7 +17398,7 @@@ F:   include/linux/remoteproc.
  F:    include/linux/remoteproc/
  
  REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  M:    Mathieu Poirier <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17611,24 -17533,13 +17610,24 @@@ M:        Conor Dooley <conor.dooley@microchip
  M:    Daire McNamara <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/clock/microchip,mpfs.yaml
 +F:    Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
 +F:    Documentation/devicetree/bindings/i2c/microchip,corei2c.yaml
 +F:    Documentation/devicetree/bindings/mailbox/microchip,mpfs-mailbox.yaml
 +F:    Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml
 +F:    Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml
 +F:    Documentation/devicetree/bindings/soc/microchip/microchip,mpfs-sys-controller.yaml
 +F:    Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml
 +F:    Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
  F:    arch/riscv/boot/dts/microchip/
  F:    drivers/char/hw_random/mpfs-rng.c
  F:    drivers/clk/microchip/clk-mpfs.c
 +F:    drivers/i2c/busses/i2c-microchip-core.c
  F:    drivers/mailbox/mailbox-mpfs.c
  F:    drivers/pci/controller/pcie-microchip-host.c
  F:    drivers/rtc/rtc-mpfs.c
  F:    drivers/soc/microchip/
 +F:    drivers/spi/spi-microchip-core-qspi.c
  F:    drivers/spi/spi-microchip-core.c
  F:    drivers/usb/musb/mpfs.c
  F:    include/soc/microchip/mpfs.h
  S:    Maintained
  F:    drivers/infiniband/ulp/rtrs/
  
 +RUNTIME VERIFICATION (RV)
 +M:    Daniel Bristot de Oliveira <[email protected]>
 +M:    Steven Rostedt <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/trace/rv/
 +F:    include/linux/rv.h
 +F:    include/rv/
 +F:    kernel/trace/rv/
 +F:    tools/verification/
 +
 +RUST
 +M:    Miguel Ojeda <[email protected]>
 +M:    Alex Gaynor <[email protected]>
 +M:    Wedson Almeida Filho <[email protected]>
 +R:    Boqun Feng <[email protected]>
 +R:    Gary Guo <[email protected]>
 +R:    Björn Roy Baron <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://github.com/Rust-for-Linux/linux
 +B:    https://github.com/Rust-for-Linux/linux/issues
 +T:    git https://github.com/Rust-for-Linux/linux.git rust-next
 +F:    Documentation/rust/
 +F:    rust/
 +F:    samples/rust/
 +F:    scripts/*rust*
 +K:    \b(?i:rust)\b
 +
  RXRPC SOCKETS (AF_RXRPC)
  M:    David Howells <[email protected]>
  M:    Marc Dionne <[email protected]>
@@@ -18025,7 -17907,8 +18024,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/common/saa7146/
 -F:    drivers/media/pci/saa7146/
 +F:    drivers/staging/media/deprecated/saa7146/
  F:    include/media/drv-intf/saa7146*
  
  SAFESETID SECURITY MODULE
@@@ -18080,6 -17963,7 +18079,6 @@@ F:   drivers/platform/x86/samsung-laptop.
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -18374,7 -18258,7 +18373,7 @@@ F:   drivers/mmc/host/sdhci-brcmstb
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  M:    Adrian Hunter <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/mmc/host/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
@@@ -18397,7 -18281,7 +18396,7 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdhci-spear.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) TI OMAP DRIVER
 -M:    Kishon Vijay Abraham I <kishon@ti.com>
 +M:    Vignesh Raghavendra <vigneshr@ti.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-omap.c
  S:    Maintained
  F:    drivers/net/ethernet/dlink/sundance.c
  
 +SUN HAPPY MEAL ETHERNET DRIVER
 +M:    Sean Anderson <[email protected]>
 +S:    Maintained
 +F:    drivers/net/ethernet/sun/sunhme.*
 +
  SUNPLUS ETHERNET DRIVER
  M:    Wells Lu <[email protected]>
  L:    [email protected]
@@@ -20060,7 -19939,6 +20059,7 @@@ S:   Supporte
  F:    drivers/net/team/
  F:    include/linux/if_team.h
  F:    include/uapi/linux/if_team.h
 +F:    tools/testing/selftests/drivers/net/team/
  
  TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
  M:    "Savoir-faire Linux Inc." <[email protected]>
@@@ -20448,7 -20326,6 +20447,7 @@@ W:   https://linuxtv.or
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  F:    drivers/media/platform/ti/davinci/
 +F:    drivers/staging/media/deprecated/vpfe_capture/
  F:    include/media/davinci/
  
  TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
@@@ -20589,7 -20466,7 +20588,7 @@@ S:   Odd fixe
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/tm6000*
 -F:    drivers/media/usb/tm6000/
 +F:    drivers/staging/media/deprecated/tm6000/
  
  TMIO/SDHI MMC DRIVER
  M:    Wolfram Sang <[email protected]>
@@@ -20689,10 -20566,9 +20688,10 @@@ F: include/linux/toshiba.
  F:    include/uapi/linux/toshiba.h
  
  TOSHIBA TC358743 DRIVER
 -M:    Mats Randgaard <[email protected]>
 +M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/tc358743.txt
  F:    drivers/media/i2c/tc358743*
  F:    include/media/i2c/tc358743.h
  
@@@ -20713,13 -20589,6 +20712,13 @@@ Q: https://patchwork.kernel.org/project
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
  F:    drivers/char/tpm/
  
 +TPS546D24 DRIVER
 +M:    Duke Du <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/tps546d24.rst
 +F:    drivers/hwmon/pmbus/tps546d24.c
 +
  TRACING
  M:    Steven Rostedt <[email protected]>
  M:    Ingo Molnar <[email protected]>
@@@ -20733,7 -20602,6 +20732,7 @@@ F:   include/*/ftrace.
  F:    include/linux/trace*.h
  F:    include/trace/
  F:    kernel/trace/
 +F:    scripts/tracing/
  F:    tools/testing/selftests/ftrace/
  
  TRACING MMIO ACCESSES (MMIOTRACE)
@@@ -20898,7 -20766,6 +20897,7 @@@ UBLK USERSPACE BLOCK DRIVE
  M:    Ming Lei <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/block/ublk.rst
  F:    drivers/block/ublk_drv.c
  F:    include/uapi/linux/ublk_cmd.h
  
@@@ -21348,7 -21215,7 +21347,7 @@@ S:   Maintaine
  W:    http://royale.zerezo.com/zr364xx/
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/zr364xx*
 -F:    drivers/media/usb/zr364xx/
 +F:    drivers/staging/media/deprecated/zr364xx/
  
  USER-MODE LINUX (UML)
  M:    Richard Weinberger <[email protected]>
@@@ -21676,7 -21543,7 +21675,7 @@@ F:   drivers/gpio/gpio-virtio.
  F:    include/uapi/linux/virtio_gpio.h
  
  VIRTIO GPU DRIVER
 -M:    David Airlie <airlied@linux.ie>
 +M:    David Airlie <airlied@redhat.com>
  M:    Gerd Hoffmann <[email protected]>
  R:    Gurchetan Singh <[email protected]>
  R:    Chia-I Wu <[email protected]>
@@@ -21923,7 -21790,7 +21922,7 @@@ F:   lib/test_scanf.
  F:    lib/vsprintf.c
  
  VT1211 HARDWARE MONITOR DRIVER
 -M:    Juerg Haefliger <juergh@gmail.com>
 +M:    Juerg Haefliger <juergh@proton.me>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/vt1211.rst
@@@ -21982,11 -21849,9 +21981,11 @@@ F: drivers/input/tablet/wacom_serial4.
  
  WANGXUN ETHERNET DRIVER
  M:    Jiawen Wu <[email protected]>
 +M:    Mengyuan Lou <[email protected]>
 +W:    https://www.net-swift.com
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst
 +F:    Documentation/networking/device_drivers/ethernet/wangxun/*
  F:    drivers/net/ethernet/wangxun/
  
  WATCHDOG DEVICE DRIVERS
@@@ -22442,7 -22307,7 +22441,7 @@@ M:   Shubhrajyoti Datta <shubhrajyoti.dat
  R:    Srinivas Neeli <[email protected]>
  R:    Michal Simek <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/gpio/gpio-xilinx.txt
 +F:    Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
  F:    Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
  F:    drivers/gpio/gpio-xilinx.c
  F:    drivers/gpio/gpio-zynq.c
diff --combined drivers/hwmon/Kconfig
index 5695b266abcfc60a0ca7c046f07f11a0ece64793,e52b812b95628892ecf20fd167fa02146efa70ee..7ac3daaf59ce0618ebc5252d7d9e7a78ed73e341
@@@ -257,14 -257,14 +257,14 @@@ config SENSORS_AHT1
          will be called aht10.
  
  config SENSORS_AQUACOMPUTER_D5NEXT
 -      tristate "Aquacomputer D5 Next, Octo, Quadro, Farbwerk, and Farbwerk 360"
 +      tristate "Aquacomputer D5 Next, Octo, Quadro, Farbwerk, Farbwerk 360, High Flow Next"
        depends on USB_HID
        select CRC16
        help
          If you say yes here you get support for sensors and fans of
          the Aquacomputer D5 Next watercooling pump, Octo and Quadro fan
 -        controllers, Farbwerk and Farbwerk 360 RGB controllers, where
 -        available.
 +        controllers, Farbwerk and Farbwerk 360 RGB controllers, High Flow
 +        Next sensor, where available.
  
          This driver can also be built as a module. If so, the module
          will be called aquacomputer_d5next.
@@@ -393,7 -393,6 +393,7 @@@ config SENSORS_ASB10
  
  config SENSORS_ASPEED
        tristate "ASPEED AST2400/AST2500 PWM and Fan tach driver"
 +      depends on ARCH_ASPEED || COMPILE_TEST
        depends on THERMAL || THERMAL=n
        select REGMAP
        help
@@@ -1067,18 -1066,6 +1067,18 @@@ config SENSORS_MAX3173
          This driver can also be built as a module. If so, the module
          will be called max31730.
  
 +config SENSORS_MAX31760
 +      tristate "MAX31760 fan speed controller"
 +      depends on I2C
 +      select REGMAP_I2C
 +      help
 +        Support for the Analog Devices MAX31760 Precision Fan-Speed
 +        Controller. MAX31760 integrates temperature sensing along with
 +        precision PWM fan control.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be called max31760.
 +
  config SENSORS_MAX6620
        tristate "Maxim MAX6620 fan controller"
        depends on I2C
@@@ -1758,6 -1745,7 +1758,7 @@@ config SENSORS_SIS559
  
  config SENSORS_SY7636A
        tristate "Silergy SY7636A"
+       depends on MFD_SY7636A
        help
          If you say yes here you get support for the thermistor readout of
          the Silergy SY7636A PMIC.
@@@ -1798,19 -1786,6 +1799,19 @@@ config SENSORS_EMC210
          This driver can also be built as a module. If so, the module
          will be called emc2103.
  
 +config SENSORS_EMC2305
 +      tristate "Microchip EMC2305 and compatible EMC2301/2/3"
 +      depends on I2C
 +      imply THERMAL
 +      help
 +        If you say yes here you get support for the Microchip EMC2305
 +        fan controller chips.
 +        The Microchip EMC2305 is a fan controller for up to 5 fans.
 +        Fan rotation speeds are reported in RPM.
 +
 +        This driver can also be built as a module.  If so, the module
 +        will be called emc2305.
 +
  config SENSORS_EMC6W201
        tristate "SMSC EMC6W201"
        depends on I2C
@@@ -2367,6 -2342,21 +2368,6 @@@ config SENSORS_ASUS_WM
          This driver can also be built as a module. If so, the module
          will be called asus_wmi_sensors.
  
 -config SENSORS_ASUS_WMI_EC
 -      tristate "ASUS WMI B550/X570"
 -      depends on ACPI_WMI && SENSORS_ASUS_EC=n
 -      help
 -        If you say yes here you get support for the ACPI embedded controller
 -        hardware monitoring interface found in B550/X570 ASUS motherboards.
 -        This driver will provide readings of fans, voltages and temperatures
 -        through the system firmware.
 -
 -        This driver is deprecated in favor of the ASUS EC Sensors driver
 -        which provides fully compatible output.
 -
 -        This driver can also be built as a module. If so, the module
 -        will be called asus_wmi_sensors_ec.
 -
  config SENSORS_ASUS_EC
        tristate "ASUS EC Sensors"
        depends on X86
index 0a80d82c6858decc1ee439c4aaa2ec50127099bf,c2acdbcd5d6b6138379ee670cdb7f79228859566..a26e473507c7110614af8ec1e459b5d73848bcc8
@@@ -453,6 -453,7 +453,7 @@@ static const struct regmap_range da9061
        regmap_reg_range(DA9062AA_VBUCK1_B, DA9062AA_VBUCK4_B),
        regmap_reg_range(DA9062AA_VBUCK3_B, DA9062AA_VBUCK3_B),
        regmap_reg_range(DA9062AA_VLDO1_B, DA9062AA_VLDO4_B),
+       regmap_reg_range(DA9062AA_CONFIG_J, DA9062AA_CONFIG_J),
        regmap_reg_range(DA9062AA_GP_ID_0, DA9062AA_GP_ID_19),
  };
  
@@@ -723,12 -724,14 +724,12 @@@ static int da9062_i2c_probe(struct i2c_
        return ret;
  }
  
 -static int da9062_i2c_remove(struct i2c_client *i2c)
 +static void da9062_i2c_remove(struct i2c_client *i2c)
  {
        struct da9062 *chip = i2c_get_clientdata(i2c);
  
        mfd_remove_devices(chip->dev);
        regmap_del_irq_chip(i2c->irq, chip->regmap_irq);
 -
 -      return 0;
  }
  
  static const struct i2c_device_id da9062_i2c_id[] = {
index 5bb0367bd974f1a70cc0e51ee8dde95f683bbc86,40f14a0c0790f8992c31db7aae190c50bd32ff45..b1548a933dc3ee841e7dcb96c4c0363e8dedbd3c
@@@ -2,18 -2,21 +2,21 @@@
  /*
   * Device access for Crystal Cove PMIC
   *
-  * Copyright (C) 2013, 2014 Intel Corporation. All rights reserved.
+  * Copyright (C) 2012-2014, 2022 Intel Corporation. All rights reserved.
   *
   * Author: Yang, Bin <[email protected]>
   * Author: Zhu, Lejun <[email protected]>
   */
  
+ #include <linux/i2c.h>
  #include <linux/interrupt.h>
- #include <linux/regmap.h>
+ #include <linux/mod_devicetable.h>
+ #include <linux/module.h>
  #include <linux/mfd/core.h>
  #include <linux/mfd/intel_soc_pmic.h>
- #include "intel_soc_pmic_core.h"
+ #include <linux/platform_data/x86/soc.h>
+ #include <linux/pwm.h>
+ #include <linux/regmap.h>
  
  #define CRYSTAL_COVE_MAX_REGISTER     0xC6
  
@@@ -132,7 -135,20 +135,20 @@@ static const struct regmap_irq_chip cry
        .mask_base = CRYSTAL_COVE_REG_MIRQLVL1,
  };
  
- struct intel_soc_pmic_config intel_soc_pmic_config_byt_crc = {
+ /* PWM consumed by the Intel GFX */
+ static struct pwm_lookup crc_pwm_lookup[] = {
+       PWM_LOOKUP("crystal_cove_pwm", 0, "0000:00:02.0", "pwm_pmic_backlight", 0, PWM_POLARITY_NORMAL),
+ };
+ struct crystal_cove_config {
+       unsigned long irq_flags;
+       struct mfd_cell *cell_dev;
+       int n_cell_devs;
+       const struct regmap_config *regmap_config;
+       const struct regmap_irq_chip *irq_chip;
+ };
+ static const struct crystal_cove_config crystal_cove_config_byt_crc = {
        .irq_flags = IRQF_TRIGGER_RISING,
        .cell_dev = crystal_cove_byt_dev,
        .n_cell_devs = ARRAY_SIZE(crystal_cove_byt_dev),
        .irq_chip = &crystal_cove_irq_chip,
  };
  
- struct intel_soc_pmic_config intel_soc_pmic_config_cht_crc = {
+ static const struct crystal_cove_config crystal_cove_config_cht_crc = {
        .irq_flags = IRQF_TRIGGER_RISING,
        .cell_dev = crystal_cove_cht_dev,
        .n_cell_devs = ARRAY_SIZE(crystal_cove_cht_dev),
        .regmap_config = &crystal_cove_regmap_config,
        .irq_chip = &crystal_cove_irq_chip,
  };
 -static int crystal_cove_i2c_remove(struct i2c_client *i2c)
+ static int crystal_cove_i2c_probe(struct i2c_client *i2c)
+ {
+       const struct crystal_cove_config *config;
+       struct device *dev = &i2c->dev;
+       struct intel_soc_pmic *pmic;
+       int ret;
+       if (soc_intel_is_byt())
+               config = &crystal_cove_config_byt_crc;
+       else
+               config = &crystal_cove_config_cht_crc;
+       pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL);
+       if (!pmic)
+               return -ENOMEM;
+       i2c_set_clientdata(i2c, pmic);
+       pmic->regmap = devm_regmap_init_i2c(i2c, config->regmap_config);
+       if (IS_ERR(pmic->regmap))
+               return PTR_ERR(pmic->regmap);
+       pmic->irq = i2c->irq;
+       ret = devm_regmap_add_irq_chip(dev, pmic->regmap, pmic->irq,
+                                      config->irq_flags | IRQF_ONESHOT,
+                                      0, config->irq_chip, &pmic->irq_chip_data);
+       if (ret)
+               return ret;
+       ret = enable_irq_wake(pmic->irq);
+       if (ret)
+               dev_warn(dev, "Can't enable IRQ as wake source: %d\n", ret);
+       /* Add lookup table for crc-pwm */
+       pwm_add_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
+       /* To distuingish this domain from the GPIO/charger's irqchip domains */
+       irq_domain_update_bus_token(regmap_irq_get_domain(pmic->irq_chip_data),
+                                   DOMAIN_BUS_NEXUS);
+       ret = mfd_add_devices(dev, PLATFORM_DEVID_NONE, config->cell_dev,
+                             config->n_cell_devs, NULL, 0,
+                             regmap_irq_get_domain(pmic->irq_chip_data));
+       if (ret)
+               pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
+       return ret;
+ }
 -
 -      return 0;
++static void crystal_cove_i2c_remove(struct i2c_client *i2c)
+ {
+       /* remove crc-pwm lookup table */
+       pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
+       mfd_remove_devices(&i2c->dev);
+ }
+ static void crystal_cove_shutdown(struct i2c_client *i2c)
+ {
+       struct intel_soc_pmic *pmic = i2c_get_clientdata(i2c);
+       disable_irq(pmic->irq);
+       return;
+ }
+ static int crystal_cove_suspend(struct device *dev)
+ {
+       struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
+       disable_irq(pmic->irq);
+       return 0;
+ }
+ static int crystal_cove_resume(struct device *dev)
+ {
+       struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
+       enable_irq(pmic->irq);
+       return 0;
+ }
+ static DEFINE_SIMPLE_DEV_PM_OPS(crystal_cove_pm_ops, crystal_cove_suspend, crystal_cove_resume);
+ static const struct acpi_device_id crystal_cove_acpi_match[] = {
+       { "INT33FD" },
+       { },
+ };
+ MODULE_DEVICE_TABLE(acpi, crystal_cove_acpi_match);
+ static struct i2c_driver crystal_cove_i2c_driver = {
+       .driver = {
+               .name = "crystal_cove_i2c",
+               .pm = pm_sleep_ptr(&crystal_cove_pm_ops),
+               .acpi_match_table = crystal_cove_acpi_match,
+       },
+       .probe_new = crystal_cove_i2c_probe,
+       .remove = crystal_cove_i2c_remove,
+       .shutdown = crystal_cove_shutdown,
+ };
+ module_i2c_driver(crystal_cove_i2c_driver);
+ MODULE_DESCRIPTION("I2C driver for Intel SoC PMIC");
+ MODULE_LICENSE("GPL v2");
+ MODULE_AUTHOR("Yang, Bin <[email protected]>");
+ MODULE_AUTHOR("Zhu, Lejun <[email protected]>");
diff --combined drivers/mfd/lp8788.c
index e7c601bca9ef41fe5f6e66aa5d9f39b052b29b46,998e8cc408a0e9ff15aebe607a81ee30691a96bd..724a5712b36baa1ffda07a8e7a5d0e302f3f20df
@@@ -195,16 -195,25 +195,24 @@@ static int lp8788_probe(struct i2c_clie
        if (ret)
                return ret;
  
-       return mfd_add_devices(lp->dev, -1, lp8788_devs,
-                              ARRAY_SIZE(lp8788_devs), NULL, 0, NULL);
+       ret = mfd_add_devices(lp->dev, -1, lp8788_devs,
+                             ARRAY_SIZE(lp8788_devs), NULL, 0, NULL);
+       if (ret)
+               goto err_exit_irq;
+       return 0;
+ err_exit_irq:
+       lp8788_irq_exit(lp);
+       return ret;
  }
  
 -static int lp8788_remove(struct i2c_client *cl)
 +static void lp8788_remove(struct i2c_client *cl)
  {
        struct lp8788 *lp = i2c_get_clientdata(cl);
  
        mfd_remove_devices(lp->dev);
        lp8788_irq_exit(lp);
 -      return 0;
  }
  
  static const struct i2c_device_id lp8788_ids[] = {
diff --combined drivers/mfd/rk808.c
index d5d641efa0772f0d3366b71fb61b646c34760f36,283a65b64d2cd7033ed887cab2bc3154422ebb63..e00da7c7e3b11c83530c211f62271c4251a8d80b
@@@ -67,6 -67,10 +67,10 @@@ static bool rk817_is_volatile_reg(struc
        case RK817_SECONDS_REG ... RK817_WEEKS_REG:
        case RK817_RTC_STATUS_REG:
        case RK817_CODEC_DTOP_LPT_SRST:
+       case RK817_GAS_GAUGE_ADC_CONFIG0 ... RK817_GAS_GAUGE_CUR_ADC_K0:
+       case RK817_PMIC_CHRG_STS:
+       case RK817_PMIC_CHRG_OUT:
+       case RK817_PMIC_CHRG_IN:
        case RK817_INT_STS_REG0:
        case RK817_INT_STS_REG1:
        case RK817_INT_STS_REG2:
@@@ -74,7 -78,7 +78,7 @@@
                return true;
        }
  
-       return true;
+       return false;
  }
  
  static const struct regmap_config rk818_regmap_config = {
@@@ -127,6 -131,11 +131,11 @@@ static const struct resource rk817_pwrk
        DEFINE_RES_IRQ(RK817_IRQ_PWRON_FALL),
  };
  
+ static const struct resource rk817_charger_resources[] = {
+       DEFINE_RES_IRQ(RK817_IRQ_PLUG_IN),
+       DEFINE_RES_IRQ(RK817_IRQ_PLUG_OUT),
+ };
  static const struct mfd_cell rk805s[] = {
        { .name = "rk808-clkout", },
        { .name = "rk808-regulator", },
@@@ -166,6 -175,11 +175,11 @@@ static const struct mfd_cell rk817s[] 
                .resources = &rk817_rtc_resources[0],
        },
        { .name = "rk817-codec",},
+       {
+               .name = "rk817-charger",
+               .num_resources = ARRAY_SIZE(rk817_charger_resources),
+               .resources = &rk817_charger_resources[0],
+       },
  };
  
  static const struct mfd_cell rk818s[] = {
@@@ -778,7 -792,7 +792,7 @@@ err_irq
        return ret;
  }
  
 -static int rk808_remove(struct i2c_client *client)
 +static void rk808_remove(struct i2c_client *client)
  {
        struct rk808 *rk808 = i2c_get_clientdata(client);
  
                pm_power_off = NULL;
  
        unregister_restart_handler(&rk808_restart_handler);
 -
 -      return 0;
  }
  
  static int __maybe_unused rk8xx_suspend(struct device *dev)
diff --combined drivers/mfd/twl-core.c
index 2679c41232e6d7a50bf3f4dd0934c4c009165b03,ca6eca53a79e3f5f37188e328e8c0af662535e24..f6b4b9d94bbd3c194e92fdd4719749dc3b771744
@@@ -727,7 -727,7 +727,7 @@@ static void clocks_init(struct device *
  /*----------------------------------------------------------------------*/
  
  
 -static int twl_remove(struct i2c_client *client)
 +static void twl_remove(struct i2c_client *client)
  {
        unsigned i, num_slaves;
  
                twl->client = NULL;
        }
        twl_priv->ready = false;
 -      return 0;
  }
  
  static struct of_dev_auxdata twl_auxdata_lookup[] = {
@@@ -882,7 -883,7 +882,7 @@@ twl_probe(struct i2c_client *client, co
         * SR_I2C_SCL_CTRL_PU(bit 4)=0 and SR_I2C_SDA_CTRL_PU(bit 6)=0.
         *
         * Also, always enable SmartReflex bit as that's needed for omaps to
-        * to do anything over I2C4 for voltage scaling even if SmartReflex
+        * do anything over I2C4 for voltage scaling even if SmartReflex
         * is disabled. Without the SmartReflex bit omap sys_clkreq idle
         * signal will never trigger for retention idle.
         */
index d663ab9670fe47ac2cbf97833c3f4756b3ade1b4,c61dddebb7d65392d126a2c931fb5ab19568c4c0..070e4403c6c24a1609fc07d25659f2a8111fefd2
@@@ -787,24 -787,6 +787,24 @@@ config REGULATOR_MT632
          This driver supports the control of different power rails of device
          through regulator interface.
  
 +config REGULATOR_MT6331
 +      tristate "MediaTek MT6331 PMIC"
 +      depends on MFD_MT6397
 +      help
 +        Say y here to select this option to enable the power regulator of
 +        MediaTek MT6331 PMIC.
 +        This driver supports the control of different power rails of device
 +        through regulator interface
 +
 +config REGULATOR_MT6332
 +      tristate "MediaTek MT6332 PMIC"
 +      depends on MFD_MT6397
 +      help
 +        Say y here to select this option to enable the power regulator of
 +        MediaTek MT6332 PMIC.
 +        This driver supports the control of different power rails of device
 +        through regulator interface
 +
  config REGULATOR_MT6358
        tristate "MediaTek MT6358 PMIC"
        depends on MFD_MT6397
@@@ -1282,6 -1264,7 +1282,7 @@@ config REGULATOR_STW481X_VMM
  
  config REGULATOR_SY7636A
        tristate "Silergy SY7636A voltage regulator"
+       depends on MFD_SY7636A
        help
          This driver supports Silergy SY3686A voltage regulator.
  
@@@ -1402,15 -1385,6 +1403,15 @@@ config REGULATOR_TPS6521
          voltage regulators. It supports software based voltage control
          for different voltage domains
  
 +config REGULATOR_TPS65219
 +      tristate "TI TPS65219 Power regulators"
 +      depends on MFD_TPS65219 && OF
 +      help
 +        This driver supports TPS65219 voltage regulator chips.
 +        TPS65219 series of PMICs have 3 single phase BUCKs & 4 LDOs
 +        voltage regulators. It supports software based voltage control
 +        for different voltage domains.
 +
  config REGULATOR_TPS6524X
        tristate "TI TPS6524X Power regulators"
        depends on SPI
This page took 0.147135 seconds and 4 git commands to generate.