Commit 2b7553db authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Cross-merge networking fixes after downstream PR (net-6.18-rc3).

No conflicts or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 61b7ade9 ab431bc3

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Alan Cox <alan@lxorguk.ukuu.org.uk> 
Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>

Aleksey Gorelov <aleksey_gorelov@phoenix.com>

Alex Williamson <alex@shazbot.org> <alex.williamson@redhat.com>

Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>

Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>

Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>

Documentation/devicetree/bindings/i2c/apm,xgene-slimpro-i2c.yaml

0 → 100644
+36 −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/i2c/apm,xgene-slimpro-i2c.yaml#

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



title: APM X-Gene SLIMpro Mailbox I2C



maintainers:

  - Khuong Dinh <khuong@os.amperecomputing.com>



description:

  An I2C controller accessed over the "SLIMpro" mailbox.



allOf:

  - $ref: /schemas/i2c/i2c-controller.yaml#



properties:

  compatible:

    const: apm,xgene-slimpro-i2c



  mboxes:

    maxItems: 1



required:

  - compatible

  - mboxes



unevaluatedProperties: false



examples:

  - |

    i2c {

        compatible = "apm,xgene-slimpro-i2c";

        mboxes = <&mailbox 0>;

    };

Documentation/devicetree/bindings/i2c/i2c-xgene-slimpro.txt

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
APM X-Gene SLIMpro Mailbox I2C Driver



An I2C controller accessed over the "SLIMpro" mailbox.



Required properties :



 - compatible : should be "apm,xgene-slimpro-i2c"

 - mboxes : use the label reference for the mailbox as the first parameter.

	    The second parameter is the channel number.



Example :

	i2cslimpro {

		compatible = "apm,xgene-slimpro-i2c";

		mboxes = <&mailbox 0>;

	};

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ properties: 
          - enum:

              - qcom,qcs8300-qmp-ufs-phy

          - const: qcom,sa8775p-qmp-ufs-phy

      - items:

          - enum:

              - qcom,kaanapali-qmp-ufs-phy

          - const: qcom,sm8750-qmp-ufs-phy

      - enum:

          - qcom,msm8996-qmp-ufs-phy

          - qcom,msm8998-qmp-ufs-phy

Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ properties: 
              - fsl,imx-audio-nau8822

              - fsl,imx-audio-sgtl5000

              - fsl,imx-audio-si476x

              - fsl,imx-audio-tlv320

              - fsl,imx-audio-tlv320aic31xx

              - fsl,imx-audio-tlv320aic32x4

              - fsl,imx-audio-wm8524