Commit dfb9758a authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'dt/linus' into dt/next 

Pick up changeset fixes for further rework.
parents 7ceb60ec 7882541c

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/dynamic.c

+9 −22
Original line number Diff line number Diff line
@@ -63,15 +63,14 @@ int of_reconfig_notifier_unregister(struct notifier_block *nb) 
}

EXPORT_SYMBOL_GPL(of_reconfig_notifier_unregister);



#ifdef DEBUG

const char *action_names[] = {

static const char *action_names[] = {

	[0] = "INVALID",

	[OF_RECONFIG_ATTACH_NODE] = "ATTACH_NODE",

	[OF_RECONFIG_DETACH_NODE] = "DETACH_NODE",

	[OF_RECONFIG_ADD_PROPERTY] = "ADD_PROPERTY",

	[OF_RECONFIG_REMOVE_PROPERTY] = "REMOVE_PROPERTY",

	[OF_RECONFIG_UPDATE_PROPERTY] = "UPDATE_PROPERTY",

};

#endif



int of_reconfig_notify(unsigned long action, struct of_reconfig_data *p)

{
@@ -620,21 +619,9 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce) 
		}



		ret = __of_add_property(ce->np, ce->prop);

		if (ret) {

			pr_err("changeset: add_property failed @%pOF/%s\n",

				ce->np,

				ce->prop->name);

			break;

		}

		break;

	case OF_RECONFIG_REMOVE_PROPERTY:

		ret = __of_remove_property(ce->np, ce->prop);

		if (ret) {

			pr_err("changeset: remove_property failed @%pOF/%s\n",

				ce->np,

				ce->prop->name);

			break;

		}

		break;



	case OF_RECONFIG_UPDATE_PROPERTY:
@@ -648,20 +635,17 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce) 
		}



		ret = __of_update_property(ce->np, ce->prop, &old_prop);

		if (ret) {

			pr_err("changeset: update_property failed @%pOF/%s\n",

				ce->np,

				ce->prop->name);

			break;

		}

		break;

	default:

		ret = -EINVAL;

	}

	raw_spin_unlock_irqrestore(&devtree_lock, flags);



	if (ret)

	if (ret) {

		pr_err("changeset: apply failed: %-15s %pOF:%s\n",

		       action_names[ce->action], ce->np, ce->prop->name);

		return ret;

	}



	switch (ce->action) {

	case OF_RECONFIG_ATTACH_NODE:
@@ -947,6 +931,9 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, 
	if (!ce)

		return -ENOMEM;



	if (WARN_ON(action >= ARRAY_SIZE(action_names)))

		return -EINVAL;



	/* get a reference to the node */

	ce->action = action;

	ce->np = of_node_get(np);