From 5705145f59282bdb844bdd62aac3400b979b05b3 Mon Sep 17 00:00:00 2001 From: Vedashree Vidwans Date: Sun, 2 Jun 2024 23:41:25 -0700 Subject: [PATCH] tegra: hwpm: th500: correct config flag name Recently, TH500 HWPM config flag was renamed to CONFIG_TEGRA_HWPM_TH500. Correct the config flag name in init.c and acpi.h files. Jira THWPM-112 Change-Id: I9fcc40cd2529c0e5e6894bda95f6d8248e8b61cd Signed-off-by: Vedashree Vidwans Reviewed-on: https://git-master.nvidia.com/r/c/linux-hwpm/+/3167472 Reviewed-by: Seema Khowala GVS: buildbot_gerritrpt Reviewed-by: Vasuki Shankar --- drivers/tegra/hwpm/common/init.c | 4 ++-- drivers/tegra/hwpm/os/linux/acpi.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/tegra/hwpm/common/init.c b/drivers/tegra/hwpm/common/init.c index 1d16a32..6758c4a 100644 --- a/drivers/tegra/hwpm/common/init.c +++ b/drivers/tegra/hwpm/common/init.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT /* - * SPDX-FileCopyrightText: Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -63,7 +63,7 @@ static int tegra_hwpm_init_chip_ip_structures(struct tegra_soc_hwpm *hwpm, break; } break; -#ifdef CONFIG_TEGRA_TH500_HWPM +#ifdef CONFIG_TEGRA_HWPM_TH500 case 0x50: switch (chip_id_rev) { case 0x0: diff --git a/drivers/tegra/hwpm/os/linux/acpi.h b/drivers/tegra/hwpm/os/linux/acpi.h index f579435..4ff8bb7 100644 --- a/drivers/tegra/hwpm/os/linux/acpi.h +++ b/drivers/tegra/hwpm/os/linux/acpi.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -25,13 +25,13 @@ * bit 15:08 - chip id * bit 07:04 - chip id revision */ -#if defined(CONFIG_TEGRA_TH500_HWPM) +#if defined(CONFIG_TEGRA_HWPM_TH500) static const unsigned long hwpm_th500_device_data = (PLAT_SI << 20U) | (0x50U << 8U) | (0x0 << 4U); #endif static const struct acpi_device_id tegra_hwpm_acpi_match[] = { -#if defined(CONFIG_TEGRA_TH500_HWPM) +#if defined(CONFIG_TEGRA_HWPM_TH500) { .id = "NVDA2006", .driver_data = hwpm_th500_device_data,