From patchwork Fri Jul 14 17:51:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13314041 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 67E51C0015E for ; Fri, 14 Jul 2023 17:52:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=SJJG33CeFFDdj1nacF8fN62rYokXSIaS07Tj9AnGl8M=; b=qLmtJglS8+xIqq R7deVJuzwvSgnr55J3NgNuq7Z/I1hD2a2gbbGcVlBzJOY9cvTIzK9NraW7/hYiaNxGF6jMY5TnNkw Z+2/zRdL6pfXWJEYV/mTQWQ0iJT3qQjfYwCk+tHQnmOlL8hdNZwaoRHq7WNLTbUdtYaiwz8pLjIWC MIhjyAIelxhP1hrCjShQUUjaExZC4uJN+P9lEmi7h3qLbDRBn0i85p4demtfXlo8YpawMHS/+v8We 8BNHJjwsLzW+g2IxCKffjDXn3/2RPRdh1o0g7/gfRTH/31+chJ1LTElgt//BdVNeX6+X08Z3VWRj0 H3GW+uRL8ahb5LjNYoYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qKMxl-006sQo-39; Fri, 14 Jul 2023 17:52:17 +0000 Received: from mail-io1-f43.google.com ([209.85.166.43]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qKMxf-006sHJ-30 for linux-arm-kernel@lists.infradead.org; Fri, 14 Jul 2023 17:52:14 +0000 Received: by mail-io1-f43.google.com with SMTP id ca18e2360f4ac-7835ae70e46so89309539f.3 for ; Fri, 14 Jul 2023 10:52:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689357131; x=1691949131; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KMGMhhBOKvrqzG6Chm/OfzHX4ABY4AlZjMg+WBLKLoE=; b=VKi6NgwiylgKMrq9CX29Ul6FfEepDQ7pRWrT/O+QRhOyQnKzhmvSkveTZHTsC46bxp lu1INeo/NqbxGi55cPVuW4a4dQ4wSUMsQAnDrs153NRvX2GIFmv74GO43ITlbGRi5X49 A5ik6bQHv9qwnS1pB7W3xeccEG3lX3zhmERa3Z5r5/5zfbNM4o+8WcUMQXLAWDHDzNHk IjAx9P2X/6uenvJDT8bhR/ojj1DejXKomS8062t95B+omaZX1m1GhLBWHO4kLCYotZzM uIvz8vA/bRBKGCfvpVmqFrmfFG+DVjCVi059OjW7XDLfqNX/s/RdHI4aMGyEE+jJwhKv usqA== X-Gm-Message-State: ABy/qLaOFNHBap9d54EYlA9UXH8vBuN2agCpycR4LMmTEs5vdKvXQP8l 3hT+P4lNldxrFTeq7qRY0Q== X-Google-Smtp-Source: APBJJlHu3NIRVjvAZ/pfhV3+K4CCko9L3P0cR+tv4RaJ/uCVtQQlLvb7trU3TpwNL6wsZqD4Kgd/Mw== X-Received: by 2002:a6b:5b04:0:b0:783:4f8d:4484 with SMTP id v4-20020a6b5b04000000b007834f8d4484mr5964377ioh.2.1689357130978; Fri, 14 Jul 2023 10:52:10 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id a1-20020a5d9581000000b007836a9ca101sm2823607ioo.22.2023.07.14.10.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 10:52:10 -0700 (PDT) Received: (nullmailer pid 4067514 invoked by uid 1000); Fri, 14 Jul 2023 17:51:35 -0000 From: Rob Herring To: Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] soc: imx: Explicitly include correct DT includes Date: Fri, 14 Jul 2023 11:51:33 -0600 Message-Id: <20230714175134.4067445-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230714_105211_985200_A0AB58B6 X-CRM114-Status: GOOD ( 13.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. Signed-off-by: Rob Herring --- drivers/soc/imx/gpcv2.c | 2 +- drivers/soc/imx/imx8m-blk-ctrl.c | 3 ++- drivers/soc/imx/imx8mp-blk-ctrl.c | 2 +- drivers/soc/imx/imx93-blk-ctrl.c | 2 +- drivers/soc/imx/imx93-pd.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c index 4b3300b090a8..fbd3d92f8cd8 100644 --- a/drivers/soc/imx/gpcv2.c +++ b/drivers/soc/imx/gpcv2.c @@ -9,7 +9,7 @@ */ #include -#include +#include #include #include #include diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/soc/imx/imx8m-blk-ctrl.c index afbca0d48c14..cc5ef6e2f0a8 100644 --- a/drivers/soc/imx/imx8m-blk-ctrl.c +++ b/drivers/soc/imx/imx8m-blk-ctrl.c @@ -8,7 +8,8 @@ #include #include #include -#include +#include +#include #include #include #include diff --git a/drivers/soc/imx/imx8mp-blk-ctrl.c b/drivers/soc/imx/imx8mp-blk-ctrl.c index 870aecc0202a..5a9f5ece43d9 100644 --- a/drivers/soc/imx/imx8mp-blk-ctrl.c +++ b/drivers/soc/imx/imx8mp-blk-ctrl.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/soc/imx/imx93-blk-ctrl.c b/drivers/soc/imx/imx93-blk-ctrl.c index 2c600329436c..a734889b67ce 100644 --- a/drivers/soc/imx/imx93-blk-ctrl.c +++ b/drivers/soc/imx/imx93-blk-ctrl.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/soc/imx/imx93-pd.c b/drivers/soc/imx/imx93-pd.c index 832deeed8fd6..b9e60d136875 100644 --- a/drivers/soc/imx/imx93-pd.c +++ b/drivers/soc/imx/imx93-pd.c @@ -5,8 +5,8 @@ #include #include -#include #include +#include #include #include #include