From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Nov 2021 20:07:52 +0000 (-0800)
Subject: Merge tag 'mfd-next-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
X-Git-Tag: v6.6.17~8879
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a9b0a46e1708b6b3c298f2cf22923cc5a2ca63f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'mfd-next-5.16' of git://git./linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "Removed Drivers:
   - Remove support for TI TPS80031/TPS80032 PMICs

  New Device Support:
   - Add support for Magnetic Reader to TI AM335x
   - Add support for DA9063_EA to Dialog DA9063
   - Add support for SC2730 PMIC to Spreadtrum SC27xx
   - Add support for MacBookPro16,2 ICL-N UART Intel LPSS PCI
   - Add support for lots of new PMICS in QCom SPMI PMIC
   - Add support for ADC to Diolan DLN2

  New Functionality:
   - Add support for Power Off to Rockchip RK817

  Fix-ups:
   - Simplify Regmap passing to child devices in hi6421-spmi-pmic
   - SPDX licensing updates in ti_am335x_tscadc
   - Improve error handling in ti_am335x_tscadc
   - Expedite clock search in ti_am335x_tscadc
   - Generic simplifications in ti_am335x_tscadc
   - Use generic macros/defines in ti_am335x_tscadc
   - Remove unused code in ti_am335x_tscadc, cros_ec_dev
   - Convert to GPIOD in wcd934x
   - Add namespacing in ti_am335x_tscadc
   - Restrict compilation to relevant arches in intel_pmt
   - Provide better description/documentation in exynos_lpass
   - Add SPI device ID table in altera-a10sr, motorola-cpcap,
     sprd-sc27xx-spi
   - Change IRQ handling in qcom-pm8xxx
   - Split out I2C and SPI code in arizona
   - Explicitly include used headers in altera-a10sr
   - Convert sysfs show() function to in sysfs_emit
   - Standardise *_exit() and *_remove() return values in mc13xxx,
     stmpe, tps65912
   - Trivial (style/spelling/whitespace) fixups in ti_am335x_tscadc,
     qcom-spmi-pmic, max77686-private
   - Device Tree fix-ups in ti,am3359-tscadc, samsung,s2mps11,
     samsung,s2mpa01, samsung,s5m8767, brcm,misc, brcm,cru, syscon,
     qcom,tcsr, xylon,logicvc, max77686, x-powers,ac100,
     x-powers,axp152, x-powers,axp209-gpio, syscon, qcom,spmi-pmic

  Bug Fixes:
   - Balance refcounting (get/put) in ti_am335x_tscadc, mfd-core
   - Fix IRQ trigger type in sec-irq, max77693, max14577
   - Repair off-by-one in altera-sysmgr
   - Add explicit 'select MFD_CORE' to MFD_SIMPLE_MFD_I2C"

* tag 'mfd-next-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (95 commits)
  mfd: simple-mfd-i2c: Select MFD_CORE to fix build error
  mfd: tps80031: Remove driver
  mfd: max77686: Correct tab-based alignment of register addresses
  mfd: wcd934x: Replace legacy gpio interface for gpiod
  dt-bindings: mfd: qcom: pm8xxx: Add pm8018 compatible
  mfd: dln2: Add cell for initializing DLN2 ADC
  mfd: qcom-spmi-pmic: Add missing PMICs supported by socinfo
  mfd: qcom-spmi-pmic: Document ten more PMICs in the binding
  mfd: qcom-spmi-pmic: Sort compatibles in the driver
  mfd: qcom-spmi-pmic: Sort the compatibles in the binding
  mfd: janz-cmoio: Replace snprintf in show functions with sysfs_emit
  mfd: altera-a10sr: Include linux/module.h
  mfd: tps65912: Make tps65912_device_exit() return void
  mfd: stmpe: Make stmpe_remove() return void
  mfd: mc13xxx: Make mc13xxx_common_exit() return void
  dt-bindings: mfd: syscon: Add samsung,exynosautov9-sysreg compatible
  mfd: altera-sysmgr: Fix a mistake caused by resource_size conversion
  dt-bindings: gpio: Convert X-Powers AXP209 GPIO binding to a schema
  dt-bindings: mfd: syscon: Add rk3368 QoS register compatible
  mfd: arizona: Split of_match table into I2C and SPI versions
  ...
---

3a9b0a46e1708b6b3c298f2cf22923cc5a2ca63f
diff --cc Documentation/devicetree/bindings/mfd/brcm,cru.yaml
index 28ac60a,262284a..be4a2df
--- a/Documentation/devicetree/bindings/mfd/brcm,cru.yaml
+++ b/Documentation/devicetree/bindings/mfd/brcm,cru.yaml
@@@ -36,9 -39,12 +36,15 @@@ patternProperties
    '^clock-controller@[a-f0-9]+$':
      $ref: ../clock/brcm,iproc-clocks.yaml
  
+   '^phy@[a-f0-9]+$':
+     $ref: ../phy/bcm-ns-usb2-phy.yaml
+ 
 +  '^pin-controller@[a-f0-9]+$':
 +    $ref: ../pinctrl/brcm,ns-pinmux.yaml
 +
+   '^syscon@[a-f0-9]+$':
+     $ref: syscon.yaml
+ 
    '^thermal@[a-f0-9]+$':
      $ref: ../thermal/brcm,ns-thermal.yaml
  
@@@ -73,10 -80,23 +80,24 @@@ examples
                                   "iprocfast", "sata1", "sata2";
          };
  
+         phy@164 {
+             compatible = "brcm,ns-usb2-phy";
+             reg = <0x164 0x4>;
+             brcm,syscon-clkset = <&clkset>;
+             clocks = <&genpll BCM_NSP_GENPLL_USB_PHY_REF_CLK>;
+             clock-names = "phy-ref-clk";
+             #phy-cells = <0>;
+         };
+ 
+         clkset: syscon@180 {
+             compatible = "brcm,cru-clkset", "syscon";
+             reg = <0x180 0x4>;
+         };
+ 
 -        pinctrl {
 +        pin-controller@1c0 {
              compatible = "brcm,bcm4708-pinmux";
 -            offset = <0x1c0>;
 +            reg = <0x1c0 0x24>;
 +            reg-names = "cru_gpio_control";
          };
  
          thermal@2c0 {