Skip to content

Commit f76b168

Browse files
committed
Merge tag 'devicetree-fixes-for-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Allow child nodes on renesas-bsc bus binding - Drop node name pattern on allwinner,sun50i-a64-de2 bus binding - Switch DT patchwork to kernel.org from ozlabs.org - Fix some typos in docs and bindings - Fix reference count in PCI node unittest * tag 'devicetree-fixes-for-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: bus: renesas-bsc: allow additional properties dt-bindings: bus: allwinner,sun50i-a64-de2: don't check node names MAINTAINERS: Move DT patchwork to kernel.org of: unittest: Fix device reference count leak in of_unittest_pci_node_verify of: doc: Fix typo in doc comments. dt-bindings: mmc: Correct typo "upto" to "up to"
2 parents 8bd9238 + ce74095 commit f76b168

File tree

8 files changed

+23
-9
lines changed

8 files changed

+23
-9
lines changed

Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ properties:
4444

4545
patternProperties:
4646
# All other properties should be child nodes with unit-address and 'reg'
47-
"^[a-zA-Z][a-zA-Z0-9,+\\-._]{0,63}@[0-9a-fA-F]+$":
47+
"@[0-9a-f]+$":
4848
type: object
4949
additionalProperties: true
5050
properties:

Documentation/devicetree/bindings/bus/renesas,bsc.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,18 @@ properties:
4141
interrupts:
4242
maxItems: 1
4343

44+
patternProperties:
45+
# All other properties should be child nodes with unit-address and 'reg'
46+
"@[0-9a-f]+$":
47+
type: object
48+
additionalProperties: true
49+
properties:
50+
reg:
51+
maxItems: 1
52+
53+
required:
54+
- reg
55+
4456
required:
4557
- reg
4658

Documentation/devicetree/bindings/mmc/mmc-controller-common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ properties:
8585
- for eMMC, the maximum supported frequency is 200MHz,
8686
- for SD/SDIO cards the SDR104 mode has a max supported
8787
frequency of 208MHz,
88-
- some mmc host controllers do support a max frequency upto
88+
- some mmc host controllers do support a max frequency up to
8989
384MHz.
9090
So, lets keep the maximum supported value here.
9191

MAINTAINERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19248,6 +19248,7 @@ M: Rob Herring <robh@kernel.org>
1924819248
M: Saravana Kannan <saravanak@google.com>
1924919249
L: devicetree@vger.kernel.org
1925019250
S: Maintained
19251+
Q: http://patchwork.kernel.org/project/devicetree/list/
1925119252
W: http://www.devicetree.org/
1925219253
C: irc://irc.libera.chat/devicetree
1925319254
T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
@@ -19268,7 +19269,7 @@ M: Krzysztof Kozlowski <krzk+dt@kernel.org>
1926819269
M: Conor Dooley <conor+dt@kernel.org>
1926919270
L: devicetree@vger.kernel.org
1927019271
S: Maintained
19271-
Q: http://patchwork.ozlabs.org/project/devicetree-bindings/list/
19272+
Q: http://patchwork.kernel.org/project/devicetree/list/
1927219273
C: irc://irc.libera.chat/devicetree
1927319274
T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
1927419275
F: Documentation/devicetree/

drivers/of/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ const __be32 *of_irq_parse_imap_parent(const __be32 *imap, int len, struct of_ph
163163
* @out_irq: structure of_phandle_args updated by this function
164164
*
165165
* This function is a low-level interrupt tree walking function. It
166-
* can be used to do a partial walk with synthetized reg and interrupts
166+
* can be used to do a partial walk with synthesized reg and interrupts
167167
* properties, for example when resolving PCI interrupts when no device
168168
* node exist for the parent. It takes an interrupt specifier structure as
169169
* input, walks the tree looking for any interrupt-map properties, translates

drivers/of/overlay.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static BLOCKING_NOTIFIER_HEAD(overlay_notify_chain);
135135
* @nb: Notifier block to register
136136
*
137137
* Register for notification on overlay operations on device tree nodes. The
138-
* reported actions definied by @of_reconfig_change. The notifier callback
138+
* reported actions defined by @of_reconfig_change. The notifier callback
139139
* furthermore receives a pointer to the affected device tree node.
140140
*
141141
* Note that a notifier callback is not supposed to store pointers to a device

drivers/of/unittest.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4300,6 +4300,7 @@ static int of_unittest_pci_node_verify(struct pci_dev *pdev, bool add)
43004300
unittest(!np, "Child device tree node is not removed\n");
43014301
child_dev = device_find_any_child(&pdev->dev);
43024302
unittest(!child_dev, "Child device is not removed\n");
4303+
put_device(child_dev);
43034304
}
43044305

43054306
failed:

include/linux/of.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,7 @@ static inline bool of_phandle_args_equal(const struct of_phandle_args *a1,
11341134
* Search for a property in a device node and count the number of u8 elements
11351135
* in it.
11361136
*
1137-
* Return: The number of elements on sucess, -EINVAL if the property does
1137+
* Return: The number of elements on success, -EINVAL if the property does
11381138
* not exist or its length does not match a multiple of u8 and -ENODATA if the
11391139
* property does not have a value.
11401140
*/
@@ -1153,7 +1153,7 @@ static inline int of_property_count_u8_elems(const struct device_node *np,
11531153
* Search for a property in a device node and count the number of u16 elements
11541154
* in it.
11551155
*
1156-
* Return: The number of elements on sucess, -EINVAL if the property does
1156+
* Return: The number of elements on success, -EINVAL if the property does
11571157
* not exist or its length does not match a multiple of u16 and -ENODATA if the
11581158
* property does not have a value.
11591159
*/
@@ -1172,7 +1172,7 @@ static inline int of_property_count_u16_elems(const struct device_node *np,
11721172
* Search for a property in a device node and count the number of u32 elements
11731173
* in it.
11741174
*
1175-
* Return: The number of elements on sucess, -EINVAL if the property does
1175+
* Return: The number of elements on success, -EINVAL if the property does
11761176
* not exist or its length does not match a multiple of u32 and -ENODATA if the
11771177
* property does not have a value.
11781178
*/
@@ -1191,7 +1191,7 @@ static inline int of_property_count_u32_elems(const struct device_node *np,
11911191
* Search for a property in a device node and count the number of u64 elements
11921192
* in it.
11931193
*
1194-
* Return: The number of elements on sucess, -EINVAL if the property does
1194+
* Return: The number of elements on success, -EINVAL if the property does
11951195
* not exist or its length does not match a multiple of u64 and -ENODATA if the
11961196
* property does not have a value.
11971197
*/

0 commit comments

Comments
 (0)