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

Documentation/devicetree/bindings/clock/imx5-clock.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ examples:
		};

		can@53fc8000 {
		compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
		compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan";
		reg = <0x53fc8000 0x4000>;
		interrupts = <82>;
		clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>, <&clks IMX5_CLK_CAN1_SERIAL_GATE>;

+11 −7

Original line number	Diff line number	Diff line
		@@ -20,14 +20,17 @@ properties:
		- fsl,imx8qm-flexcan
		- fsl,imx8mp-flexcan
		- fsl,imx6q-flexcan
		- fsl,imx53-flexcan
		- fsl,imx35-flexcan
		- fsl,imx28-flexcan
		- fsl,imx25-flexcan
		- fsl,p1010-flexcan
		- fsl,vf610-flexcan
		- fsl,ls1021ar2-flexcan
		- fsl,lx2160ar1-flexcan
		- items:
		- enum:
		- fsl,imx53-flexcan
		- fsl,imx35-flexcan
		- const: fsl,imx25-flexcan
		- items:
		- enum:
		- fsl,imx7d-flexcan
		@@ -80,6 +83,7 @@ properties:
		req_gpr is the gpr register offset of CAN stop request.
		req_bit is the bit offset of CAN stop request.
		$ref: /schemas/types.yaml#/definitions/phandle-array
		items:
		items:
		- description: The 'gpr' is the phandle to general purpose register node.
		- description: The 'req_gpr' is the gpr register offset of CAN stop request.

+3 −1

Original line number	Diff line number	Diff line
		@@ -1034,11 +1034,13 @@ out:
		*/
		bool of_dma_is_coherent(struct device_node *np)
		{
		struct device_node *node = of_node_get(np);
		struct device_node *node;

		if (IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT))
		return true;

		node = of_node_get(np);

		while (node) {
		if (of_property_read_bool(node, "dma-coherent")) {
		of_node_put(node);