recipes-kernel/linux/5.15/1016-drivers-misc-sync-npcm-lpc-and-pci-mbox.patch

From e5bf19b0a526b60d4d7f79c19f84d54ecd5bd6fd Mon Sep 17 00:00:00 2001
From: David Wang <davidwang@quantatw.com>
Date: Mon, 6 Nov 2023 14:47:37 +0800
Subject: [PATCH 16/16] drivers: misc: sync npcm lpc and pci-mbox

---
 drivers/misc/Kconfig            | 18 +++++++++---------
 drivers/misc/Makefile           |  4 ++--
 drivers/misc/gbmc/npcm7xx-lpc-bpc.c  |  1 +
 drivers/misc/npcm7xx-pci-mbox.c |  1 +
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 808f822d97b6..cc1656100e0e 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -486,20 +486,20 @@ config HISI_HIKEY_USB
 	  switching between the dual-role USB-C port and the USB-A host ports
 	  using only one USB controller.
 
-config NPCM7XX_LPC_BPC
-	tristate "NPCM7xx LPC BIOS Post Code support"
-	depends on (ARCH_NPCM7XX || COMPILE_TEST)
+config NPCM_LPC_BPC
+	tristate "NPCM LPC BIOS Post Code support"
+	depends on (ARCH_NPCM || COMPILE_TEST)
 	help
-	  Provides a NPCM7xx driver to control the LPC BIOS Post Code
+	  Provides a NPCM driver to control the LPC BIOS Post Code
 	  interface which allows the BMC to monitoring and save
 	  the data written by the host to an arbitrary LPC I/O port.
 
-config NPCM7XX_PCI_MBOX
-	tristate "NPCM7xx PCI Mailbox Controller"
-	depends on (ARCH_NPCM7XX || COMPILE_TEST) && REGMAP && MFD_SYSCON
+config NPCM_PCI_MBOX
+	tristate "NPCM PCI Mailbox Controller"
+	depends on (ARCH_NPCM || COMPILE_TEST) && REGMAP && MFD_SYSCON
 	help
-	  Expose the NPCM750/730/715/705 PCI MBOX registers found on
-	  Nuvoton SOCs to userspace.
+	  Expose the NPCM BMC PCI MBOX registers found on Nuvoton SOCs
+	  to userspace.
 
 config NPCM7XX_JTAG_MASTER
 	tristate "NPCM7xx JTAG Master driver"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 5c29a81e7311..8a9d2be7dafe 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -61,7 +61,7 @@ obj-$(CONFIG_UACCE)		+= uacce/
 obj-$(CONFIG_XILINX_SDFEC)	+= xilinx_sdfec.o
 obj-$(CONFIG_HISI_HIKEY_USB)	+= hisi_hikey_usb.o
 obj-$(CONFIG_HI6421V600_IRQ)	+= hi6421v600-irq.o
-obj-$(CONFIG_NPCM7XX_LPC_BPC)	+= npcm7xx-lpc-bpc.o
-obj-$(CONFIG_NPCM7XX_PCI_MBOX)	+= npcm7xx-pci-mbox.o
+obj-$(CONFIG_NPCM_LPC_BPC)	+= npcm7xx-lpc-bpc.o
+obj-$(CONFIG_NPCM_PCI_MBOX)	+= npcm7xx-pci-mbox.o
 obj-$(CONFIG_NPCM7XX_JTAG_MASTER)	+= npcm7xx-jtag-master.o
 obj-$(CONFIG_NPCM8XX_JTAG_MASTER)       += npcm8xx-jtag-master.o
diff --git a/drivers/misc/gbmc/npcm7xx-lpc-bpc.c b/drivers/misc/gbmc/npcm7xx-lpc-bpc.c
index 5c90dfc5374b..c99cafd9be99 100644
--- a/drivers/misc/gbmc/npcm7xx-lpc-bpc.c
+++ b/drivers/misc/gbmc/npcm7xx-lpc-bpc.c
@@ -374,6 +374,7 @@ static int npcm7xx_bpc_remove(struct platform_device *pdev)
 
 static const struct of_device_id npcm7xx_bpc_match[] = {
 	{ .compatible = "nuvoton,npcm750-lpc-bpc" },
+	{ .compatible = "nuvoton,npcm845-lpc-bpc" },
 	{ },
 };
 
diff --git a/drivers/misc/npcm7xx-pci-mbox.c b/drivers/misc/npcm7xx-pci-mbox.c
index 1a80661a4296..e169a3e8f3ea 100644
--- a/drivers/misc/npcm7xx-pci-mbox.c
+++ b/drivers/misc/npcm7xx-pci-mbox.c
@@ -268,6 +268,7 @@ static int npcm7xx_mbox_remove(struct platform_device *pdev)
 
 static const struct of_device_id npcm7xx_mbox_match[] = {
 	{ .compatible = "nuvoton,npcm750-pci-mbox" },
+	{ .compatible = "nuvoton,npcm845-pci-mbox" },
 	{ },
 };
 
-- 
2.25.1