Merge tag 'devicetree-fixes-for-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux (39a38bcb) · Commits · 戴 / test

Documentation/devicetree/bindings/riscv/cpus.yaml

+13 −16

Original line number	Diff line number	Diff line
		@@ -24,7 +24,8 @@ description: \|

		properties:
		compatible:
		items:
		oneOf:
		- items:
		- enum:
		- sifive,rocket0
		- sifive,e5
		@@ -33,6 +34,7 @@ properties:
		- sifive,u54
		- sifive,u5
		- const: riscv
		- const: riscv # Simulator only
		description:
		Identifies that the hart uses the RISC-V instruction set
		and identifies the type of the hart.
		@@ -66,12 +68,8 @@ properties:
		insensitive, letters in the riscv,isa string must be all
		lowercase to simplify parsing.

		timebase-frequency:
		type: integer
		minimum: 1
		description:
		Specifies the clock frequency of the system timer in Hz.
		This value is common to all harts on a single system image.
		# RISC-V requires 'timebase-frequency' in /cpus, so disallow it here
		timebase-frequency: false

		interrupt-controller:
		type: object
		@@ -93,7 +91,6 @@ properties:

		required:
		- riscv,isa
		- timebase-frequency
		- interrupt-controller

		examples:

+3 −1

Original line number	Diff line number	Diff line
		@@ -324,8 +324,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev,
		if (!target)
		return -ENODEV;

		if (!of_device_is_available(target))
		if (!of_device_is_available(target)) {
		of_node_put(target);
		return 0;
		}

		rmem = __find_rmem(target);
		of_node_put(target);

+1 −0

Original line number	Diff line number	Diff line
		@@ -1207,6 +1207,7 @@ static int __init unittest_data_add(void)
		of_fdt_unflatten_tree(unittest_data, NULL, &unittest_data_node);
		if (!unittest_data_node) {
		pr_warn("%s: No tree to attach; not running tests\n", __func__);
		kfree(unittest_data);
		return -ENODATA;
		}