diff options
| author | Ian Lepore <ian@FreeBSD.org> | 2019-05-23 15:59:50 +0000 |
|---|---|---|
| committer | Ian Lepore <ian@FreeBSD.org> | 2019-05-23 15:59:50 +0000 |
| commit | db63d251601e4e5f3468c6b7bce18a0ae346374e (patch) | |
| tree | 54b32a40a51c6f3342547e5486ffeb423dc306b3 /sys/dev | |
| parent | ad018aa4da6f23a67e58b43d3b65a0b4f05f776e (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/flash/at45d.c | 2 | ||||
| -rw-r--r-- | sys/dev/flash/mx25l.c | 2 | ||||
| -rw-r--r-- | sys/dev/spibus/spi.h | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c index 6afe65911480..4704dc500f4b 100644 --- a/sys/dev/flash/at45d.c +++ b/sys/dev/flash/at45d.c @@ -606,6 +606,6 @@ DRIVER_MODULE(at45d, spibus, at45d_driver, at45d_devclass, NULL, NULL); MODULE_DEPEND(at45d, spibus, 1, 1, 1); #ifdef FDT MODULE_DEPEND(at45d, fdt_slicer, 1, 1, 1); -SPIBUS_PNP_INFO(compat_data); +SPIBUS_FDT_PNP_INFO(compat_data); #endif diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c index ffd2946062b8..c70850c619a1 100644 --- a/sys/dev/flash/mx25l.c +++ b/sys/dev/flash/mx25l.c @@ -686,5 +686,5 @@ DRIVER_MODULE(mx25l, spibus, mx25l_driver, mx25l_devclass, 0, 0); MODULE_DEPEND(mx25l, spibus, 1, 1, 1); #ifdef FDT MODULE_DEPEND(mx25l, fdt_slicer, 1, 1, 1); -SPIBUS_PNP_INFO(compat_data); +SPIBUS_FDT_PNP_INFO(compat_data); #endif diff --git a/sys/dev/spibus/spi.h b/sys/dev/spibus/spi.h index 0c12929bee15..fa911b6fd363 100644 --- a/sys/dev/spibus/spi.h +++ b/sys/dev/spibus/spi.h @@ -41,6 +41,8 @@ struct spi_command { #define SPI_CHIP_SELECT_HIGH 0x1 /* Chip select high (else low) */ -#define SPIBUS_PNP_DESCR "Z:compat;P:#;" -#define SPIBUS_PNP_INFO(t) \ - MODULE_PNP_INFO(SPIBUS_PNP_DESCR, spibus, t, t, sizeof(t) / sizeof(t[0])); +#ifdef FDT +#define SPIBUS_FDT_PNP_INFO(t) FDTCOMPAT_PNP_INFO(t, spibus) +#else +#define SPIBUS_FDT_PNP_INFO(t) +#endif |