Commit 014acf26 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.

No conflicts or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9d0cd5d2 57012c57

Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml

+3 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ properties: 
      G coefficient for temperature equation.

      Default for series 5 = 60000

      Default for series 6 = 57400

    multipleOf: 1000

    multipleOf: 100

    minimum: 1000

    $ref: /schemas/types.yaml#/definitions/uint32
@@ -114,7 +114,7 @@ properties: 
      H coefficient for temperature equation.

      Default for series 5 = 200000

      Default for series 6 = 249400

    multipleOf: 1000

    multipleOf: 100

    minimum: 1000

    $ref: /schemas/types.yaml#/definitions/uint32
@@ -131,7 +131,7 @@ properties: 
      J coefficient for temperature equation.

      Default for series 5 = -100

      Default for series 6 = 0

    multipleOf: 1000

    multipleOf: 100

    maximum: 0

    $ref: /schemas/types.yaml#/definitions/int32

Documentation/devicetree/bindings/serial/cavium-uart.txt

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
* Universal Asynchronous Receiver/Transmitter (UART)



- compatible: "cavium,octeon-3860-uart"



  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.



- reg: The base address of the UART register bank.



- interrupts: A single interrupt specifier.



- current-speed: Optional, the current bit rate in bits per second.



Example:

	uart1: serial@1180000000c00 {

		compatible = "cavium,octeon-3860-uart","ns16550";

		reg = <0x11800 0x00000c00 0x0 0x400>;

		current-speed = <115200>;

		interrupts = <0 35>;

	};

Documentation/devicetree/bindings/serial/nxp,lpc1850-uart.txt

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
* NXP LPC1850 UART



Required properties:

- compatible	: "nxp,lpc1850-uart", "ns16550a".

- reg		: offset and length of the register set for the device.

- interrupts	: should contain uart interrupt.

- clocks	: phandle to the input clocks.

- clock-names	: required elements: "uartclk", "reg".



Optional properties:

- dmas		: Two or more DMA channel specifiers following the

		  convention outlined in bindings/dma/dma.txt

- dma-names	: Names for the dma channels, if present. There must

		  be at least one channel named "tx" for transmit

		  and named "rx" for receive.



Since it's also possible to also use the of_serial.c driver all

parameters from 8250.txt also apply but are optional.



Example:

uart0: serial@40081000 {

	compatible = "nxp,lpc1850-uart", "ns16550a";

	reg = <0x40081000 0x1000>;

	reg-shift = <2>;

	interrupts = <24>;

	clocks = <&ccu2 CLK_APB0_UART0>, <&ccu1 CLK_CPU_UART0>;

	clock-names = "uartclk", "reg";

};

Documentation/devicetree/bindings/sound/audio-graph-card2.yaml

+1 −19
Original line number Diff line number Diff line
@@ -39,22 +39,4 @@ required: 


additionalProperties: false



examples:

  - |

    sound {

        compatible = "audio-graph-card2";



        links = <&cpu_port>;

    };



    cpu {

        compatible = "cpu-driver";



        cpu_port: port { cpu_ep: endpoint { remote-endpoint = <&codec_ep>; }; };

    };



    codec {

        compatible = "codec-driver";



        port { codec_ep: endpoint { remote-endpoint = <&cpu_ep>; }; };

    };
 
...

Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Google SC7180-Trogdor ASoC sound card driver



maintainers:

  - Rohit kumar <rohitkr@codeaurora.org>

  - Rohit kumar <quic_rohkumar@quicinc.com>

  - Cheng-Yi Chiang <cychiang@chromium.org>



description: