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

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

Pull spi updates from Mark Brown:
 "The overwhelming bulk of this pull request is a change from Uwe
  Kleine-König which changes the return type of the remove() function to
  void as part of some wider work he's doing to do this for all bus
  types, causing updates to most SPI device drivers. The branch with
  that on has been cross merged with a couple of other trees which added
  new SPI drivers this cycle, I'm not expecting any build issues
  resulting from the change.

  Otherwise it's been a relatively quiet release with some new device
  support, a few minor features and the welcome completion of the
  conversion of the subsystem to use GPIO descriptors rather than
  numbers:

   - Change return type of remove() to void.

   - Completion of the conversion of SPI controller drivers to use GPIO
     descriptors rather than numbers.

   - Quite a few DT schema conversions.

   - Support for multiple SPI devices on a bus in ACPI systems.

   - Big overhaul of the PXA2xx SPI driver.

   - Support for AMD AMDI0062, Intel Raptor Lake, Mediatek MT7986 and
     MT8186, nVidia Tegra210 and Tegra234, Renesas RZ/V2L, Tesla FSD and
     Sunplus SP7021"

[ And this is obviously where that spi change that snuck into the
  regulator tree _should_ have been :^]

* tag 'spi-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (124 commits)
  spi: fsi: Implement a timeout for polling status
  spi: Fix erroneous sgs value with min_t()
  spi: tegra20: Use of_device_get_match_data()
  spi: mediatek: add ipm design support for MT7986
  spi: Add compatible for MT7986
  spi: sun4i: fix typos in comments
  spi: mediatek: support tick_delay without enhance_timing
  spi: Update clock-names property for arm pl022
  spi: rockchip-sfc: fix platform_get_irq.cocci warning
  spi: s3c64xx: Add spi port configuration for Tesla FSD SoC
  spi: dt-bindings: samsung: Add fsd spi compatible
  spi: topcliff-pch: Prevent usage of potentially stale DMA device
  spi: tegra210-quad: combined sequence mode
  spi: tegra210-quad: add acpi support
  spi: npcm-fiu: Fix typo ("npxm")
  spi: Fix Tegra QSPI example
  spi: qup: replace spin_lock_irqsave by spin_lock in hard IRQ
  spi: cadence: fix platform_get_irq.cocci warning
  spi: Update NXP Flexspi maintainer details
  dt-bindings: mfd: maxim,max77802: Convert to dtschema
  ...
parents d6ccf451 89b35e3f

Documentation/devicetree/bindings/extcon/maxim,max77843.yaml

0 → 100644
+40 −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/extcon/maxim,max77843.yaml#

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



title: Maxim MAX77843 MicroUSB and Companion Power Management IC Extcon



maintainers:

  - Chanwoo Choi <cw00.choi@samsung.com>

  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>



description: |

  This is a part of device tree bindings for Maxim MAX77843 MicroUSB

  Integrated Circuit (MUIC).



  See also Documentation/devicetree/bindings/mfd/maxim,max77843.yaml for

  additional information and example.



properties:

  compatible:

    const: maxim,max77843-muic



  connector:

    $ref: /schemas/connector/usb-connector.yaml#



  ports:

    $ref: /schemas/graph.yaml#/properties/port

    description:

      Any connector to the data bus of this controller should be modelled using

      the OF graph bindings specified

    properties:

      port:

        $ref: /schemas/graph.yaml#/properties/port



required:

  - compatible

  - connector



additionalProperties: false

Documentation/devicetree/bindings/mfd/google,cros-ec.yaml

+17 −14
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ properties: 


  controller-data:

    description:

      SPI controller data, see bindings/spi/spi-samsung.txt

      SPI controller data, see bindings/spi/samsung,spi-peripheral-props.yaml

    type: object



  google,cros-ec-spi-pre-delay:
@@ -148,7 +148,8 @@ patternProperties: 
required:

  - compatible



if:

allOf:

  - if:

      properties:

        compatible:

          contains:
@@ -160,6 +161,8 @@ then: 
        google,cros-ec-spi-pre-delay: false

        google,cros-ec-spi-msg-delay: false

        spi-max-frequency: false

    else:

      $ref: /schemas/spi/spi-peripheral-props.yaml



additionalProperties: false

Documentation/devicetree/bindings/mfd/max14577.txt

deleted100644 → 0
+0 −147
Original line number Diff line number Diff line 
Maxim MAX14577/77836 Multi-Function Device



MAX14577 is a Multi-Function Device with Micro-USB Interface Circuit, Li+

Battery Charger and SFOUT LDO output for powering USB devices. It is

interfaced to host controller using I2C.



