diff options
| author | Jae Hyun Yoo <jae.hyun.yoo@intel.com> | 2021-01-15 02:06:08 +0300 |
|---|---|---|
| committer | Jae Hyun Yoo <jae.hyun.yoo@intel.com> | 2021-07-14 20:04:18 +0300 |
| commit | 57daf90aed682e2979e90d892d25b0c971ed35c7 (patch) | |
| tree | ee85a4a52ade302948110bbf8df2de3d04c182de | |
| parent | 07111c876d460c468006b0bda1012f0ca151f6b2 (diff) | |
| download | linux-57daf90aed682e2979e90d892d25b0c971ed35c7.tar.xz | |
Move Aspeed eSPI driver to soc/aspeed tree
This commit moves Aspeed eSPI driver from misc to soc/aspeed tree
to make correct probing order for LPC and eSPI driver. Since LPC
runs over eSPI, eSPI driver should be registered ahead of LPC
driver.
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
| -rw-r--r-- | drivers/misc/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/soc/aspeed/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/soc/aspeed/Makefile | 1 | ||||
| -rw-r--r-- | drivers/soc/aspeed/aspeed-espi-slave.c (renamed from drivers/misc/aspeed-espi-slave.c) | 0 |
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 18ff10d595da..c47d2c22e182 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -423,14 +423,6 @@ config SRAM config SRAM_EXEC bool -config ASPEED_ESPI_SLAVE - depends on ARCH_ASPEED || COMPILE_TEST - depends on REGMAP_MMIO - tristate "Aspeed ast2500 eSPI slave device driver" - help - Control Aspeed ast2500 eSPI slave controller to handle event - which needs the firmware's processing. - config ASPEED_UART_ROUTING tristate "Aspeed ast2500 UART routing control" help diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index e69269600f34..22b503be14a3 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -49,7 +49,6 @@ obj-$(CONFIG_SRAM_EXEC) += sram-exec.o obj-$(CONFIG_GENWQE) += genwqe/ obj-$(CONFIG_ECHO) += echo/ obj-$(CONFIG_CXL_BASE) += cxl/ -obj-$(CONFIG_ASPEED_ESPI_SLAVE) += aspeed-espi-slave.o obj-$(CONFIG_ASPEED_UART_ROUTING) += aspeed-uart-routing.o obj-$(CONFIG_PCI_ENDPOINT_TEST) += pci_endpoint_test.o obj-$(CONFIG_OCXL) += ocxl/ diff --git a/drivers/soc/aspeed/Kconfig b/drivers/soc/aspeed/Kconfig index 4a273215296e..a334af2db2ea 100644 --- a/drivers/soc/aspeed/Kconfig +++ b/drivers/soc/aspeed/Kconfig @@ -4,6 +4,14 @@ if ARCH_ASPEED || COMPILE_TEST menu "ASPEED SoC drivers" +config ASPEED_ESPI_SLAVE + depends on ARCH_ASPEED || COMPILE_TEST + depends on REGMAP_MMIO + tristate "Aspeed ast2500 eSPI slave device driver" + help + Control Aspeed ast2500 eSPI slave controller to handle event + which needs the firmware's processing. + config ASPEED_LPC_CTRL tristate "ASPEED LPC firmware cycle control" select REGMAP diff --git a/drivers/soc/aspeed/Makefile b/drivers/soc/aspeed/Makefile index ddf65d974698..46ba5bc9a182 100644 --- a/drivers/soc/aspeed/Makefile +++ b/drivers/soc/aspeed/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ASPEED_ESPI_SLAVE) += aspeed-espi-slave.o obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o obj-$(CONFIG_ASPEED_LPC_MBOX) += aspeed-lpc-mbox.o obj-$(CONFIG_ASPEED_LPC_SIO) += aspeed-lpc-sio.o diff --git a/drivers/misc/aspeed-espi-slave.c b/drivers/soc/aspeed/aspeed-espi-slave.c index 9bfaca0710dd..9bfaca0710dd 100644 --- a/drivers/misc/aspeed-espi-slave.c +++ b/drivers/soc/aspeed/aspeed-espi-slave.c |