Skip to content

Commit 7e67ef8

Browse files
andreas-schwabmaddy-kerneldev
authored andcommitted
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: commit 045b14c ("of: WARN on deprecated #address-cells/#size-cells handling") Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Acked-by: Rob Herring (Arm) <robh@kernel.org> [maddy: added "commit" work in depends-on to avoid checkpatch error] Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/875xmizl6a.fsf@igel.home
1 parent aca95fb commit 7e67ef8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/powerpc/kernel/prom_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2889,11 +2889,11 @@ static void __init fixup_device_tree_pmac(void)
28892889
char type[8];
28902890
phandle node;
28912891

2892-
// Some pmacs are missing #size-cells on escc nodes
2892+
// Some pmacs are missing #size-cells on escc or i2s nodes
28932893
for (node = 0; prom_next_node(&node); ) {
28942894
type[0] = '\0';
28952895
prom_getprop(node, "device_type", type, sizeof(type));
2896-
if (prom_strcmp(type, "escc"))
2896+
if (prom_strcmp(type, "escc") && prom_strcmp(type, "i2s"))
28972897
continue;
28982898

28992899
if (prom_getproplen(node, "#size-cells") != PROM_ERROR)

0 commit comments

Comments
 (0)