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 AB0B72EEBDF; Mon, 5 May 2025 22:23:25 +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=1746483805; cv=none; b=W+kSc9h7psZQBJ9DAgbUy+ySDd+GDBVsOx9dsTqB1USbrxdxwBQN+GVBp65JVNIqh/96eXxmqECc9xPCU/7xHzEd1mc8+lbttC91qEFpU38lk86fZVZfGdfdi+nhr4aap6QxZv/k0LmpoZ4I8oPsFS1s7xkE7WvVWCExw9kEevY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746483805; c=relaxed/simple; bh=bogz9Du2XlSVscSMUP8bER1aXgn506UsMYXn8KFqCwU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=O+hPA2doPh/LV7q9tZ3NrKMHy7TxH+r6/996WTYpDdRXDIX+oXkWaNmaT0SupmnTXOtECrCLOIvT9oSK4Zt7iIAAuu94z4/n+22WJFXb1TOza7FtPOuDS+TaFGtKRby38CLAEkfOSEwV3j/9/QP4JPw1Duwe+Akw71yvDYg88jk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JwrSxt84; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JwrSxt84" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E4D6C4CEE4; Mon, 5 May 2025 22:23:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746483805; bh=bogz9Du2XlSVscSMUP8bER1aXgn506UsMYXn8KFqCwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JwrSxt84e/oJudpVKBQcnytYdmYPVMS8qEieu6rx8F3lENMWK3Qbe4Rrne0D85DAs aRlqVEm1cblHIIb3SE4+xOrQADrTEQK/t+vbb/zD2eb/QvngH7fOAeheVtv3h84FI0 1o2k/YQB4yt8u8GiNaFqAnHAaDZHo5roefUnIRU7A4ZMwXeWSh1XNdVoE4ubn6pQMO yZ9UYlAmHZh7+IjUk7bq04rp9ApkKP36XIg1NpkTszonztB3/ng/dC2pyLP3RRajDx Yhd1/FLLvIm68WhlQfqBCOpr0oQ92v07Vojnu3OydgEHUAPN04u6T+xtEeZyxqRXjn eYSALhrnyOs2Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andreas Schwab , Rob Herring , Madhavan Srinivasan , Sasha Levin , mpe@ellerman.id.au, sourabhjain@linux.ibm.com, mahesh@linux.ibm.com, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 6.14 225/642] powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7 Date: Mon, 5 May 2025 18:07:21 -0400 Message-Id: <20250505221419.2672473-225-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit 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 57082fac46687..fe4659ba8c22a 100644 --- 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) -- 2.39.5