diff options
Diffstat (limited to 'drivers/arm/gic')
-rw-r--r-- | drivers/arm/gic/common/gic_common.c | 6 | ||||
-rw-r--r-- | drivers/arm/gic/common/gic_common_private.h | 5 | ||||
-rw-r--r-- | drivers/arm/gic/v2/gicv2_helpers.c | 12 | ||||
-rw-r--r-- | drivers/arm/gic/v2/gicv2_main.c | 15 | ||||
-rw-r--r-- | drivers/arm/gic/v2/gicv2_private.h | 5 | ||||
-rw-r--r-- | drivers/arm/gic/v3/arm_gicv3_common.c | 7 | ||||
-rw-r--r-- | drivers/arm/gic/v3/gic600.c | 5 | ||||
-rw-r--r-- | drivers/arm/gic/v3/gicv3_helpers.c | 10 | ||||
-rw-r--r-- | drivers/arm/gic/v3/gicv3_main.c | 12 | ||||
-rw-r--r-- | drivers/arm/gic/v3/gicv3_private.h | 8 |
10 files changed, 50 insertions, 35 deletions
diff --git a/drivers/arm/gic/common/gic_common.c b/drivers/arm/gic/common/gic_common.c index 589de5da40..38b2f67190 100644 --- a/drivers/arm/gic/common/gic_common.c +++ b/drivers/arm/gic/common/gic_common.c @@ -5,8 +5,10 @@ */ #include <assert.h> -#include <gic_common.h> -#include <mmio.h> + +#include <drivers/arm/gic_common.h> +#include <lib/mmio.h> + #include "gic_common_private.h" /******************************************************************************* diff --git a/drivers/arm/gic/common/gic_common_private.h b/drivers/arm/gic/common/gic_common_private.h index 9d9e8c7bac..1ab1bdbef7 100644 --- a/drivers/arm/gic/common/gic_common_private.h +++ b/drivers/arm/gic/common/gic_common_private.h @@ -7,10 +7,11 @@ #ifndef GIC_COMMON_PRIVATE_H #define GIC_COMMON_PRIVATE_H -#include <gic_common.h> -#include <mmio.h> #include <stdint.h> +#include <drivers/arm/gic_common.h> +#include <lib/mmio.h> + /******************************************************************************* * GIC Distributor interface register accessors that are common to GICv3 & GICv2 ******************************************************************************/ diff --git a/drivers/arm/gic/v2/gicv2_helpers.c b/drivers/arm/gic/v2/gicv2_helpers.c index bc4c1d1658..6739a782c1 100644 --- a/drivers/arm/gic/v2/gicv2_helpers.c +++ b/drivers/arm/gic/v2/gicv2_helpers.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <assert.h> + #include <arch.h> #include <arch_helpers.h> -#include <assert.h> -#include <debug.h> -#include <gic_common.h> -#include <gicv2.h> -#include <interrupt_props.h> +#include <common/debug.h> +#include <common/interrupt_props.h> +#include <drivers/arm/gic_common.h> +#include <drivers/arm/gicv2.h> + #include "../common/gic_common_private.h" #include "gicv2_private.h" diff --git a/drivers/arm/gic/v2/gicv2_main.c b/drivers/arm/gic/v2/gicv2_main.c index b8729056d5..c5d4fe1c37 100644 --- a/drivers/arm/gic/v2/gicv2_main.c +++ b/drivers/arm/gic/v2/gicv2_main.c @@ -4,16 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch.h> -#include <arch_helpers.h> #include <assert.h> -#include <debug.h> -#include <gic_common.h> -#include <gicv2.h> -#include <interrupt_props.h> -#include <spinlock.h> #include <stdbool.h> +#include <arch.h> +#include <arch_helpers.h> +#include <common/debug.h> +#include <common/interrupt_props.h> +#include <drivers/arm/gic_common.h> +#include <drivers/arm/gicv2.h> +#include <lib/spinlock.h> + #include "../common/gic_common_private.h" #include "gicv2_private.h" diff --git a/drivers/arm/gic/v2/gicv2_private.h b/drivers/arm/gic/v2/gicv2_private.h index ccfad78cd9..0fbdab0a2c 100644 --- a/drivers/arm/gic/v2/gicv2_private.h +++ b/drivers/arm/gic/v2/gicv2_private.h @@ -7,10 +7,11 @@ #ifndef GICV2_PRIVATE_H #define GICV2_PRIVATE_H -#include <gicv2.h> -#include <mmio.h> #include <stdint.h> +#include <drivers/arm/gicv2.h> +#include <lib/mmio.h> + /******************************************************************************* * Private function prototypes ******************************************************************************/ diff --git a/drivers/arm/gic/v3/arm_gicv3_common.c b/drivers/arm/gic/v3/arm_gicv3_common.c index c809732951..4489892863 100644 --- a/drivers/arm/gic/v3/arm_gicv3_common.c +++ b/drivers/arm/gic/v3/arm_gicv3_common.c @@ -10,12 +10,13 @@ * APIs that are different to those generic ones in GICv3 driver. */ -#include <arch_helpers.h> #include <assert.h> -#include <gicv3.h> + +#include <arch_helpers.h> +#include <drivers/arm/arm_gicv3_common.h> +#include <drivers/arm/gicv3.h> #include "gicv3_private.h" -#include "arm_gicv3_common.h" /* * Flush the internal GIC cache of the LPIs pending tables to memory before diff --git a/drivers/arm/gic/v3/gic600.c b/drivers/arm/gic/v3/gic600.c index eb4fc548f7..9cb2ab25ed 100644 --- a/drivers/arm/gic/v3/gic600.c +++ b/drivers/arm/gic/v3/gic600.c @@ -11,9 +11,10 @@ * GIC600 supports independently power-gating redistributor interface. */ -#include <arch_helpers.h> #include <assert.h> -#include <gicv3.h> + +#include <arch_helpers.h> +#include <drivers/arm/gicv3.h> #include "gicv3_private.h" diff --git a/drivers/arm/gic/v3/gicv3_helpers.c b/drivers/arm/gic/v3/gicv3_helpers.c index c12a4b6517..39ea2a3746 100644 --- a/drivers/arm/gic/v3/gicv3_helpers.c +++ b/drivers/arm/gic/v3/gicv3_helpers.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <assert.h> + #include <arch.h> #include <arch_helpers.h> -#include <assert.h> -#include <debug.h> -#include <gic_common.h> -#include <interrupt_props.h> +#include <common/debug.h> +#include <common/interrupt_props.h> +#include <drivers/arm/gic_common.h> + #include "../common/gic_common_private.h" #include "gicv3_private.h" diff --git a/drivers/arm/gic/v3/gicv3_main.c b/drivers/arm/gic/v3/gicv3_main.c index 60f2e108a0..cf92f10ba7 100644 --- a/drivers/arm/gic/v3/gicv3_main.c +++ b/drivers/arm/gic/v3/gicv3_main.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <assert.h> + #include <arch.h> #include <arch_helpers.h> -#include <assert.h> -#include <debug.h> -#include <gicv3.h> -#include <interrupt_props.h> -#include <spinlock.h> +#include <common/debug.h> +#include <common/interrupt_props.h> +#include <drivers/arm/gicv3.h> +#include <lib/spinlock.h> + #include "gicv3_private.h" const gicv3_driver_data_t *gicv3_driver_data; diff --git a/drivers/arm/gic/v3/gicv3_private.h b/drivers/arm/gic/v3/gicv3_private.h index 188e711688..92066e1f2f 100644 --- a/drivers/arm/gic/v3/gicv3_private.h +++ b/drivers/arm/gic/v3/gicv3_private.h @@ -8,10 +8,12 @@ #define GICV3_PRIVATE_H #include <assert.h> -#include <gic_common.h> -#include <gicv3.h> -#include <mmio.h> #include <stdint.h> + +#include <drivers/arm/gic_common.h> +#include <drivers/arm/gicv3.h> +#include <lib/mmio.h> + #include "../common/gic_common_private.h" /******************************************************************************* |