Skip to contentSkip to conversation

powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7

PATCH Applied Andreas Schwab 3 participants 3 messages Jan 13, 2025 – Mar 14, 2025 PowerPC

lore
Share & tools
lore

Andreas Schwab

author
#0 lore raw

PATCH 1/1 powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7

Similar to the PowerMac3,1, the PowerBook6,7 is missing the #size-cells property on the i2s node.

Depends-on: 045b14ca5c36 ("of: WARN on deprecated #address-cells/#size-cells handling")

Signed-off-by Andreas Schwab <[email protected]>
---
 arch/powerpc/kernel/prom_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/prom_init.c +2 -2
index 8e776ba39497..24b1523eeea8 100644
@@ -2898,11 +2898,11 @@ static void __init fixup_device_tree_pmac(void)
 	char type[8];
 	phandle node;
 
-	// Some pmacs are missing #size-cells on escc nodes
+	// Some pmacs are missing #size-cells on escc or i2s nodes
 	for (node = 0; prom_next_node(&node); ) {
 		type[0] = '\0';
 		prom_getprop(node, "device_type", type, sizeof(type));
-		if (prom_strcmp(type, "escc"))
+		if (prom_strcmp(type, "escc") && prom_strcmp(type, "i2s"))
 			continue;
 
 		if (prom_getproplen(node, "#size-cells") != PROM_ERROR)
Signature · 7 lines
2.48.0


-- 
Andreas Schwab, [email protected]
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Andreas Schwab

Similar to the PowerMac3,1, the PowerBook6,7 is missing the #size-cells property on the i2s node.

Depends-on: 045b14ca5c36 ("of: WARN on deprecated #address-cells/#size-cells handling")

Signed-off-by Andreas Schwab <[email protected]>
---
 arch/powerpc/kernel/prom_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Acked-by Rob Herring (Arm) <[email protected]>