Commit a231bed2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-spi-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc 

Pull spi and regulator updates from Mark Brown:
 "At one point in the release cycle I managed to fat finger things and
  apply some SPI fixes onto a regulator branch and merge that into the
  SPI tree, then pull in a change shared with the MTD tree moving the
  Mediatek quadspi driver over to become the Mediatek spi-nor driver in
  the SPI tree.

  This has made a mess which I only just noticed while preparing this
  and I can't see a sensible way to unpick things due to other
  subsequent merge commits especially the pull from MTD so it looks like
  the most sensible thing to do is give up and combine the two pull
  requests.

  Fortunately both subsystems were fairly quiet this cycle, the
  highlights are:

  regulator:

   - Support for Monoloithic Power Systems MP5416, MP8867 and MPS8869
     and Qualcomm PMI8994 and SMB208.

  SPI:

   - Lots of enhancements for spi-fsl-dspi, including XSPI mode support,
     from Vladimir Oltean.

   - Support for amlogic Meson G12A, IBM FSI, Mediatek spi-nor (moved
     from MTD), NXP i.MX8Mx, Rockchip PX30, RK3308 and RK3328, and
     Qualcomm Atheros AR934x/QCA95xx"

* tag 'regulator-spi-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc: (118 commits)
  spi: efm32: Convert to use GPIO descriptors
  regulator: qcom_smd: Add pmi8994 regulator support
  regulator: da9063: Fix get_mode() functions to read sleep field
  spi: spi-fsl-lpspi: Replace zero-length array with flexible-array member
  spi: spi-s3c24xx: Replace zero-length array with flexible-array member
  spi: stm32: Fix comments compilation warnings
  spi: atmel-quadspi: Add verbose debug facilities to monitor register accesses
  spi: spi-fsl-dspi: Add support for LS1028A
  spi: spi-fsl-dspi: Move invariant configs out of dspi_transfer_one_message
  spi: spi-fsl-dspi: Fix interrupt-less DMA mode taking an XSPI code path
  spi: spi-fsl-dspi: Avoid NULL pointer in dspi_slave_abort for non-DMA mode
  spi: spi-fsl-dspi: Replace interruptible wait queue with a simple completion
  spi: spi-fsl-dspi: Protect against races on dspi->words_in_flight
  spi: spi-fsl-dspi: Avoid reading more data than written in EOQ mode
  spi: spi-fsl-dspi: Fix bits-per-word acceleration in DMA mode
  spi: spi-fsl-dspi: Fix little endian access to PUSHR CMD and TXDATA
  spi: spi-fsl-dspi: Don't access reserved fields in SPI_MCR
  regulator: driver.h: fix regulator_map_* function names
  regulator: da9063: fix suspend
  spi: mxs: Drop GPIO includes
  ...
parents e1299409 6dfae59d

Documentation/devicetree/bindings/fsi/ibm,fsi2spi.yaml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-or-later)

%YAML 1.2

---

$id: http://devicetree.org/schemas/fsi/ibm,fsi2spi.yaml#

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



title: IBM FSI-attached SPI controllers



maintainers:

 - Eddie James <eajames@linux.ibm.com>



description: |

  This binding describes an FSI CFAM engine called the FSI2SPI. Therefore this

  node will always be a child of an FSI CFAM node; see fsi.txt for details on

  FSI slave and CFAM nodes. This FSI2SPI engine provides access to a number of

  SPI controllers.



properties:

  compatible:

    enum:

      - ibm,fsi2spi



  reg:

    items:

      - description: FSI slave address



required:

  - compatible

  - reg



examples:

  - |

    fsi2spi@1c00 {

        compatible = "ibm,fsi2spi";

        reg = <0x1c00 0x400>;

    };

Documentation/devicetree/bindings/mfd/qcom-rpm.txt

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ Regulator nodes are identified by their compatible: 
		    "qcom,rpm-pm8901-regulators"

		    "qcom,rpm-pm8921-regulators"

		    "qcom,rpm-pm8018-regulators"

		    "qcom,rpm-smb208-regulators"



- vdd_l0_l1_lvs-supply:

