SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / arch / x86 / include / asm / irq.h

diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index 6697da3b859124d0bf69e00471e006b12180ba47..169b2819ca841674c6e3db288904f57f928ab87a 100644 (file)
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _ARCH_IRQ_H_
@@ -34,6 +33,8 @@ enum pirq_config {
  *             IRQ N is available to be routed
  * @lb_bdf:    irq router's PCI bus/device/function number encoding
  * @ibase:     IBASE register block base address
+ * @actl_8bit: ACTL register width is 8-bit (for ICH series chipset)
+ * @actl_addr: ACTL register offset
  */
 struct irq_router {
        int config;
@@ -41,6 +42,8 @@ struct irq_router {
        u16 irq_mask;
        u32 bdf;
        u32 ibase;
+       bool actl_8bit;
+       int actl_addr;
 };
 
 struct pirq_routing {
@@ -56,23 +59,10 @@ struct pirq_routing {
 #define PIRQ_BITMAP            0xdef8
 
 /**
- * cpu_irq_init() - Initialize CPU IRQ routing
- *
- * This initializes some platform-specific registers related to IRQ routing,
- * like configuring internal PCI devices to use which PCI interrupt pin,
- * and which PCI interrupt pin is mapped to which PIRQ line. Note on some
- * platforms, such IRQ routing might be hard-coded thus cannot configure.
- */
-void cpu_irq_init(void);
-
-/**
- * pirq_init() - Initialize platform PIRQ routing
- *
- * This initializes the PIRQ routing on the platform and configures all PCI
- * devices' interrupt line register to a working IRQ number on the 8259 PIC.
+ * irq_router_common_init() - Perform common x86 interrupt init
  *
- * @return 0 if OK, -ve on error
+ * This creates the PIRQ routing table and routes the IRQs
  */
-int pirq_init(void);
+int irq_router_common_init(struct udevice *dev);
 
 #endif /* _ARCH_IRQ_H_ */