From nobody Mon May 25 07:29:38 2026 Received: from mail-dy1-f194.google.com (mail-dy1-f194.google.com [74.125.82.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B02952FFDD6 for ; Sun, 17 May 2026 02:37:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778985453; cv=none; b=B+oPczyxbgQ98V3wVKktk+rOjjZmnJt8Un0A1LAZqcfLTDuPpkqmqFyFVsdLlYa8mSvy1RoQDleY6gGOYaQEXV72JXt9ceB4rlFwwJCUs6joLYfU3mJYS8WxlZ0knGCvNyhLzkXOBw7sZnDrFK+AeP/a6zCzYdmpxmNKViBF2Wo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778985453; c=relaxed/simple; bh=fUau9dI7weMnTKKw29PEXKY6Jj1vPUuQ56Ydez/LhAE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tWTQambO7rU1OSRcuAylD6VDa3JsyrNLUKvlKwkYP79wt9ZxInScYgyqw8hVqCK/LZAK57Q+dQ8cfp1BkOBtFdm/YZZUVfiJH6bv5tfl/kTQTt6XOkmg5jnOS1Q5vbwqfL0xgsUs0/QLL1dpsQSOkE5RF4xlIjzInE1JxXlNuDw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=n9bnThnC; arc=none smtp.client-ip=74.125.82.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n9bnThnC" Received: by mail-dy1-f194.google.com with SMTP id 5a478bee46e88-2ee990e8597so3618749eec.1 for ; Sat, 16 May 2026 19:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778985452; x=1779590252; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Zew5CUOoACZD5lopeodjZqgYObC1uWELuu04uUQ7wlU=; b=n9bnThnCIAvtsO8+ZoVQ90oAb3pQQ4egajfxrWiusXhrpbiXgvKf9k835WfXU53bmL ZUPHMZTf8BweyadSDQFltLTQvTZg9R9YmXbYMebeEOuBY07F863uCilD7z2DwB7cNZiF R9ppYcwkc8Ud0EqJYkYVBbWXJGhwF9lmdRazwXO/9BlpY28v0HPIiEqgA6J7C6chrI+E WMOG/WVFqTxGgHb3Zubd1aXrmiYyX9PYuEyfU1pvkpaQsklOVPLA7CQ+La1zI2GKulKh qWoexgirJRD787JTEJTAekq4blYL0W5uYpBYY74+zGJnXNfB/66HjvFGQjA2rX8VIobu VVvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778985452; x=1779590252; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Zew5CUOoACZD5lopeodjZqgYObC1uWELuu04uUQ7wlU=; b=qx8ExMQkiJSrT3htLqOkS1sUMGswzT/Hz3ZdL8DwLP20SMBMhg7WIUImXm1D0gsL2X nMgMSLYuiiCCpr+Wx1C0v5kZkuVAD44XBaZSPIlKjfI407wAQtWFZXcTxikYT3r/HxNL r8iNopo0GxfMRJPlEEdrI1Eq16DJVBccUEP/fNTLrsqWKWX+oGE5t5wkWOGNiz6MADxx v25GzVKZOUuARlV2OUJbDBVlxkTb6MVxLiskrwDnvVKEQuyRQyplTrJcB/LrroxJB8vL 8m/izUAz9wrYRyvUoLsaqBtjhZ6WVNCepUP1S1oezyoptdvd9auBniESu4Bz8jVUA6NC fBQA== X-Gm-Message-State: AOJu0Yy70YKW/VtWRPupcCkmcDNn8WR/Tc9DAHwcLXB/bl80nccE8AEY 01ES6y6EnkZ7/wdygSBO0+Djb/BKEo+cbLjjHjWv7xyie3/RajjqmmMAe6YveP84hIc= X-Gm-Gg: Acq92OHnv8REm/j8AhHwMW4we/SZz3pROxtv/xxg+wqsT6PRz7ai5fB5kymDA+noxc9 6PcK73JiGxCJZ8FtRjDLWtIyfSS/JnJnedq8tzJjm3imm8XFnFbr9iKzvTYn6qDrP/p3yGkP7Kt MwrU0cduhWgpnK7bUhc/4Yi8nFoSuRCBfXH+6gT+3CcctSvy7FnKwCMn5gaaw2uzX4QKQDX7erS mXayUjhOj1aC5ECg7mNBHiHUzNsspf9pTwx7JwCkilDhoIdZVF1UyHvtMtN0NGtyOZB6k82m6X2 BVknsliLNmI//Mex+nj9eJM/OkXeX+eWZMSyNzPG8rZj9b63mdL9m5dd1Z9sH9szFi8wKKHFM44 0DwrHsLSM6TUa9/+mLHzGy6Hpt8hwGu0baZ1wKpGNbOkefgQCI0AAYOwca0hRKDmp2xiB4TghRQ D9A5nRz6CxjVms8KjBKFRmMuvLPrEM2qiix3PGjyuq/nQuLH/uGcVx5QnETbCvjbXTtbdaWzr6W rmzZfwVqg8IeW9llqbDbmsaqlPUuw9+rdcCRJV5He2LET6lg2E42cGaTUVwScLYI8yj4/8CmwIv 8zLxv2tzdmbjQh9x/g== X-Received: by 2002:a05:7300:6429:b0:2ed:e15:c927 with SMTP id 5a478bee46e88-303986e075amr5121300eec.35.1778985451696; Sat, 16 May 2026 19:37:31 -0700 (PDT) Received: from ethan-latitude5420.. (host-127-24.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.24]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-302978b1a79sm10850097eec.28.2026.05.16.19.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 May 2026 19:37:31 -0700 (PDT) From: Ethan Nelson-Moore To: linux-kernel@vger.kernel.org Cc: Ethan Nelson-Moore , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Russell King Subject: [PATCH v3] ARM: orion5x: update board check in mss2_pci_init() to use the DT Date: Sat, 16 May 2026 19:37:20 -0700 Message-ID: <20260517023723.92731-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The mss2_pci_init() function contains a check for the ARM machine ID via the machine_is_mss2() macro. The board concerned now supports only FDT booting, which does not use machine IDs, and therefore the code should be updated to check the DT compatible property instead. The machine was converted to FDT booting in commit fbf04d814d0a ("ARM: orion5x: convert Maxtor Shared Storage II to the Device Tree"). The presence of this machine ID check prevents the removal of machine IDs no longer used by the kernel from arch/arm/tools/mach-types, because the machine_is_*() macros are generated from mach-types. To resolve this issue, use of_machine_is_compatible() instead. Signed-off-by: Ethan Nelson-Moore --- Changes from v1: Fix mistake in commit message and remove Fixes tag - machine ID checks still work with DT booting if the bootloader passes the ID Changes from v2: correct changelog formatting (there were two --- sections in v2) arch/arm/mach-orion5x/board-mss2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-orion5x/board-mss2.c b/arch/arm/mach-orion5x/boa= rd-mss2.c index 9e3d69891d2f..322ae29d05aa 100644 --- a/arch/arm/mach-orion5x/board-mss2.c +++ b/arch/arm/mach-orion5x/board-mss2.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include "orion5x.h" @@ -47,7 +47,7 @@ static struct hw_pci mss2_pci __initdata =3D { =20 static int __init mss2_pci_init(void) { - if (machine_is_mss2()) + if (of_machine_is_compatible("maxtor,shared-storage-2")) pci_common_init(&mss2_pci); =20 return 0; --=20 2.43.0