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

[ Upstream commit 7e67ef889c9ab7246547db73d524459f47403a77 ]

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

Depends-on: commit 045b14ca5c36 ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 57082fac46687099a4eb5b8f45ca1a2b6571e163..fe4659ba8c22aafd3a31cd977578fe534c8765ab 100644 (file)
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2889,11 +2889,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)