From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f66.google.com (mail-dl1-f66.google.com [74.125.82.66]) (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 2D3B3351C1F for ; Sun, 10 May 2026 05:40:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778391619; cv=none; b=OM2a1eKQk0G6RLiuZ0XvKD+wn4lJXMCm28ZNAJAAaEU0szWYPMTJEkmgeNZn4yawAqJqxPK91l+xrAIhGuvWThOawHw269/7/OswrGVqRABsWFCCnqkX/cE8+dbXnU8RVaW0MBPkiRotfAR1RN8Rwr+fGaLkQS89oE4XQ0/eI/M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778391619; c=relaxed/simple; bh=XCudVa4BAbOztC3t9P2YqnvAIZ7AM6eZXq5St9kO1Go=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=gN6iggKw6qzkBAa3N424oqsM9DIk/cD+tTsdFZ2OQR08XfwM6dIX8eyWGLlwnWx91KtvgM+Nyoz/a2JPBIDrkky4myvX2NXAv0xToxsZrWpBAbwGLGtTSrnw2J+FTBzzDk/61yMB0asU5eydh+Y+n22M6kxIBmP0H2Tk4IvUOqQ= 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=YDohhdoQ; arc=none smtp.client-ip=74.125.82.66 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="YDohhdoQ" Received: by mail-dl1-f66.google.com with SMTP id a92af1059eb24-12c1a170a50so4440786c88.0 for ; Sat, 09 May 2026 22:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778391617; x=1778996417; 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=DObyqlLUlU2T69S+lFw13nh8/uq8t5nP6NUxEsRIAFs=; b=YDohhdoQGtxuGhbsfoij4bt6mp6xMXbP4XiAcK+m9zVmTocBvJQy0DCDmeTZ1clnaS 88fsnlq3UMWoXs2ATxt50wiiAJSIxD5rn+U1BGt1XGPM2MLCjsjc3MD1F9s0v0cvrxrs rffK/aB9Qnp9lRLDeGby3Syi9V0qHitL6LiBAalZ5qlZXljUbGhLmy2bg1KlWRKTzkwn HxOKcHXIeR12gdyC9pp8KYyag1rQbkuXkp6sNUCWLMf+w+XkcKaIkhOjxo95w1nCEHA1 3HG+MAI7DTBD3c3n1vhpAF7MyrVkPETf2Uw9oFih9dFPsw5rC4Z+Zny80VWdEIJ8KBTe XNOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778391617; x=1778996417; 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=DObyqlLUlU2T69S+lFw13nh8/uq8t5nP6NUxEsRIAFs=; b=XZdDNz68qswG1zwzlhLspcORVlzqYlsflj/hpCeo5lADvyrex2LTvCtmW/R0o8AEyC h9qsXngMF+ePsXRtLgjw/oxJKh4aJ7xD9UYhEcfPjfTk+JUcvKB5q6qxHVrWgxDRvxUd mg/gRD95vGMKUw8xFERfoSXGry+wx1db59RGj6PqRksJweEjoLd4tzpVnUTh3RJv3zyH lMtpaz/vJUx3dMDr88Qya8IfoUutxrVjh4cOY4amAsqBCON+v0tUDrmpouSybj5jJOcc TDMfDyDjP9LK202sdW18DGJlmjvrXBb4l8KejUVU2SWHkDOhlNx/kZYIZduvHdqiGdYM 12Nw== X-Gm-Message-State: AOJu0YxcpIHI7aZO4KWa92Rs1gt264wiPTWPYDrBmjOWyKmO2X/Vo3yn QKpoH6kV7acjHtNL+ElXeFWEiinXaYFfKbiwM6Ms32CtBs7akFr37wU6kdOA0UuAgXc= X-Gm-Gg: Acq92OH3Zy6oO4DT949oT/CHhwKNKhBGaVd49uIIjGYGnN9oE1MZx0cvEyK08rO83wk Ul2Ywp+QVUZZ7ncOV6LfQvp7/ibNUuZsnZ3ElwhSmH1kyKxXMwZJkruhqjQztqDGdxen+MHp02g oiRT4CleaCXRRJD5lydvYQHadhAMIHncVL7fPZS6+lc3wwF+PsfY+CYkDysl1Ae5tw/fIXAvFbz KJLKbM7sZopYXh3qDUsEY8Pb3thw4lgGaAwp74T3CYH7cqxeRPGir+vA2JeDH4vniBpBD8zv1aD yzcDWdHBzje+DB7od6GAFOwl6gEBVjVBuBKnLdJ5FqsiF1tEdmzYXkNJs4a70hWcx67uX+dmuMD Mo/mflby+cM8+gFmi9Dl70nukMkLmiRvdXTar9pgn0aZklk68UnImEtlzADjzr2P+km5w6C7YdE EaIM+XWqDMJ+DRHmWcNkm12Tf9wXPgIrNMg9r6eBkPvHTp/7h102lPKQMbGwX/pUX8KDwr/RaK+ JrnHL1XqeM0XSQAfVchWTfmTfjRq+JxuVtQnG8LvxnIEQLPXSCJ1kFcKay3YwaqJWHEnaM+aPuZ IHJ4QmodgIopqfBnvQ== X-Received: by 2002:a05:7022:7a6:b0:12d:de3f:f3e3 with SMTP id a92af1059eb24-131a69edde3mr8869045c88.35.1778391616917; Sat, 09 May 2026 22:40:16 -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 a92af1059eb24-1327810ffb9sm12680781c88.2.2026.05.09.22.40.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2026 22:40:16 -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 v2] ARM: orion5x: update board check in mss2_pci_init() to use the DT Date: Sat, 9 May 2026 22:39:35 -0700 Message-ID: <20260510053939.564314-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: 8bit 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. --- 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 Signed-off-by: Ethan Nelson-Moore --- 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/board-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 = { 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); return 0; -- 2.43.0