fpga: Explicitly include correct DT includes

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 <robh@kernel.org>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20230714174449.4055156-1-robh@kernel.org
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
This commit is contained in:
Rob Herring 2023-07-14 11:44:48 -06:00 committed by Xu Yilun
parent dbe5038a26
commit 840208392d
No known key found for this signature in database
GPG Key ID: FCB70381A4A08CDA
6 changed files with 10 additions and 7 deletions

View File

@ -27,7 +27,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_platform.h> #include <linux/of.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#define ALT_SDR_CTL_FPGAPORTRST_OFST 0x80 #define ALT_SDR_CTL_FPGAPORTRST_OFST 0x80

View File

@ -7,8 +7,9 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/of_device.h> #include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/fpga/fpga-bridge.h> #include <linux/fpga/fpga-bridge.h>
#define FREEZE_CSR_STATUS_OFFSET 0 #define FREEZE_CSR_STATUS_OFFSET 0
@ -198,13 +199,11 @@ static const struct fpga_bridge_ops altera_freeze_br_br_ops = {
.enable_show = altera_freeze_br_enable_show, .enable_show = altera_freeze_br_enable_show,
}; };
#ifdef CONFIG_OF
static const struct of_device_id altera_freeze_br_of_match[] = { static const struct of_device_id altera_freeze_br_of_match[] = {
{ .compatible = "altr,freeze-bridge-controller", }, { .compatible = "altr,freeze-bridge-controller", },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, altera_freeze_br_of_match); MODULE_DEVICE_TABLE(of, altera_freeze_br_of_match);
#endif
static int altera_freeze_br_probe(struct platform_device *pdev) static int altera_freeze_br_probe(struct platform_device *pdev)
{ {
@ -268,7 +267,7 @@ static struct platform_driver altera_freeze_br_driver = {
.remove = altera_freeze_br_remove, .remove = altera_freeze_br_remove,
.driver = { .driver = {
.name = "altera_freeze_br", .name = "altera_freeze_br",
.of_match_table = of_match_ptr(altera_freeze_br_of_match), .of_match_table = altera_freeze_br_of_match,
}, },
}; };

View File

@ -9,7 +9,8 @@
*/ */
#include <linux/fpga/altera-pr-ip-core.h> #include <linux/fpga/altera-pr-ip-core.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/mod_devicetable.h>
#include <linux/platform_device.h>
static int alt_pr_platform_probe(struct platform_device *pdev) static int alt_pr_platform_probe(struct platform_device *pdev)
{ {

View File

@ -8,7 +8,7 @@
#include <linux/fpga/fpga-mgr.h> #include <linux/fpga/fpga-mgr.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#define MPF_SPI_ISC_ENABLE 0x0B #define MPF_SPI_ISC_ENABLE 0x0B

View File

@ -12,7 +12,9 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>

View File

@ -10,6 +10,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_device.h>
/* /*
* FPGA programming requires a higher level of privilege (EL3), per the SoC * FPGA programming requires a higher level of privilege (EL3), per the SoC