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-01-15 02:18:04 +0300 |
| commit | 7dc56f9f1e6271d217f65389808dd772717ba9d5 (patch) | |
| tree | 4b113cc813b09030e4ab933b9e7e16b67194ea29 | |
| parent | e6ca8e0a5ec955b7e36eda578e187e5cd5b096cc (diff) | |
| download | linux-7dc56f9f1e6271d217f65389808dd772717ba9d5.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>
Change-Id: I6c813c3e29ddb02c86e3266b9fc713a8b410169e
| -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 7ba84f3f913c..cc4f5c202057 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 d5437099aac5..28b4969456fd 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -50,7 +50,6 @@ obj-y += mic/ 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 8b7d9fb22a6e..55b391a9ffa5 100644 --- a/drivers/soc/aspeed/Kconfig +++ b/drivers/soc/aspeed/Kconfig @@ -13,6 +13,14 @@ config ASPEED_BMC_MISC Say yes to expose VGA and LPC scratch registers, and other miscellaneous control interfaces specific to the ASPEED BMC SoCs +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 depends on SOC_ASPEED && REGMAP && MFD_SYSCON tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control" diff --git a/drivers/soc/aspeed/Makefile b/drivers/soc/aspeed/Makefile index b3c143f9e24c..6aba9aaf2832 100644 --- a/drivers/soc/aspeed/Makefile +++ b/drivers/soc/aspeed/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_ASPEED_BMC_MISC) += aspeed-bmc-misc.o +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 |