irqchip/starfive: Rename jh8100 to jhb100

The StarFive JH8100 SoC was discontinued before production. The newly
taped-out JHB100 SoC uses the same interrupt controller IP.  Rename the
driver file, Kconfig symbol, and internal references from "jh8100" to
"jhb100" to accurately reflect the supported hardware.

Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260416064751.632138-3-changhuang.liang@starfivetech.com

diff --git a/MAINTAINERS b/MAINTAINERS
index 30626d0b1044daff03ffc6152de8835250c35b5a..73af7d7788efcd4112961a23cf2a8e233638bc5c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -25533,11 +25533,11 @@ F:    Documentation/devicetree/bindings/phy/starfive,jh7110-usb-phy.yaml
 F:     drivers/phy/starfive/phy-jh7110-pcie.c
 F:     drivers/phy/starfive/phy-jh7110-usb.c
 
-STARFIVE JH8100 EXTERNAL INTERRUPT CONTROLLER DRIVER
+STARFIVE JHB100 EXTERNAL INTERRUPT CONTROLLER DRIVER
 M:     Changhuang Liang <changhuang.liang@starfivetech.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/interrupt-controller/starfive,jhb100-intc.yaml
-F:     drivers/irqchip/irq-starfive-jh8100-intc.c
+F:     drivers/irqchip/irq-starfive-jhb100-intc.c
 
 STATIC BRANCH/CALL
 M:     Peter Zijlstra <peterz@infradead.org>

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 387beef4a89db352bfb8dddae7335b9b1972496a..35a1f656ef1e91dedcc049eb20336502fd01b5c9 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -677,13 +677,13 @@ config SIFIVE_PLIC
        select IRQ_DOMAIN_HIERARCHY
        select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
 
-config STARFIVE_JH8100_INTC
-       bool "StarFive JH8100 External Interrupt Controller"
+config STARFIVE_JHB100_INTC
+       bool "StarFive JHB100 External Interrupt Controller"
        depends on ARCH_STARFIVE || COMPILE_TEST
        default ARCH_STARFIVE
        select IRQ_DOMAIN_HIERARCHY
        help
-         This enables support for the INTC chip found in StarFive JH8100
+         This enables support for the INTC chip found in StarFive JHB100
          SoC.
 
          If you don't know what to do here, say Y.

diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 3d02441b3ee669a0c046266b73a898eff38058d9..d8da7c46d30e2e13d3be3bb619d7d89e7d316fe7 100644 (file)
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -109,7 +109,7 @@ obj-$(CONFIG_RISCV_APLIC_MSI)               += irq-riscv-aplic-msi.o
 obj-$(CONFIG_RISCV_IMSIC)              += irq-riscv-imsic-state.o irq-riscv-imsic-early.o irq-riscv-imsic-platform.o
 obj-$(CONFIG_RISCV_RPMI_SYSMSI)                += irq-riscv-rpmi-sysmsi.o
 obj-$(CONFIG_SIFIVE_PLIC)              += irq-sifive-plic.o
-obj-$(CONFIG_STARFIVE_JH8100_INTC)     += irq-starfive-jh8100-intc.o
+obj-$(CONFIG_STARFIVE_JHB100_INTC)     += irq-starfive-jhb100-intc.o
 obj-$(CONFIG_ACLINT_SSWI)              += irq-aclint-sswi.o
 obj-$(CONFIG_IMX_IRQSTEER)             += irq-imx-irqsteer.o
 obj-$(CONFIG_IMX_INTMUX)               += irq-imx-intmux.o

diff --git a/drivers/irqchip/irq-starfive-jh8100-intc.c b/drivers/irqchip/irq-starfive-jhb100-intc.c
similarity index 94%
rename from drivers/irqchip/irq-starfive-jh8100-intc.c
rename to drivers/irqchip/irq-starfive-jhb100-intc.c
index bb62ef363d0bdd0641e40766f5569a2c71e03eda..2c9cdad7f3775634ad5791cf56402cbca6945b45 100644 (file)
--- a/drivers/irqchip/irq-starfive-jh8100-intc.c
+++ b/drivers/irqchip/irq-starfive-jhb100-intc.c
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * StarFive JH8100 External Interrupt Controller driver
+ * StarFive JHB100 External Interrupt Controller driver
  *
  * Copyright (C) 2023 StarFive Technology Co., Ltd.
  *
  * Author: Changhuang Liang <changhuang.liang@starfivetech.com>
  */
 
-#define pr_fmt(fmt) "irq-starfive-jh8100: " fmt
+#define pr_fmt(fmt) "irq-starfive-jhb100: " fmt
 
 #include <linux/bitops.h>
 #include <linux/clk.h>
@@ -71,7 +71,7 @@ static void starfive_intc_mask(struct irq_data *d)
 }
 
 static struct irq_chip intc_dev = {
-       .name           = "StarFive JH8100 INTC",
+       .name           = "StarFive JHB100 INTC",
        .irq_unmask     = starfive_intc_unmask,
        .irq_mask       = starfive_intc_mask,
 };
@@ -199,9 +199,9 @@ err_free:
 }
 
 IRQCHIP_PLATFORM_DRIVER_BEGIN(starfive_intc)
-IRQCHIP_MATCH("starfive,jh8100-intc", starfive_intc_probe)
+IRQCHIP_MATCH("starfive,jhb100-intc", starfive_intc_probe)
 IRQCHIP_PLATFORM_DRIVER_END(starfive_intc)
 
-MODULE_DESCRIPTION("StarFive JH8100 External Interrupt Controller");
+MODULE_DESCRIPTION("StarFive JHB100 External Interrupt Controller");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Changhuang Liang <changhuang.liang@starfivetech.com>");