drivers/interrupt_controller: Renaming s1000 to cavs
If it is such a thing (a CAVT intc), it will not be targeting Intel
s1000 SoC only. UP squarde ADSP use the same intc. So renaming it to
CAVS. Though CAVS name might be wrong (CAVS being an overall
architecture name, and not an IP block specification).
Reducing the amount of lines by using if/endif as well.
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
diff --git a/drivers/interrupt_controller/Kconfig b/drivers/interrupt_controller/Kconfig
index ca6f61c..eae6f63 100644
--- a/drivers/interrupt_controller/Kconfig
+++ b/drivers/interrupt_controller/Kconfig
@@ -54,7 +54,7 @@
source "drivers/interrupt_controller/Kconfig.stm32"
-source "drivers/interrupt_controller/Kconfig.s1000"
+source "drivers/interrupt_controller/Kconfig.cavs"
source "drivers/interrupt_controller/Kconfig.rv32m1"
diff --git a/drivers/interrupt_controller/Kconfig.s1000 b/drivers/interrupt_controller/Kconfig.cavs
similarity index 82%
rename from drivers/interrupt_controller/Kconfig.s1000
rename to drivers/interrupt_controller/Kconfig.cavs
index 5e7e590..0905759 100644
--- a/drivers/interrupt_controller/Kconfig.s1000
+++ b/drivers/interrupt_controller/Kconfig.cavs
@@ -1,4 +1,4 @@
-# Intel_S1000 configuration
+# CAVS interrupt controller configuration
# Copyright (c) 2017 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
@@ -9,57 +9,51 @@
help
These are 4 in number supporting a max of 32 interrupts each.
+if CAVS_ICTL
+
config CAVS_ISR_TBL_OFFSET
int "Offset in the SW ISR Table"
default 0
- depends on CAVS_ICTL
help
This indicates the offset in the SW_ISR_TABLE beginning from where
the ISRs for CAVS Interrupt Controller are assigned.
config CAVS_ICTL_0_NAME
string "CAVS 0 Driver name"
- depends on CAVS_ICTL
default "CAVS_0"
config CAVS_ICTL_0_OFFSET
int "Parent interrupt number to which CAVS_0 maps"
default 0
- depends on CAVS_ICTL
config CAVS_ICTL_1_NAME
string "CAVS 1 Driver name"
- depends on CAVS_ICTL
default "CAVS_1"
config CAVS_ICTL_1_OFFSET
int "Parent interrupt number to which CAVS_1 maps"
default 0
- depends on CAVS_ICTL
config CAVS_ICTL_2_NAME
string "CAVS 2 Driver name"
- depends on CAVS_ICTL
default "CAVS_2"
config CAVS_ICTL_2_OFFSET
int "Parent interrupt number to which CAVS_2 maps"
default 0
- depends on CAVS_ICTL
config CAVS_ICTL_3_NAME
string "CAVS 3 Driver name"
- depends on CAVS_ICTL
default "CAVS_3"
config CAVS_ICTL_3_OFFSET
int "Parent interrupt number to which CAVS_3 maps"
default 0
- depends on CAVS_ICTL
config CAVS_ICTL_INIT_PRIORITY
int "CAVS ICTL Init priority"
default 60
- depends on CAVS_ICTL
help
Cavs Interrupt Logic initialization priority.
+
+endif # CAVS_ICTL
