History

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"

Linus Torvalds committed 1 year ago

Commit f76b1682 parents 8bd9238 ce740958 files · +23 −9Browse files

Unified · Split

8 files
  1. Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml +1 −1
  2. Documentation/devicetree/bindings/bus/renesas,bsc.yaml +12 −0
  3. Documentation/devicetree/bindings/mmc/mmc-controller-common.yaml +1 −1
  4. MAINTAINERS +2 −1
  5. drivers/of/irq.c +1 −1
  6. drivers/of/overlay.c +1 −1
  7. drivers/of/unittest.c +1 −0
  8. include/linux/of.h +4 −4
Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml+1−1
@@ -44,7 +44,7 @@ properties: · 43 unmodified lines
44 44
45patternProperties:45patternProperties:
46 # All other properties should be child nodes with unit-address and 'reg'46 # 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]+$":
48 type: object48 type: object
49 additionalProperties: true49 additionalProperties: true
50 properties:50 properties:
Documentation/devicetree/bindings/bus/renesas,bsc.yaml+12−0
@@ -41,6 +41,18 @@ properties: · 40 unmodified lines
41 interrupts:41 interrupts:
42 maxItems: 142 maxItems: 1
43 43
44patternProperties:
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
44required:56required:
45 - reg57 - reg
46 58
Documentation/devicetree/bindings/mmc/mmc-controller-common.yaml+1−1
@@ -85,7 +85,7 @@ properties: · 84 unmodified lines
85 - for eMMC, the maximum supported frequency is 200MHz,85 - for eMMC, the maximum supported frequency is 200MHz,
86 - for SD/SDIO cards the SDR104 mode has a max supported86 - for SD/SDIO cards the SDR104 mode has a max supported
87 frequency of 208MHz,87 frequency of 208MHz,
88 - some mmc host controllers do support a max frequency upto88 - some mmc host controllers do support a max frequency up to
89 384MHz.89 384MHz.
90 So, lets keep the maximum supported value here.90 So, lets keep the maximum supported value here.
91 91
MAINTAINERS+2−1
@@ -19248,6 +19248,7 @@ M: Rob Herring <robh@kernel.org> · 19247 unmodified lines
19248M: Saravana Kannan <saravanak@google.com>19248M: Saravana Kannan <saravanak@google.com>
19249L: devicetree@vger.kernel.org19249L: devicetree@vger.kernel.org
19250S: Maintained19250S: Maintained
19251Q: http://patchwork.kernel.org/project/devicetree/list/
19251W: http://www.devicetree.org/19252W: http://www.devicetree.org/
19252C: irc://irc.libera.chat/devicetree19253C: irc://irc.libera.chat/devicetree
19253T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git19254T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
@@ -19268,7 +19269,7 @@ M: Krzysztof Kozlowski <krzk+dt@kernel.org> · 14 unmodified lines
19268M: Conor Dooley <conor+dt@kernel.org>19269M: Conor Dooley <conor+dt@kernel.org>
19269L: devicetree@vger.kernel.org19270L: devicetree@vger.kernel.org
19270S: Maintained19271S: Maintained
19271Q: http://patchwork.ozlabs.org/project/devicetree-bindings/list/19272Q: http://patchwork.kernel.org/project/devicetree/list/
19272C: irc://irc.libera.chat/devicetree19273C: irc://irc.libera.chat/devicetree
19273T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git19274T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
19274F: Documentation/devicetree/19275F: Documentation/devicetree/
drivers/of/irq.c+1−1
@@ -163,7 +163,7 @@ const __be32 *of_irq_parse_imap_parent(const __be32 *imap, int len, struct of_ph · 162 unmodified lines
163 * @out_irq: structure of_phandle_args updated by this function163 * @out_irq: structure of_phandle_args updated by this function
164 *164 *
165 * This function is a low-level interrupt tree walking function. It165 * This function is a low-level interrupt tree walking function. It
166 * can be used to do a partial walk with synthetized reg and interrupts166 * can be used to do a partial walk with synthesized reg and interrupts
167 * properties, for example when resolving PCI interrupts when no device167 * properties, for example when resolving PCI interrupts when no device
168 * node exist for the parent. It takes an interrupt specifier structure as168 * node exist for the parent. It takes an interrupt specifier structure as
169 * input, walks the tree looking for any interrupt-map properties, translates169 * input, walks the tree looking for any interrupt-map properties, translates
drivers/of/overlay.c+1−1
@@ -135,7 +135,7 @@ static BLOCKING_NOTIFIER_HEAD(overlay_notify_chain); · 134 unmodified lines
135 * @nb: Notifier block to register135 * @nb: Notifier block to register
136 *136 *
137 * Register for notification on overlay operations on device tree nodes. The137 * Register for notification on overlay operations on device tree nodes. The
138 * reported actions definied by @of_reconfig_change. The notifier callback138 * reported actions defined by @of_reconfig_change. The notifier callback
139 * furthermore receives a pointer to the affected device tree node.139 * furthermore receives a pointer to the affected device tree node.
140 *140 *
141 * Note that a notifier callback is not supposed to store pointers to a device141 * Note that a notifier callback is not supposed to store pointers to a device
drivers/of/unittest.c+1−0
@@ -4300,6 +4300,7 @@ static int of_unittest_pci_node_verify(struct pci_dev *pdev, bool add) · 4299 unmodified lines
4300 unittest(!np, "Child device tree node is not removed\n");4300 unittest(!np, "Child device tree node is not removed\n");
4301 child_dev = device_find_any_child(&pdev->dev);4301 child_dev = device_find_any_child(&pdev->dev);
4302 unittest(!child_dev, "Child device is not removed\n");4302 unittest(!child_dev, "Child device is not removed\n");
4303 put_device(child_dev);
4303 }4304 }
4304 4305
4305failed:4306failed:
include/linux/of.h+4−4
@@ -1134,7 +1134,7 @@ static inline bool of_phandle_args_equal(const struct of_phandle_args *a1, · 1133 unmodified lines
1134 * Search for a property in a device node and count the number of u8 elements1134 * Search for a property in a device node and count the number of u8 elements
1135 * in it.1135 * in it.
1136 *1136 *
1137 * Return: The number of elements on sucess, -EINVAL if the property does1137 * Return: The number of elements on success, -EINVAL if the property does
1138 * not exist or its length does not match a multiple of u8 and -ENODATA if the1138 * not exist or its length does not match a multiple of u8 and -ENODATA if the
1139 * property does not have a value.1139 * property does not have a value.
1140 */1140 */
@@ -1153,7 +1153,7 @@ static inline int of_property_count_u8_elems(const struct device_node *np, · 12 unmodified lines
1153 * Search for a property in a device node and count the number of u16 elements1153 * Search for a property in a device node and count the number of u16 elements
1154 * in it.1154 * in it.
1155 *1155 *
1156 * Return: The number of elements on sucess, -EINVAL if the property does1156 * Return: The number of elements on success, -EINVAL if the property does
1157 * not exist or its length does not match a multiple of u16 and -ENODATA if the1157 * not exist or its length does not match a multiple of u16 and -ENODATA if the
1158 * property does not have a value.1158 * property does not have a value.
1159 */1159 */
@@ -1172,7 +1172,7 @@ static inline int of_property_count_u16_elems(const struct device_node *np, · 12 unmodified lines
1172 * Search for a property in a device node and count the number of u32 elements1172 * Search for a property in a device node and count the number of u32 elements
1173 * in it.1173 * in it.
1174 *1174 *
1175 * Return: The number of elements on sucess, -EINVAL if the property does1175 * Return: The number of elements on success, -EINVAL if the property does
1176 * not exist or its length does not match a multiple of u32 and -ENODATA if the1176 * not exist or its length does not match a multiple of u32 and -ENODATA if the
1177 * property does not have a value.1177 * property does not have a value.
1178 */1178 */
@@ -1191,7 +1191,7 @@ static inline int of_property_count_u32_elems(const struct device_node *np, · 12 unmodified lines
1191 * Search for a property in a device node and count the number of u64 elements1191 * Search for a property in a device node and count the number of u64 elements
1192 * in it.1192 * in it.
1193 *1193 *
1194 * Return: The number of elements on sucess, -EINVAL if the property does1194 * Return: The number of elements on success, -EINVAL if the property does
1195 * not exist or its length does not match a multiple of u64 and -ENODATA if the1195 * not exist or its length does not match a multiple of u64 and -ENODATA if the
1196 * property does not have a value.1196 * property does not have a value.
1197 */1197 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t