Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fpga-for-6.11-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next
Xu writes:
FPGA Manager changes for 6.11-rc1
FPGA unit test:
- Macro's change re-enables FPGA KUnit test suites been configured as
loadable module.
Altera:
- David's change removes unused structure definition.
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: Xu Yilun <yilun.xu@intel.com>
* tag 'fpga-for-6.11-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
fpga: altera-fpga2sdram: remove unused struct 'prop_map'
Revert "fpga: disable KUnit test suites when module support is enabled"
+2
-8
-6
drivers/fpga/altera-fpga2sdram.c
-6
drivers/fpga/altera-fpga2sdram.c
···
75
75
return _alt_fpga2sdram_enable_set(bridge->priv, enable);
76
76
}
77
77
78
-
struct prop_map {
79
-
char *prop_name;
80
-
u32 *prop_value;
81
-
u32 prop_max;
82
-
};
83
-
84
78
static const struct fpga_bridge_ops altera_fpga2sdram_br_ops = {
85
79
.enable_set = alt_fpga2sdram_enable_set,
86
80
.enable_show = alt_fpga2sdram_enable_show,
+2
-2
drivers/fpga/tests/Kconfig
+2
-2
drivers/fpga/tests/Kconfig
···
1
1
config FPGA_KUNIT_TESTS
2
-
bool "KUnit test for the FPGA subsystem" if !KUNIT_ALL_TESTS
3
-
depends on FPGA=y && FPGA_REGION=y && FPGA_BRIDGE=y && KUNIT=y && MODULES=n
2
+
tristate "KUnit test for the FPGA subsystem" if !KUNIT_ALL_TESTS
3
+
depends on FPGA && FPGA_REGION && FPGA_BRIDGE && KUNIT=y
4
4
default KUNIT_ALL_TESTS
5
5
help
6
6
This builds unit tests for the FPGA subsystem