From patchwork Thu Aug 3 22:42:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13340966 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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.lore.kernel.org (Postfix) with ESMTPS id A8ACCC001DF for ; Thu, 3 Aug 2023 22:43:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 87AD0C433CA; Thu, 3 Aug 2023 22:43:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9415BC433CC; Thu, 3 Aug 2023 22:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691102593; bh=A/SnVsQV305qLvdEqmm/BwUyrg/IRx1MLi4dMMplrBE=; h=From:Date:Subject:References:In-Reply-To:List-Id:To:Cc:From; b=DfVx52wjWpcApIWQQDOjb9m6oQ0Ff5wIp/mlZkUsaZrt1T2uM5JftJOzXyJLLVeKR VYghbonZNzJWVNmNCEoKex+88RxsUiRmrH5SR1hRi/Uf4CJiH72qEOthOCa23A6aO6 O4lg5Ti4halyAtkc5cMO3mo7VKHUS7KLMuqgJtoGr8c/Q7gcQZj5QpWi9yxr0hblfg EkTOjBenhz1YVYKbIKOj6UBAcjoh+PsD0wmsxtm/8t89ayAXS+ADsV1VKyGAx3j+6W IhATwItvkrfnSCxUBs6aeASL3iqwA66xnHUqeiG6K7UyoIPkyTL/KP2/Uag5ibUKn8 sl1zioRJ3KxAQ== Received: (nullmailer pid 3693784 invoked by uid 1000); Thu, 03 Aug 2023 22:42:55 -0000 From: Rob Herring Date: Thu, 03 Aug 2023 16:42:57 -0600 Subject: [PATCH v2 17/23] firmware: Explicitly include correct DT includes MIME-Version: 1.0 Message-Id: <20230803-dt-header-cleanups-for-soc-v2-17-d8de2cc88bff@kernel.org> References: <20230803-dt-header-cleanups-for-soc-v2-0-d8de2cc88bff@kernel.org> In-Reply-To: <20230803-dt-header-cleanups-for-soc-v2-0-d8de2cc88bff@kernel.org> List-Id: To: soc@kernel.org, Patrice Chotard , Tsahee Zidenberg , Antoine Tenart , Jisheng Zhang , Sebastian Hesselbarth , Andrew Lunn , Gregory Clement , Jean-Marie Verdun , Nick Hawkins , Lubomir Rintel , Linus Walleij , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Heiko Stuebner , Liviu Dudau , Sudeep Holla , Lorenzo Pieralisi , Viresh Kumar , Shiraz Has him , Stuart Yoder , Laurentiu Tudor , Jay Fang , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Cristian Marussi , Shawn Guo , Sascha Hauer , Fabio Estevam , Matthias Brugger , AngeloGioacchino Del Regno , Florian Fainelli , Dinh Nguyen , Thierry Reding , Jonathan Hunter , Michal Simek , Joel Stanley , Andrew Jeffery , Ulf Hansson , Li Yang , Qiang Zhao Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-mediatek@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-pm@vger.kernel.org, Thierry Reding X-Mailer: b4 0.13-dev The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Acked-by: Dinh Nguyen Acked-by: Thierry Reding Signed-off-by: Rob Herring Acked-by: Sudeep Holla --- drivers/firmware/arm_scmi/driver.c | 4 ++-- drivers/firmware/imx/imx-dsp.c | 1 - drivers/firmware/imx/imx-scu-irq.c | 1 + drivers/firmware/imx/imx-scu.c | 1 + drivers/firmware/mtk-adsp-ipc.c | 1 - drivers/firmware/raspberrypi.c | 1 + drivers/firmware/scpi_pm_domain.c | 3 ++- drivers/firmware/stratix10-rsu.c | 1 - drivers/firmware/tegra/bpmp.c | 3 +-- drivers/firmware/xilinx/zynqmp.c | 1 + 10 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index b5957cc12fee..87383c05424b 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/drivers/firmware/imx/imx-dsp.c b/drivers/firmware/imx/imx-dsp.c index a6c06d7476c3..3dba590a2a95 100644 --- a/drivers/firmware/imx/imx-dsp.c +++ b/drivers/firmware/imx/imx-dsp.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/drivers/firmware/imx/imx-scu-irq.c b/drivers/firmware/imx/imx-scu-irq.c index d9dcc20945c6..a149537e0639 100644 --- a/drivers/firmware/imx/imx-scu-irq.c +++ b/drivers/firmware/imx/imx-scu-irq.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #define IMX_SC_IRQ_FUNC_ENABLE 1 diff --git a/drivers/firmware/imx/imx-scu.c b/drivers/firmware/imx/imx-scu.c index 47db49911e7b..2e5914f3a110 100644 --- a/drivers/firmware/imx/imx-scu.c +++ b/drivers/firmware/imx/imx-scu.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/drivers/firmware/mtk-adsp-ipc.c b/drivers/firmware/mtk-adsp-ipc.c index 3c071f814455..85e94ddc7204 100644 --- a/drivers/firmware/mtk-adsp-ipc.c +++ b/drivers/firmware/mtk-adsp-ipc.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index c3bc29e0a488..f66efaa5196d 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/firmware/scpi_pm_domain.c b/drivers/firmware/scpi_pm_domain.c index 800673910b51..2231e6dd2070 100644 --- a/drivers/firmware/scpi_pm_domain.c +++ b/drivers/firmware/scpi_pm_domain.c @@ -8,7 +8,8 @@ #include #include #include -#include +#include +#include #include #include diff --git a/drivers/firmware/stratix10-rsu.c b/drivers/firmware/stratix10-rsu.c index e51c95f8d445..ab3074705380 100644 --- a/drivers/firmware/stratix10-rsu.c +++ b/drivers/firmware/stratix10-rsu.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 17bd3590aaa2..51d062e0c3f1 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -8,8 +8,7 @@ #include #include #include -#include -#include +#include #include #include #include diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c index f8c4eb2b43f8..eb9ad5ae393f 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include