From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AF9CEEBD; Mon, 2 Jun 2025 15:07:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748876859; cv=none; b=HckdzqNELalx9ZYSS3yJT8cHunQG3sNF8JmUyclD7PUg6FpceR9v/XAEQXCPe6uV6+hDYPosQbNUO6hOHEYgzjdU6w5XNHxH6ozs2g5+57aDiZ/AvvE2RtakRAyi+UIzRmXpkQdVy2Jz3PHp0sGXAxlrsV491PBkA7+9JgQ7S6c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748876859; c=relaxed/simple; bh=dkMCt2fkf1aUEPg9rhuKbqot2vBRLyCrlqF8IA5STGY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ji+juW3eXMf4gXS3zBznOdb9WjaGh78K0EU1m079PptXT9Dkpo8J/8eh351RsrZTVx55/MfQ2BVBr0UOrevtkHgKe1rV4jdHNu7kkt1SByUBgh4uXqCleZPRWGY1kMZPxXoMBmrDr7hjkVYwSVMh3OJ42StAAdSDzGny6LP1vEI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DUMIGNgI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DUMIGNgI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BE6FC4CEEB; Mon, 2 Jun 2025 15:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748876859; bh=dkMCt2fkf1aUEPg9rhuKbqot2vBRLyCrlqF8IA5STGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DUMIGNgIBPaU4aTGiW69AAKctW6ePC8ESFtE+RZ/ErgUnGuH4EiiDG8mukFK7vVC1 WZ6GIOtKUZOL6KGUNzLHf83jFMdhCW7MB//QNlj0a4XgvNBLCVMi8yNeId1fd8ki4M sEs+lD9OxsqG8pUtacKqZWu2DVM2Z4gm4XpA8a64= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andreas Schwab , "Rob Herring (Arm)" , Madhavan Srinivasan , Sasha Levin Subject: [PATCH 6.1 096/325] powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7 Date: Mon, 2 Jun 2025 15:46:12 +0200 Message-ID: <20250602134323.688782938@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134319.723650984@linuxfoundation.org> References: <20250602134319.723650984@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andreas Schwab [ 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 Acked-by: Rob Herring (Arm) [maddy: added "commit" work in depends-on to avoid checkpatch error] Signed-off-by: Madhavan Srinivasan Link: https://patch.msgid.link/875xmizl6a.fsf@igel.home Signed-off-by: Sasha Levin --- arch/powerpc/kernel/prom_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index a6090896f7497..ac669e58e2023 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -2974,11 +2974,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) -- 2.39.5