Commit ea40d7d8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-for-6.6-rc1' of... 

Merge tag 'fpga-for-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga

 into char-misc-next

Xu writes:

FPGA Manager changes for 6.6-rc1

- Marco's change fixes kernel-doc warnings.
- Yangtao's change converts to use devm_platform_ioremap_resource().
- Peter's change uses HWMON defined Macros for HWMON interfaces support.
- Rob's change explicitly includes correct DT includes.
- Marco's change adds KUnit tests for FPGA core.
- Xiongfeng's change converts to use pci_find_vsec_capability().
- Ivan's change makes fpga_xxx_class a static const structure.

All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our for-next branch).

Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: region: make fpga_region_class a static const structure
  fpga: fpga-mgr: make fpga_mgr_class a static const structure
  fpga: bridge: make fpga_bridge_class a static const structure
  fpga: dfl-pci: Use pci_find_vsec_capability() to simplify the code
  fpga: add configuration for the FPGA KUnit test suites.
  fpga: add an initial KUnit suite for the FPGA Region
  fpga: add an initial KUnit suite for the FPGA Bridge
  fpga: add an initial KUnit suite for the FPGA Manager
  fpga: Explicitly include correct DT includes
  fpga: socfpga-a10: Convert to devm_platform_ioremap_resource()
  fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource()
  fpga: zynq-fpga: Convert to devm_platform_ioremap_resource()
  fpga: fpga-mgr: ts73xx: Convert to devm_platform_ioremap_resource()
  fpga: fpga-mgr: socfpga: Convert to devm_platform_ioremap_resource()
  fpga: xilinx-pr-decoupler: Convert to devm_platform_ioremap_resource()
  fpga: dfl-fme-mgr: Convert to devm_platform_ioremap_resource()
  fpga: bridge: Convert to devm_platform_ioremap_resource()
  fpga: bridge: fix kernel-doc
  fpga: region: fix kernel-doc
  fpga: dfl: fme: use SI unit prefix macros
parents b587cb72 1a22ec09

drivers/fpga/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -276,4 +276,6 @@ config FPGA_MGR_LATTICE_SYSCONFIG_SPI 
	  FPGA manager driver support for Lattice FPGAs programming over slave

	  SPI sysCONFIG interface.



source "drivers/fpga/tests/Kconfig"



endif # FPGA

drivers/fpga/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -55,3 +55,6 @@ obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o 


# Drivers for FPGAs which implement DFL

obj-$(CONFIG_FPGA_DFL_PCI)		+= dfl-pci.o



# KUnit tests

obj-$(CONFIG_FPGA_KUNIT_TESTS)		+= tests/

drivers/fpga/altera-fpga2sdram.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/kernel.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of_platform.h>

#include <linux/of.h>

#include <linux/regmap.h>



#define ALT_SDR_CTL_FPGAPORTRST_OFST		0x80

drivers/fpga/altera-freeze-bridge.c

+4 −7
Original line number Diff line number Diff line
@@ -7,8 +7,9 @@ 
#include <linux/delay.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/of_device.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/fpga/fpga-bridge.h>



#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,

};



#ifdef CONFIG_OF

static const struct of_device_id altera_freeze_br_of_match[] = {

	{ .compatible = "altr,freeze-bridge-controller", },

	{},

};

MODULE_DEVICE_TABLE(of, altera_freeze_br_of_match);

#endif



static int altera_freeze_br_probe(struct platform_device *pdev)

{
@@ -213,14 +212,12 @@ static int altera_freeze_br_probe(struct platform_device *pdev) 
	void __iomem *base_addr;

	struct altera_freeze_br_data *priv;

	struct fpga_bridge *br;

	struct resource *res;

	u32 status, revision;



	if (!np)

		return -ENODEV;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base_addr = devm_ioremap_resource(dev, res);

	base_addr = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base_addr))

		return PTR_ERR(base_addr);
@@ -270,7 +267,7 @@ static struct platform_driver altera_freeze_br_driver = { 
	.remove = altera_freeze_br_remove,

	.driver = {

		.name	= "altera_freeze_br",

		.of_match_table = of_match_ptr(altera_freeze_br_of_match),

		.of_match_table = altera_freeze_br_of_match,

	},

};

drivers/fpga/altera-pr-ip-core-plat.c

+3 −6
Original line number Diff line number Diff line
@@ -9,19 +9,16 @@ 
 */

#include <linux/fpga/altera-pr-ip-core.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)

{

	struct device *dev = &pdev->dev;

	void __iomem *reg_base;

	struct resource *res;



	/* First mmio base is for register access */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	reg_base = devm_ioremap_resource(dev, res);



	reg_base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(reg_base))

		return PTR_ERR(reg_base);