From patchwork Fri Jul 12 13:15:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 13731763 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 6ABCA16EB7B; Fri, 12 Jul 2024 13:15:22 +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=1720790122; cv=none; b=nqRQPcJ+sD+wBHMJ/muj8UktHP6fw+oYYBeAPTD8meXGH1w4Vnty9hl5aRzIQjbkWm5z+TukC7WcawZeZ5nj7CKRXbuFksq0BabfFONngiMBU0nXXx3a6GjGgQI9sIMun7xIGxBqOr8d5exd5xON0316S6iqm9PJ/8jFbOlF84Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720790122; c=relaxed/simple; bh=raCX3FLzfIuotLZqJ3wF6jjKTcaaKJ8KCg82aZWFMgw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W/ALLh4srO7+00bA6Rgod3BAylyYtAIqFFRP1iKzMRBVr+6YeN77b8R/AB5kRWLtR9vEKoKYKL7X9apGGcc/EOcKPQAf7cgJ4Ju9Jah7ohTB2L5s4jr7gDAIq5aquNB6clmw0KmwpS7UOv0oLsMgX4IP8ACQP0O9hzMXImSFaUo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AJIRJKxw; 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="AJIRJKxw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F75DC4AF0E; Fri, 12 Jul 2024 13:15:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720790122; bh=raCX3FLzfIuotLZqJ3wF6jjKTcaaKJ8KCg82aZWFMgw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AJIRJKxwF3Al8DHIp0C6poetpPMQ937gL6rxbyAZGsO1ZgiNFlru29F5jCXXXebSB dYQlKMUXTwtx2oZtKmfh+NPPoBUhtbX26Zu8SLxC4FJhSetA0SVTpsUKddo96GMlhh llpBV7GbJ8sSF+OQ/7ONKPZhgaXkohzuBl/wb6da7CI5t5+MN6fP//uYyc3kONhSe2 tI0dxH3qWoYqFS6o2bhFFx11VN3WRKGZq+x4P1yPRQ4LZ/0XbG5wdp7pw/YKXQhyzq jLZ2SyMBKEqDj3lz5rlJIkVSunGBPTPGWhxyG866ZZiUkDk0sWa5mo8e2v9MzeIZuC ctU2w1nKd7CDA== Received: from mchehab by mail.kernel.org with local (Exim 4.97.1) (envelope-from ) id 1sSG7K-00000003iDx-130C; Fri, 12 Jul 2024 15:15:18 +0200 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , "Jonathan Cameron" , "Michael S. Tsirkin" , "Shiju Jose" , Ani Sinha , Igor Mammedov , Peter Maydell , Shannon Zhao , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 1/7] arm/virt: place power button pin number on a define Date: Fri, 12 Jul 2024 15:15:08 +0200 Message-ID: <88fcd8947095ec6dff8ea709c8ceffa72b16f686.1720789921.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-edac@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Mauro Carvalho Chehab Having magic numbers inside the code is not a good idea, as it is error-prone. So, instead, create a macro with the number definition. Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Jonathan Cameron --- hw/arm/virt-acpi-build.c | 6 +++--- hw/arm/virt.c | 3 ++- include/hw/arm/virt.h | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index e10cad86dd73..ad0a0bcec310 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -154,10 +154,10 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap, aml_append(dev, aml_name_decl("_CRS", crs)); Aml *aei = aml_resource_template(); - /* Pin 3 for power button */ - const uint32_t pin_list[1] = {3}; + /* Pin for power button */ + const uint32_t pin = GPIO_PIN_POWER_BUTTON; aml_append(aei, aml_gpio_int(AML_CONSUMER, AML_EDGE, AML_ACTIVE_HIGH, - AML_EXCLUSIVE, AML_PULL_UP, 0, pin_list, 1, + AML_EXCLUSIVE, AML_PULL_UP, 0, &pin, 1, "GPO0", NULL, 0)); aml_append(dev, aml_name_decl("_AEI", aei)); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b0c68d66a345..7b886f3477b6 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1013,7 +1013,8 @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, uint32_t phandle) { gpio_key_dev = sysbus_create_simple("gpio-key", -1, - qdev_get_gpio_in(pl061_dev, 3)); + qdev_get_gpio_in(pl061_dev, + GPIO_PIN_POWER_BUTTON)); qemu_fdt_add_subnode(fdt, "/gpio-keys"); qemu_fdt_setprop_string(fdt, "/gpio-keys", "compatible", "gpio-keys"); diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index ab961bb6a9b8..a4d937ed45ac 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -47,6 +47,9 @@ /* See Linux kernel arch/arm64/include/asm/pvclock-abi.h */ #define PVTIME_SIZE_PER_CPU 64 +/* GPIO pins */ +#define GPIO_PIN_POWER_BUTTON 3 + enum { VIRT_FLASH, VIRT_MEM,