Commit 725d444d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull devicetree fixes from Rob Herring:

 - Fix moortec,mr75203 schema usage of 'multipleOf' keyword

 - Fix regression in systems depending on "of-display" device name

 - Build fix for s390 with CONFIG_PCI=n and OF_EARLY_FLATTREE=y

 - Drop two obsolete serial .txt bindings

* tag 'devicetree-fixes-for-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: serial: Remove obsolete nxp,lpc1850-uart.txt
  dt-bindings: serial: Remove obsolete cavium-uart.txt
  dt-bindings: hwmon: moortec,mr75203: fix multipleOf for coefficients
  of: Preserve "of-display" device name for compatibility
  of: make OF_EARLY_FLATTREE depend on HAS_IOMEM
parents 39b14286 ffc59c64

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";

};

drivers/of/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ config OF_FLATTREE 


config OF_EARLY_FLATTREE

	bool

	select DMA_DECLARE_COHERENT if HAS_DMA

	select DMA_DECLARE_COHERENT if HAS_DMA && HAS_IOMEM

	select OF_FLATTREE



config OF_PROMTREE

drivers/of/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void) 
			if (!of_get_property(node, "linux,opened", NULL) ||

			    !of_get_property(node, "linux,boot-display", NULL))

				continue;

			dev = of_platform_device_create(node, "of-display.0", NULL);

			dev = of_platform_device_create(node, "of-display", NULL);

			of_node_put(node);

			if (WARN_ON(!dev))

				return -ENOMEM;