MAX77836 additionally contains PMIC (with two LDO regulators) and Fuel Gauge.

For the description of Fuel Gauge low SOC alert interrupt see:

../power/supply/max17040_battery.txt





Required properties:

- compatible : Must be "maxim,max14577" or "maxim,max77836".

- reg : I2C slave address for the max14577 chip (0x25 for max14577/max77836)

- interrupts : IRQ line for the chip.





Required nodes:

 - charger :

	Node for configuring the charger driver.

	Required properties:

		- compatible : "maxim,max14577-charger"

			or "maxim,max77836-charger"

		- maxim,fast-charge-uamp : Current in uA for Fast Charge;

			Valid values:

			- for max14577: 90000 - 950000;

			- for max77836: 45000 - 475000;

		- maxim,eoc-uamp : Current in uA for End-Of-Charge mode;

			Valid values:

			- for max14577: 50000 - 200000;

			- for max77836: 5000 - 100000;

		- maxim,ovp-uvolt : OverVoltage Protection Threshold in uV;

			In an overvoltage condition, INT asserts and charging

			stops. Valid values:

			- 6000000, 6500000, 7000000, 7500000;

		- maxim,constant-uvolt : Battery Constant Voltage in uV;

			Valid values:

			- 4000000 - 4280000 (step by 20000);

			- 4350000;





Optional nodes:

- max14577-muic/max77836-muic :

	Node used only by extcon consumers.

	Required properties:

		- compatible : "maxim,max14577-muic" or "maxim,max77836-muic"



- regulators :

	Required properties:

		- compatible : "maxim,max14577-regulator"

			or "maxim,max77836-regulator"



	May contain a sub-node per regulator from the list below. Each

	sub-node should contain the constraints and initialization information

	for that regulator. See regulator.txt for a description of standard

	properties for these sub-nodes.



	List of valid regulator names:

	- for max14577: CHARGER, SAFEOUT.

	- for max77836: CHARGER, SAFEOUT, LDO1, LDO2.



	The SAFEOUT is a fixed voltage regulator so there is no need to specify

	voltages for it.





Example:



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



max14577@25 {

	compatible = "maxim,max14577";

	reg = <0x25>;

	interrupt-parent = <&gpx1>;

	interrupts = <5 IRQ_TYPE_LEVEL_LOW>;



	muic: max14577-muic {

		compatible = "maxim,max14577-muic";

	};



	regulators {

		compatible = "maxim,max14577-regulator";



		SAFEOUT {

			regulator-name = "SAFEOUT";

		};

		CHARGER {

			regulator-name = "CHARGER";

			regulator-min-microamp = <90000>;

			regulator-max-microamp = <950000>;

			regulator-boot-on;

		};

	};



	charger {

		compatible = "maxim,max14577-charger";



		maxim,constant-uvolt = <4350000>;

		maxim,fast-charge-uamp = <450000>;

		maxim,eoc-uamp = <50000>;

		maxim,ovp-uvolt = <6500000>;

	};

};





max77836@25 {

	compatible = "maxim,max77836";

	reg = <0x25>;

	interrupt-parent = <&gpx1>;

	interrupts = <5 IRQ_TYPE_LEVEL_LOW>;



	muic: max77836-muic {

		compatible = "maxim,max77836-muic";

	};



	regulators {

		compatible = "maxim,max77836-regulator";



		SAFEOUT {

			regulator-name = "SAFEOUT";

		};

		CHARGER {

			regulator-name = "CHARGER";

			regulator-min-microamp = <90000>;

			regulator-max-microamp = <950000>;

			regulator-boot-on;

		};

		LDO1 {

			regulator-name = "LDO1";

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <2700000>;

		};

		LDO2 {

			regulator-name = "LDO2";

			regulator-min-microvolt = <800000>;

			regulator-max-microvolt = <3950000>;

		};

	};



	charger {

		compatible = "maxim,max77836-charger";



		maxim,constant-uvolt = <4350000>;

		maxim,fast-charge-uamp = <225000>;

		maxim,eoc-uamp = <7500>;

		maxim,ovp-uvolt = <6500000>;

	};

};

Documentation/devicetree/bindings/mfd/max77802.txt

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
Maxim MAX77802 multi-function device



The Maxim MAX77802 is a Power Management IC (PMIC) that contains 10 high

efficiency Buck regulators, 32 Low-DropOut (LDO) regulators used to power

up application processors and peripherals, a 2-channel 32kHz clock outputs,

a Real-Time-Clock (RTC) and a I2C interface to program the individual

regulators, clocks outputs and the RTC.



Bindings for the built-in 32k clock generator block and

regulators are defined in ../clk/maxim,max77802.txt and

../regulator/max77802.txt respectively.



Required properties:

- compatible		: Must be "maxim,max77802"

- reg			: Specifies the I2C slave address of PMIC block.

- interrupts		: I2C device IRQ line connected to the main SoC.



Example:



	max77802: pmic@9 {

		compatible = "maxim,max77802";

		interrupt-parent = <&intc>;

		interrupts = <26 IRQ_TYPE_NONE>;

		reg = <0x09>;

	};

Documentation/devicetree/bindings/mfd/maxim,max14577.yaml

0 → 100644
+195 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

%YAML 1.2

---

$id: http://devicetree.org/schemas/mfd/maxim,max14577.yaml#

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



title: Maxim MAX14577/MAX77836 MicroUSB and Companion Power Management IC



maintainers:

  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>



description: |

  This is a part of device tree bindings for Maxim MAX14577/MAX77836 MicroUSB

  Integrated Circuit (MUIC).



  The Maxim MAX14577 is a MicroUSB and Companion Power Management IC which

  includes voltage safeout regulators, charger and MicroUSB management IC.



  The Maxim MAX77836 is a MicroUSB and Companion Power Management IC which

  includes voltage safeout and LDO regulators, charger, fuel-gauge and MicroUSB

  management IC.



properties:

  compatible:

    enum:

      - maxim,max14577

      - maxim,max77836



  interrupts:

    maxItems: 1



  reg:

    maxItems: 1



  wakeup-source: true



  charger:

    $ref: /schemas/power/supply/maxim,max14577.yaml



  extcon:

    type: object

    properties:

      compatible:

        enum:

          - maxim,max14577-muic

          - maxim,max77836-muic



    required:

      - compatible



  regulators:

    $ref: /schemas/regulator/maxim,max14577.yaml



required:

  - compatible

  - interrupts

  - reg

  - charger



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: maxim,max14577

    then:

      properties:

        charger:

          properties:

            compatible:

              const: maxim,max14577-charger

        extcon:

          properties:

            compatible:

              const: maxim,max14577-muic

        regulator:

          properties:

            compatible:

              const: maxim,max14577-regulator

    else:

      properties:

        charger:

          properties:

            compatible:

              const: maxim,max77836-charger

        extcon:

          properties:

            compatible:

              const: maxim,max77836-muic

        regulator:

          properties:

            compatible:

              const: maxim,max77836-regulator



additionalProperties: false



examples:

  - |

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



    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        pmic@25 {

            compatible = "maxim,max14577";

            reg = <0x25>;

            interrupt-parent = <&gpx1>;

            interrupts = <5 IRQ_TYPE_LEVEL_LOW>;



            extcon {

                compatible = "maxim,max14577-muic";

            };



            regulators {

                compatible = "maxim,max14577-regulator";



                SAFEOUT {

                    regulator-name = "SAFEOUT";

                };



                CHARGER {

                    regulator-name = "CHARGER";

                    regulator-min-microamp = <90000>;

                    regulator-max-microamp = <950000>;

                    regulator-boot-on;

                };

            };



            charger {

                compatible = "maxim,max14577-charger";



                maxim,constant-uvolt = <4350000>;

                maxim,fast-charge-uamp = <450000>;

                maxim,eoc-uamp = <50000>;

                maxim,ovp-uvolt = <6500000>;

            };

        };

    };



  - |

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



    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        pmic@25 {

            compatible = "maxim,max77836";

            interrupt-parent = <&gpx1>;

            interrupts = <5 IRQ_TYPE_NONE>;

            reg = <0x25>;

            wakeup-source;



            extcon {

                compatible = "maxim,max77836-muic";

            };



            regulators {

                compatible = "maxim,max77836-regulator";



                SAFEOUT {

                    regulator-name = "SAFEOUT";

                };



                CHARGER {

                    regulator-name = "CHARGER";

                    regulator-min-microamp = <45000>;

                    regulator-max-microamp = <475000>;

                    regulator-boot-on;

                };



                LDO1 {

                    regulator-name = "MOT_2.7V";

                    regulator-min-microvolt = <1100000>;

                    regulator-max-microvolt = <2700000>;

                };



                LDO2 {

                    regulator-name = "UNUSED_LDO2";

                    regulator-min-microvolt = <800000>;

                    regulator-max-microvolt = <3950000>;

                };

            };



            charger {

                compatible = "maxim,max77836-charger";



                maxim,constant-uvolt = <4350000>;

                maxim,fast-charge-uamp = <225000>;

                maxim,eoc-uamp = <7500>;

                maxim,ovp-uvolt = <6500000>;

            };

        };

    };