Skip to content

Commit 725d444

Browse files
committed
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
2 parents 39b1428 + ffc59c6 commit 725d444

File tree

5 files changed

+5
-52
lines changed

5 files changed

+5
-52
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ properties:
105105
G coefficient for temperature equation.
106106
Default for series 5 = 60000
107107
Default for series 6 = 57400
108-
multipleOf: 1000
108+
multipleOf: 100
109109
minimum: 1000
110110
$ref: /schemas/types.yaml#/definitions/uint32
111111

@@ -114,7 +114,7 @@ properties:
114114
H coefficient for temperature equation.
115115
Default for series 5 = 200000
116116
Default for series 6 = 249400
117-
multipleOf: 1000
117+
multipleOf: 100
118118
minimum: 1000
119119
$ref: /schemas/types.yaml#/definitions/uint32
120120

@@ -131,7 +131,7 @@ properties:
131131
J coefficient for temperature equation.
132132
Default for series 5 = -100
133133
Default for series 6 = 0
134-
multipleOf: 1000
134+
multipleOf: 100
135135
maximum: 0
136136
$ref: /schemas/types.yaml#/definitions/int32
137137

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 0 additions & 28 deletions
This file was deleted.

drivers/of/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ config OF_FLATTREE
5555

5656
config OF_EARLY_FLATTREE
5757
bool
58-
select DMA_DECLARE_COHERENT if HAS_DMA
58+
select DMA_DECLARE_COHERENT if HAS_DMA && HAS_IOMEM
5959
select OF_FLATTREE
6060

6161
config OF_PROMTREE

drivers/of/platform.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void)
552552
if (!of_get_property(node, "linux,opened", NULL) ||
553553
!of_get_property(node, "linux,boot-display", NULL))
554554
continue;
555-
dev = of_platform_device_create(node, "of-display.0", NULL);
555+
dev = of_platform_device_create(node, "of-display", NULL);
556556
of_node_put(node);
557557
if (WARN_ON(!dev))
558558
return -ENOMEM;

0 commit comments

Comments
 (0)