- vdd_l2_l11_l12-supply:
@@ -171,6 +172,9 @@ pm8018: 
	s1, s2, s3, s4, s5, , l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11,

	l12, l14, lvs1



smb208:

	s1a, s1b, s2a, s2b



The content of each sub-node is defined by the standard binding for regulators -

see regulator.txt - with additional custom properties described below:

Documentation/devicetree/bindings/regulator/mp886x.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Monolithic Power Systems MP8867/MP8869 voltage regulator



Required properties:

- compatible: Must be one of the following.

	"mps,mp8867"

	"mps,mp8869"

- reg: I2C slave address.

- enable-gpios: enable gpios.

- mps,fb-voltage-divider: An array of two integers containing the resistor

  values R1 and R2 of the feedback voltage divider in kilo ohms.



Any property defined as part of the core regulator binding, defined in

./regulator.txt, can also be used.



Example:



	vcpu: regulator@62 {

		compatible = "mps,mp8869";

		regulator-name = "vcpu";

		regulator-min-microvolt = <700000>;

		regulator-max-microvolt = <850000>;

		regulator-always-on;

		regulator-boot-on;

		enable-gpios = <&porta 1 GPIO_ACTIVE_LOW>;

		mps,fb-voltage-divider = <80 240>;

		reg = <0x62>;

	};

Documentation/devicetree/bindings/regulator/mps,mp5416.yaml

0 → 100644
+78 −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/regulator/mps,mp5416.yaml#

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



title: Monolithic Power System MP5416 PMIC



maintainers:

  - Saravanan Sekar <sravanhome@gmail.com>



properties:

  $nodename:

    pattern: "^pmic@[0-9a-f]{1,2}$"

  compatible:

    enum:

      - mps,mp5416



  reg:

    maxItems: 1



  regulators:

    type: object

    description: |

      list of regulators provided by this controller, must be named

      after their hardware counterparts BUCK[1-4] and LDO[1-4]



    patternProperties:

      "^buck[1-4]$":

        allOf:

          - $ref: "regulator.yaml#"

        type: object



      "^ldo[1-4]$":

        allOf:

          - $ref: "regulator.yaml#"

        type: object



    additionalProperties: false

  additionalProperties: false



required:

  - compatible

  - reg

  - regulators



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        pmic@69 {

          compatible = "mps,mp5416";

          reg = <0x69>;



          regulators {



            buck1 {

             regulator-name = "buck1";

             regulator-min-microvolt = <600000>;

             regulator-max-microvolt = <2187500>;

             regulator-min-microamp  = <3800000>;

             regulator-max-microamp  = <6800000>;

             regulator-boot-on;

            };



            ldo2 {

             regulator-name = "ldo2";

             regulator-min-microvolt = <800000>;

             regulator-max-microvolt = <3975000>;

            };

         };

       };

     };

...

Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Regulator nodes are identified by their compatible: 
		    "qcom,rpm-pm8994-regulators"

		    "qcom,rpm-pm8998-regulators"

		    "qcom,rpm-pma8084-regulators"

		    "qcom,rpm-pmi8994-regulators"

		    "qcom,rpm-pmi8998-regulators"

		    "qcom,rpm-pms405-regulators"
@@ -143,6 +144,15 @@ Regulator nodes are identified by their compatible: 
	Definition: reference to regulator supplying the input pin, as

		    described in the data sheet



- vdd_s1-supply:

- vdd_s2-supply:

- vdd_s3-supply:

- vdd_bst_byp-supply:

	Usage: optional (pmi8994 only)

	Value type: <phandle>

	Definition: reference to regulator supplying the input pin, as

		    described in the data sheet



- vdd_s1-supply:

- vdd_s2-supply:

- vdd_s3-supply:
@@ -259,6 +269,9 @@ pma8084: 
	l6, l7, l8, l9, l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l20,

	l21, l22, l23, l24, l25, l26, l27, lvs1, lvs2, lvs3, lvs4, 5vs1



pmi8994:

	s1, s2, s3, boost-bypass



pmi8998:

	bob

CRA Git | Maintained and supported by SUSTech CRA and CCSE