{"id":2224048,"url":"http://patchwork.ozlabs.org/api/patches/2224048/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260416172627.690396-1-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260416172627.690396-1-peter.maydell@linaro.org>","list_archive_url":null,"date":"2026-04-16T17:26:27","name":"hw: Move ARM_SYSCTL_GPIO definitions to arm sysctl specific header","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6f3436f48c9ac79ba9dc002576b62f0aad268973","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260416172627.690396-1-peter.maydell@linaro.org/mbox/","series":[{"id":500189,"url":"http://patchwork.ozlabs.org/api/series/500189/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500189","date":"2026-04-16T17:26:27","name":"hw: Move ARM_SYSCTL_GPIO definitions to arm sysctl specific header","version":1,"mbox":"http://patchwork.ozlabs.org/series/500189/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224048/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224048/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=leqm9TcF;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fxQ1N68RKz1yCv\n\tfor ; Fri, 17 Apr 2026 03:27:03 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wDQUC-0006lE-4v; Thu, 16 Apr 2026 13:26:40 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wDQUA-0006kk-0x\n for qemu-devel@nongnu.org; Thu, 16 Apr 2026 13:26:38 -0400","from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1wDQU6-00068q-Dz\n for qemu-devel@nongnu.org; Thu, 16 Apr 2026 13:26:37 -0400","by mail-wm1-x32c.google.com with SMTP id\n 5b1f17b1804b1-488aa77a06eso134939975e9.0\n for ; Thu, 16 Apr 2026 10:26:32 -0700 (PDT)","from lanath.. (wildly.archaic.org.uk. [81.2.115.145])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-488fa73cbe3sm2022615e9.0.2026.04.16.10.26.28\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 16 Apr 2026 10:26:28 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1776360390; x=1776965190; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:message-id:date:subject:to\n :from:from:to:cc:subject:date:message-id:reply-to;\n bh=dguMNu+rblwGHa+gUuLRqPdQYImX3ZlNd0zX09DdGe4=;\n b=leqm9TcFn2DWp4wNJO3Y6XUJ7/NHMnrTCZV2m69xib8+L+gqbN0Td3tJ0Sa519gzVe\n eZh9r1Ag9M0fsUL7otIGOzDFK4faNCa/MatS9ASy1b0jBNSR8neLFhkZwsVHrBQAYbZ+\n ItPYrb/ACmdcUVckHBfATC9YJu6t4AOkAo4Ci549YiTCSM75ISqmXjBO+9sa7zYNhU+O\n PBHq8Qmuj10S0u23INOYeLcIUDJZ2H/xKSXXEG5BsIoh2sFeX8Uq1+KJtU74Y4ytJG1C\n d5nbvkHE9st5+J+0SYwpKxAPkqYoH7XNReHb3HWMbdX1udh9ULhJ6XbM9nizEqOU6SRR\n Eplg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776360390; x=1776965190;\n h=content-transfer-encoding:mime-version:message-id:date:subject:to\n :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id\n :reply-to;\n bh=dguMNu+rblwGHa+gUuLRqPdQYImX3ZlNd0zX09DdGe4=;\n b=fk9ffrtsgMiKGrLN0NBRobNbkYt0olTdiG4nzpud9+7BuZCic0wNhou/4ci1fb8gms\n hzN8At57t7QpfjLzbEtZxLn9jVyGBhk7Td7fwprLu1+ZUPB3Px8TpHoXS06rk1ZNxmqd\n uZkhh3wiIQc97MqE1k37A4B5swzwplDBpyhjAIpQ9T/Ucy0c4CjZWDt5KQm17aBoGQ9B\n DxcVN9+ElmyoFBPe/GGhN9B58YnaYLiwc4vhkYpWtFm1wrT9p+HSS+kbYT2s2G/EWlpl\n A6WW+6M9J/km/gNN86W1Vf5kqWU7xcyXgYF77YviNwL6CADPmYWNOL6tcyB8bP3UlReY\n AydQ==","X-Forwarded-Encrypted":"i=1;\n AFNElJ8rCdxY4WQet5cK31dvbw+1D7clXWQZe6+i/Gy18PuFUwGf32+NQkw4V+Gxm2wqcb5MFFirKGauFW3P@nongnu.org","X-Gm-Message-State":"AOJu0YwI8Eth+DtUMDFZFKB7mLKncuyiELmESps75vcRgyJRUi9ODuyz\n lh5BAAijnIs5fASvyhjRmaeenJf51EME/vfMOKD2SHEFnm4pwnxTv7m0v3qIP6Lqn3ZW4i7KWsu\n XANNXuS8=","X-Gm-Gg":"AeBDieu4od/aPJInf0H7WoGxO2MrDWoKvDPYdF89atCUb3Hyy7xUHRx9xVOzbFOEycL\n MRi01II1yWCWNcyE2IcdKmDgzPavd8a96b1ysTeltIi424cgVuqjuROAjJ4JQA7Bm1D7bNYSPHh\n SdndueBEKwM7JFJFfV+fhcSxPNH4DaHU+BvPlHmh63JWsCOU93qOu7/ht/2hsYk7cTEJtKcNyA7\n b/OTF7pqb0GgbRp9skZwHlFkaL3Q0FyUnQ48DBb0hJ6+082/9Mv39bHxAWc2o+x3atYexshIOFs\n PcKGLnhbm37tdGAVQRKx2bodcs4QRG7uuODiL8Hmvcao9eDhoqu/zmBNvJJeC1tk0VPMKh0E+qj\n mXCJ0MY1zp0TDH2RZqTqEt6R8TrwphMxDaLZlVHlCAq9NZ9HPzSiEkdQKebrneCu/EqIteT5XG+\n wdSChZio71bT0r2QDTZQjvAZ0038phaYdw5Q6Ra7UamNgRQHj1r2jrNi5BuwkKnK8O2aMDKNza1\n UH5Fv+zgZIANwGWd36G9DdbzYEwHoS9J9eubtz2Uw==","X-Received":"by 2002:a05:600c:c108:b0:488:c282:e78c with SMTP id\n 5b1f17b1804b1-488d684bd3amr260538165e9.19.1776360390170;\n Thu, 16 Apr 2026 10:26:30 -0700 (PDT)","From":"Peter Maydell ","To":"qemu-arm@nongnu.org,\n\tqemu-devel@nongnu.org","Subject":"[PATCH] hw: Move ARM_SYSCTL_GPIO definitions to arm sysctl specific\n header","Date":"Thu, 16 Apr 2026 18:26:27 +0100","Message-ID":"<20260416172627.690396-1-peter.maydell@linaro.org>","X-Mailer":"git-send-email 2.43.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::32c;\n envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"include/hw/arm/primecell.h used to be more expansive, but now the\nonly thing it defines is the ARM_SYSCTL_GPIO_* constants for the GPIO\nlines for the arm-sysctl system-control device used on the Realview,\nVersatile and Versatile Express boards.\n\nReplace it with a header file specific to that device.\n\nvirt.c and vmapple.c included primecell.h despite not using the\nconstants it defined; there we can simply drop the include entirely.\n\nSigned-off-by: Peter Maydell \n---\nTrivial cleanup; I was trying out emacs eglot and it flagged\nup that virt.c includes primecell.h unnecessarily, which led\nme to this.\n---\n MAINTAINERS | 2 +-\n hw/arm/realview.c | 2 +-\n hw/arm/vexpress.c | 2 +-\n hw/arm/virt.c | 1 -\n hw/misc/arm_sysctl.c | 2 +-\n hw/vmapple/vmapple.c | 1 -\n include/hw/arm/primecell.h | 12 ------------\n include/hw/misc/arm_sysctl.h | 16 ++++++++++++++++\n 8 files changed, 20 insertions(+), 18 deletions(-)\n delete mode 100644 include/hw/arm/primecell.h\n create mode 100644 include/hw/misc/arm_sysctl.h","diff":"diff --git a/MAINTAINERS b/MAINTAINERS\nindex ad215eced8..7f2b34d652 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -761,7 +761,6 @@ F: hw/ssi/pl022.c\n F: include/hw/ssi/pl022.h\n F: hw/rtc/pl031.c\n F: include/hw/rtc/pl031.h\n-F: include/hw/arm/primecell.h\n F: hw/timer/cmsdk-apb-timer.c\n F: include/hw/timer/cmsdk-apb-timer.h\n F: tests/qtest/cmsdk-apb-timer-test.c\n@@ -1106,6 +1105,7 @@ F: hw/*/versatile*\n F: hw/i2c/arm_sbcon_i2c.c\n F: include/hw/i2c/arm_sbcon_i2c.h\n F: hw/misc/arm_sysctl.c\n+F: include/hw/misc/arm_sysctl.h\n F: docs/system/arm/versatile.rst\n \n Virt\ndiff --git a/hw/arm/realview.c b/hw/arm/realview.c\nindex c9558be4d4..bfcce4419a 100644\n--- a/hw/arm/realview.c\n+++ b/hw/arm/realview.c\n@@ -12,9 +12,9 @@\n #include \"cpu.h\"\n #include \"hw/core/sysbus.h\"\n #include \"hw/arm/boot.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"hw/arm/machines-qom.h\"\n #include \"hw/core/split-irq.h\"\n+#include \"hw/misc/arm_sysctl.h\"\n #include \"hw/net/lan9118.h\"\n #include \"hw/net/smc91c111.h\"\n #include \"hw/pci/pci.h\"\ndiff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c\nindex cc6ae7d4c4..9db8a68ba9 100644\n--- a/hw/arm/vexpress.c\n+++ b/hw/arm/vexpress.c\n@@ -26,8 +26,8 @@\n #include \"qemu/datadir.h\"\n #include \"hw/core/sysbus.h\"\n #include \"hw/arm/boot.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"hw/arm/machines-qom.h\"\n+#include \"hw/misc/arm_sysctl.h\"\n #include \"hw/net/lan9118.h\"\n #include \"hw/i2c/i2c.h\"\n #include \"net/net.h\"\ndiff --git a/hw/arm/virt.c b/hw/arm/virt.c\nindex ec0d8475ca..16e905dca8 100644\n--- a/hw/arm/virt.c\n+++ b/hw/arm/virt.c\n@@ -36,7 +36,6 @@\n #include \"monitor/qdev.h\"\n #include \"hw/core/sysbus.h\"\n #include \"hw/arm/boot.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"hw/arm/virt.h\"\n #include \"hw/arm/machines-qom.h\"\n #include \"hw/block/flash.h\"\ndiff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c\nindex 7b320f89c1..ebc95b9bb5 100644\n--- a/hw/misc/arm_sysctl.c\n+++ b/hw/misc/arm_sysctl.c\n@@ -14,8 +14,8 @@\n #include \"system/runstate.h\"\n #include \"qemu/bitops.h\"\n #include \"hw/core/sysbus.h\"\n+#include \"hw/misc/arm_sysctl.h\"\n #include \"migration/vmstate.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"qemu/log.h\"\n #include \"qemu/module.h\"\n #include \"qom/object.h\"\ndiff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c\nindex b1379eafef..607181f517 100644\n--- a/hw/vmapple/vmapple.c\n+++ b/hw/vmapple/vmapple.c\n@@ -32,7 +32,6 @@\n #include \"hw/core/sysbus.h\"\n #include \"hw/usb/usb.h\"\n #include \"hw/arm/boot.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"hw/char/pl011.h\"\n #include \"hw/intc/arm_gic.h\"\n #include \"hw/intc/arm_gicv3_common.h\"\ndiff --git a/include/hw/arm/primecell.h b/include/hw/arm/primecell.h\ndeleted file mode 100644\nindex 7337c3b3ca..0000000000\n--- a/include/hw/arm/primecell.h\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-#ifndef PRIMECELL_H\n-#define PRIMECELL_H\n-\n-/* Declarations for ARM PrimeCell based periperals. */\n-/* Also includes some devices that are currently only used by the\n- ARM boards. */\n-\n-/* arm_sysctl GPIO lines */\n-#define ARM_SYSCTL_GPIO_MMC_WPROT 0\n-#define ARM_SYSCTL_GPIO_MMC_CARDIN 1\n-\n-#endif\ndiff --git a/include/hw/misc/arm_sysctl.h b/include/hw/misc/arm_sysctl.h\nnew file mode 100644\nindex 0000000000..424069cd6e\n--- /dev/null\n+++ b/include/hw/misc/arm_sysctl.h\n@@ -0,0 +1,16 @@\n+/*\n+ * Status and system control registers for ARM RealView/Versatile boards.\n+ *\n+ * Copyright (c) Linaro Ltd\n+ *\n+ * SPDX-License-Identifier: GPL-2.0-or-later\n+ */\n+\n+#ifndef HW_MISC_ARM_SYSCTL_H\n+#define HW_MISC_ARM_SYSCTL_H\n+\n+/* arm_sysctl inbound GPIO lines */\n+#define ARM_SYSCTL_GPIO_MMC_WPROT 0\n+#define ARM_SYSCTL_GPIO_MMC_CARDIN 1\n+\n+#endif\n","prefixes":[]}