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 BF761381EA3; Mon, 5 May 2025 23:09:02 +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=1746486543; cv=none; b=bwus5kJEwQjZFQWJgHfZD8ZtADSmGV+WD73iHkvVHGczke9Lv5H2PtsGifIgB4/4MOT1P0ZdsxPdzjSVNIdrNbc/UPi8G4A4PO8Wj+DUMElDim0UF3h4+35L6zXnobSaHOkRrAmre8GMj5fywzoS/Ptgp/MC6uEH0kS72tLfhwA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486543; c=relaxed/simple; bh=ZwZ3YGeWzp0VrR/6gg4OpFWFODZyzKKrozm/7+HYum8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hUfm0OVBlm4rQoj3fiyh18OGBaHOsv+6LCKj2/eY58tHfgApyDfiTJQM/HC5skwXGfQNwPjPztMg+x1o84jYNkNLMgZn/bwNeq1OKuJdg/YigKI0H+khCkltue+76SCm0cmoNtH89tVmSPJN+w93KOzt7JH7+y7AAHocO1r1M6o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E2fDnh7I; 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="E2fDnh7I" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92CA7C4CEE4; Mon, 5 May 2025 23:09:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486542; bh=ZwZ3YGeWzp0VrR/6gg4OpFWFODZyzKKrozm/7+HYum8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E2fDnh7IrhDIWi+Q0HN3iRp2K5WGoqsrZdZk4Hvas5qUFHs2ALAOoXFI4hofrV+ea TXvhgTMB+27zLiM+bSe6vktQiAC9PUDCaSyrTbiHwSZ6jRpJX6UNzCeTBrdQdCJVlo Xs2bn7w4rHVI477FQg4/rpUb4muK3QzEValD6qhZOnK/GyJFii2vl3OS4eUtmCmsyc paZyMGVp87VEZzZK9uWZxGKOVnt40s73vNUPVv6cuD5K6YbWwMeCfFdU07qnc/5vrO cXE+ZLW7I2bfW3Y/NxTynx9ZHMEExG4qrvS93WRyLxc7KJ9kqbgoT98Zvet/J4PNuh WRTODpv4MYlZg== 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, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 6.1 081/212] powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7 Date: Mon, 5 May 2025 19:04:13 -0400 Message-Id: <20250505230624.2692522-81-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505230624.2692522-1-sashal@kernel.org> References: <20250505230624.2692522-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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.1.136 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 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