From patchwork Thu Apr 4 18:23:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 785961 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 81868130ACF; Thu, 4 Apr 2024 18:35:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712255702; cv=none; b=RnhZyCthCRhMr7Vcl1SdcFIo0fYzvAvFTPPBZSWdPxBuSaZX2YMoX3CLpmGaAoRHZTGtGNb9MWcBtC6J4om3jyJdZDCPjtkCN3A+mfeZTDZy+6toiD7TaNMvYN+lt4rbCnHl/AS+z7cbasLmSKWecBJSXeOgxx0sVfLhER0kwDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712255702; c=relaxed/simple; bh=85DPr1M713nmUHHni9kf5oNPao5iIopZ0TF1O8A9FAM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sehLJaWUnSAmr5A/nCBY3g0RuVYwu3BBMuUgivyHz8ib2fLEo6d4P6gGpP6K75Vtz8VJpfDrhR6t3zlLLxFZ5W/fV9d6sEBdJLLIMd4bm22+2V+HRkEWV0nPYNwDATgUgWERyz9VwjjfEuF389XpLtlqMxTsvBsPtOwGLwbAeFo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Q1Go5UIF; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Q1Go5UIF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712255700; x=1743791700; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=85DPr1M713nmUHHni9kf5oNPao5iIopZ0TF1O8A9FAM=; b=Q1Go5UIFrG5zWXiSIS7zqCJjVhOYjqZ/x/a4CfewB/I9Ub8Rd8ztSEfk HuZr3ONwr6z+zf+kiqwY0ntwf1L39XG1lOhzi/825QsNRfjLN5SEWP5T2 keK26re6FOYpUf5ESH7JCsBVPiAvOp3pCrhFTULb70/afrt+nHF6Bzh38 +lIVYPl6r2w5jghQnq12VjcyhTlNtHiH+Yld40o468Vry+8/Jebysw7Jm s5Aw6Uk7UHPjeyIN4M2DdxN/eGtAWGIsyPwMkb2wkIkfAgpoYno6lZzbh jNkXYFCtcJLM9soTvB84FYHncdH6tivaty548ifrZeSa/rV3Slj347WPI w==; X-CSE-ConnectionGUID: a6zpCmffSEykzr+/i+KbLw== X-CSE-MsgGUID: SZld8nuHSpKbm+VqEX+lvw== X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="7751316" X-IronPort-AV: E=Sophos;i="6.07,179,1708416000"; d="scan'208";a="7751316" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2024 11:34:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="937086994" X-IronPort-AV: E=Sophos;i="6.07,179,1708416000"; d="scan'208";a="937086994" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 04 Apr 2024 11:34:55 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9B0D53E5; Thu, 4 Apr 2024 21:34:54 +0300 (EEST) From: Andy Shevchenko To: Zhang Rui , Andy Shevchenko , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown Subject: [PATCH v2 1/4] ACPI: x86: Introduce a Makefile Date: Thu, 4 Apr 2024 21:23:39 +0300 Message-ID: <20240404183448.3310449-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240404183448.3310449-1-andriy.shevchenko@linux.intel.com> References: <20240404183448.3310449-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There will be more modules coming here, so, introduce a separate Makefile and include it in parent one via obj-$(CONFIG_X86). Signed-off-by: Andy Shevchenko --- drivers/acpi/Makefile | 4 +--- drivers/acpi/x86/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 drivers/acpi/x86/Makefile diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index d69d5444acdb..0db88aab309f 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -56,9 +56,6 @@ acpi-y += evged.o acpi-y += sysfs.o acpi-y += property.o acpi-$(CONFIG_X86) += acpi_cmos_rtc.o -acpi-$(CONFIG_X86) += x86/apple.o -acpi-$(CONFIG_X86) += x86/utils.o -acpi-$(CONFIG_X86) += x86/s2idle.o acpi-$(CONFIG_DEBUG_FS) += debugfs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o @@ -133,3 +130,4 @@ obj-$(CONFIG_ARM64) += arm64/ obj-$(CONFIG_ACPI_VIOT) += viot.o obj-$(CONFIG_RISCV) += riscv/ +obj-$(CONFIG_X86) += x86/ diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile new file mode 100644 index 000000000000..bd17dd2c2c5b --- /dev/null +++ b/drivers/acpi/x86/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_ACPI) += acpi-x86.o +acpi-x86-y += apple.o +acpi-x86-y += s2idle.o +acpi-x86-y += utils.o From patchwork Thu Apr 4 18:23:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 785962 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 398EE134AC; Thu, 4 Apr 2024 18:34:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712255699; cv=none; b=VrerFfWQUIxk5Z96MPUm7VUHtbW5vvsVo/MKqQHD6CDk1nY65NzGgf3aDq2mbwFS1gpNJDlO1cG7fctjLqFMsf+1Bc/7ROh//pKvcae8zbiav6TKrw0cSddrpGSZ9DWUhDsKo0quOeu/i9IlK10cVk3CI8Oa8UD5vhLr2llFiRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712255699; c=relaxed/simple; bh=MhZT0gDEz6dvyjIkYHf74rwRRynWUz9nECCDuK5y9/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JGfAb8Ak1JNEgzFdz6l4LjJiwFKb4BmNz9S+eBQ2PlI7lLn4FjyBWL/Ms0uEVV3WVmj6WT1jsTV30fzDGLLwOVUkA3GB3o7pC9fVW7iR3b3oMELVIxBMAovrixrw2+KsyjGMKQtETgNveik4/3YM0BW3UUq4ogLlkdTnGFpa8jk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=g0zSGxVT; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="g0zSGxVT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712255698; x=1743791698; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MhZT0gDEz6dvyjIkYHf74rwRRynWUz9nECCDuK5y9/Y=; b=g0zSGxVT8zo7vv8Mn7KEQP7wE/7ld+iw7BLf5MOdu0aHGD9n5dWKvyvA NW0OlyF5uTKkilvYmfbyoW19dz9hrLKH2PEWiSDaLLX51iQ9eDJUjQdoo wqBrqpVRmbzAt5LfUmNBRdW/zHih0C7WxlgTEKzJSlvUqs6PxkZlgfRUL 2f0kA8UFHbv5dYLkRaSK2ULwLqf//rT5HW25Sz1SAOngtm8DBvUa5fibI 3w2k5szQTn0kR81phCHM8gVT/hQebrYhEFWHlRR0SUPcapmiCGcGvjpDe m4FYqzVu2k8MJWP0solovN0iefJBDoQzSITfQVMmkPgh1iFen+Ehx9IBo w==; X-CSE-ConnectionGUID: +986DB1BQeGkisbpfgQCOg== X-CSE-MsgGUID: t3ZOTuXJQpWyUL3v009n/Q== X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="7751314" X-IronPort-AV: E=Sophos;i="6.07,179,1708416000"; d="scan'208";a="7751314" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2024 11:34:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="937086992" X-IronPort-AV: E=Sophos;i="6.07,179,1708416000"; d="scan'208";a="937086992" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 04 Apr 2024 11:34:55 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id A82D4B56; Thu, 4 Apr 2024 21:34:54 +0300 (EEST) From: Andy Shevchenko To: Zhang Rui , Andy Shevchenko , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown Subject: [PATCH v2 2/4] ACPI: x86: Move acpi_cmos_rtc to x86 folder Date: Thu, 4 Apr 2024 21:23:40 +0300 Message-ID: <20240404183448.3310449-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240404183448.3310449-1-andriy.shevchenko@linux.intel.com> References: <20240404183448.3310449-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 acpi_cmos_rtc is built solely for x86, move it to the respective folder. Signed-off-by: Andy Shevchenko --- drivers/acpi/Makefile | 1 - drivers/acpi/x86/Makefile | 1 + drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%) diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 0db88aab309f..413c18e2bf61 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -55,7 +55,6 @@ acpi-y += event.o acpi-y += evged.o acpi-y += sysfs.o acpi-y += property.o -acpi-$(CONFIG_X86) += acpi_cmos_rtc.o acpi-$(CONFIG_DEBUG_FS) += debugfs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile index bd17dd2c2c5b..b97b1bcf8404 100644 --- a/drivers/acpi/x86/Makefile +++ b/drivers/acpi/x86/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_ACPI) += acpi-x86.o acpi-x86-y += apple.o +acpi-x86-y += cmos_rtc.o acpi-x86-y += s2idle.o acpi-x86-y += utils.o diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/x86/cmos_rtc.c similarity index 98% rename from drivers/acpi/acpi_cmos_rtc.c rename to drivers/acpi/x86/cmos_rtc.c index 9b55d1593d16..51643ff6fe5f 100644 --- a/drivers/acpi/acpi_cmos_rtc.c +++ b/drivers/acpi/x86/cmos_rtc.c @@ -15,7 +15,7 @@ #include #include -#include "internal.h" +#include "../internal.h" static const struct acpi_device_id acpi_cmos_rtc_ids[] = { { "PNP0B00" }, From patchwork Thu Apr 4 18:23:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 786525 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 0F96C130485; Thu, 4 Apr 2024 18:35:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712255701; cv=none; b=gsdFKJvtmYFwJ5Zm+mdVqCD3vgQG44nzQ2DkcLr6+wr4Go6Cwp6598B9KF5M5vhwYEllOxvXc7YGI1DaYJmpsNg9qD4vYn9hadvEPEunEc44TaJXfWuX5LzFCQUfi9ZI7fMlpL/tgHr4eLWJgiVCb5UZ0qqST1z9qk7fK0k03b8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712255701; c=relaxed/simple; bh=VEomS2m+Bw/DPtcNvn269fWrjlZB0hREQwVjQOn0ITk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AwWppbUvmRlgNG3EaLxlc4QGYk/lMUsE+ISho9srKzXI3+y9b2J4PLjMRJIDacgYOMUFLjQ46zaSbFrbksSuW0yDy4QLqDD5C6GweKmF5pQ0zwDTzsi2B4XUpLnF8NJ2fyEzwJbySozYKjkbtzCnFGFy12wUJD8q5EJ2Qr7OFac= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=GkJdFHDN; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="GkJdFHDN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712255700; x=1743791700; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VEomS2m+Bw/DPtcNvn269fWrjlZB0hREQwVjQOn0ITk=; b=GkJdFHDNSrGSKvz+zw3VGXZBqotLvdHcTZ1IxyVvoh+V7tjtWZl3QMB0 tp7hZmnTLH1z3172Kugkg5NP3MLuc3+ZU1s7/FgmbO0Z7DYxi/pPY/xE6 88qaJA6xI61cf9RPSWKMWzm93qbCYhy0qENbhdm5GpPysMSMpdW8Ao6km 37hL53FszRexw33uwCz+Xg5SDqW2F/kCIVHLclMLyxnRYaViBW0HjhyOw AI3rafE7p2Yd+2Sxh/k//33DvZotz3eJMjAV7PB6ExpnzuLTlrMEiKQL7 r0H8QqLk6THR9lWIuCM/m9prlVJKGgVwyvtKS3g017UdV5t6mBphk8sAy w==; X-CSE-ConnectionGUID: bU+0p/2LRPSuPhDvBb1MxQ== X-CSE-MsgGUID: JRCg6aQoSH6EcZ5ChF+gRw== X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="7751313" X-IronPort-AV: E=Sophos;i="6.07,179,1708416000"; d="scan'208";a="7751313" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2024 11:34:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="937086990" X-IronPort-AV: E=Sophos;i="6.07,179,1708416000"; d="scan'208";a="937086990" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 04 Apr 2024 11:34:55 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B3F6DC30; Thu, 4 Apr 2024 21:34:54 +0300 (EEST) From: Andy Shevchenko To: Zhang Rui , Andy Shevchenko , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown Subject: [PATCH v2 3/4] ACPI: x86: Move blacklist to x86 folder Date: Thu, 4 Apr 2024 21:23:41 +0300 Message-ID: <20240404183448.3310449-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240404183448.3310449-1-andriy.shevchenko@linux.intel.com> References: <20240404183448.3310449-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 blacklist is built solely for x86, move it to the respective folder. Signed-off-by: Andy Shevchenko --- drivers/acpi/Makefile | 1 - drivers/acpi/x86/Makefile | 2 ++ drivers/acpi/{ => x86}/blacklist.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename drivers/acpi/{ => x86}/blacklist.c (99%) diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 413c18e2bf61..6f4187a34f41 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -14,7 +14,6 @@ tables.o: $(src)/../../include/$(CONFIG_ACPI_CUSTOM_DSDT_FILE) ; endif obj-$(CONFIG_ACPI) += tables.o -obj-$(CONFIG_X86) += blacklist.o # # ACPI Core Subsystem (Interpreter) diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile index b97b1bcf8404..1f3c5fa84f9e 100644 --- a/drivers/acpi/x86/Makefile +++ b/drivers/acpi/x86/Makefile @@ -3,3 +3,5 @@ acpi-x86-y += apple.o acpi-x86-y += cmos_rtc.o acpi-x86-y += s2idle.o acpi-x86-y += utils.o + +obj-$(CONFIG_X86) += blacklist.o diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/x86/blacklist.c similarity index 99% rename from drivers/acpi/blacklist.c rename to drivers/acpi/x86/blacklist.c index a558d24fb788..55214d0a12b1 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/x86/blacklist.c @@ -17,7 +17,7 @@ #include #include -#include "internal.h" +#include "../internal.h" #ifdef CONFIG_DMI static const struct dmi_system_id acpi_rev_dmi_table[] __initconst; From patchwork Thu Apr 4 18:23:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 785960 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 3B0BF131BDA; Thu, 4 Apr 2024 18:35:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712255703; cv=none; b=YwSz8L/6twm0rdcWkibmCyv4nJR9Wf7EQSSeBypMfSPtxZGYu35j4mbPGal6dMg39V3r0ILCLl1dOWCt+cclZYTg3SCOyqv5DxLr7ttDOxiTIctBQTW11BnExSwzCtwHdggiDEUdohuTfpNZl1Ht+W1RKp96QV3M0Vjqsqz37rY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712255703; c=relaxed/simple; bh=gGIP0VcmWVeb4FjGcfVs8G6gKQwv5j8GvxXyZ+Ab4dY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eZWEomQuVMRWyIZv8rdYpwToHWkLMsWXPWgep4OgpfAdWo1dE9clHNefADQ6ORj34lzGNKrDURcZXuPNKvpDWviWu1gHDkxLBP1N/N57ILJyTDg88QS3rWeW2XPrfHHLjPVQlJX5y54hv1sTV/KauOVmooiDNZEYJzaTTzOn+U0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=kR0/QCx9; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="kR0/QCx9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712255702; x=1743791702; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gGIP0VcmWVeb4FjGcfVs8G6gKQwv5j8GvxXyZ+Ab4dY=; b=kR0/QCx9PhXt6n+Hx00fdn1zaOMTBLZP9qP0PO1t3nWyzacQUFm5Wsh+ zsPPPXjgaSTIw6bvT5a+peQ/hGjI6XVmHPf2KeDf1qImiVrPUwRsbW7+z hhq1QwXBFND0vIksoiBgN8RF4TCjP5IGOrTu/vnOJ6tO0SDMaSrLYaHr6 l1G0hHzYiu+XuDwGs/JcY1Miqj83K+233YzR6loVkoTdUyxDQm5iohfme AmxuQSWYEEu+BmFxTXiOmeMhZNwZVCc4zjgvQptVCBRAj0fWm0slZoxZ7 AE/Z8QHVnK7wUYVR3RQqiiyN4pjFmJddeOjNBIwrkmBCQivgy7LAsxoph w==; X-CSE-ConnectionGUID: l53S2XOaSC+HuQ5Mhx4gfg== X-CSE-MsgGUID: 9FLdbH+7STq1i0YMTQMxYw== X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="7751320" X-IronPort-AV: E=Sophos;i="6.07,179,1708416000"; d="scan'208";a="7751320" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2024 11:34:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="937086996" X-IronPort-AV: E=Sophos;i="6.07,179,1708416000"; d="scan'208";a="937086996" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 04 Apr 2024 11:34:55 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C0711CB3; Thu, 4 Apr 2024 21:34:54 +0300 (EEST) From: Andy Shevchenko To: Zhang Rui , Andy Shevchenko , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown Subject: [PATCH v2 4/4] ACPI: x86: Move LPSS to x86 folder Date: Thu, 4 Apr 2024 21:23:42 +0300 Message-ID: <20240404183448.3310449-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240404183448.3310449-1-andriy.shevchenko@linux.intel.com> References: <20240404183448.3310449-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 LPSS is built solely for x86, move it to the respective folder. Signed-off-by: Andy Shevchenko --- drivers/acpi/Makefile | 1 - drivers/acpi/internal.h | 3 ++- drivers/acpi/x86/Makefile | 1 + drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%) diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 6f4187a34f41..39ea5cfa8326 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -45,7 +45,6 @@ acpi-y += ec.o acpi-$(CONFIG_ACPI_DOCK) += dock.o acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o -acpi-$(CONFIG_PCI) += acpi_lpss.o acpi-y += acpi_apd.o acpi-y += acpi_platform.o acpi-y += acpi_pnp.o diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index ca72a0dc5715..60c483836756 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -69,7 +69,8 @@ void acpi_debugfs_init(void); #else static inline void acpi_debugfs_init(void) { return; } #endif -#ifdef CONFIG_PCI + +#if defined(CONFIG_X86) && defined(CONFIG_PCI) void acpi_lpss_init(void); #else static inline void acpi_lpss_init(void) {} diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile index 1f3c5fa84f9e..63c99509ed9d 100644 --- a/drivers/acpi/x86/Makefile +++ b/drivers/acpi/x86/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_ACPI) += acpi-x86.o acpi-x86-y += apple.o acpi-x86-y += cmos_rtc.o +acpi-x86-$(CONFIG_PCI) += lpss.o acpi-x86-y += s2idle.o acpi-x86-y += utils.o diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/x86/lpss.c similarity index 99% rename from drivers/acpi/acpi_lpss.c rename to drivers/acpi/x86/lpss.c index a3d2d94be5c0..148e29c2c526 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/x86/lpss.c @@ -25,7 +25,7 @@ #include #include -#include "internal.h" +#include "../internal.h" #ifdef CONFIG_X86_INTEL_LPSS