| Message ID | 20240430133559.1836389-32-trini@konsulko.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/33] arm: mach-versatile: Remove dead code | expand |
> Subject: [PATCH 32/33] arm: fsl-layerscape: Remove <common.h> and add > needed includes > > Remove <common.h> from all fsl-layerscape related files and when needed > add missing include files directly. > > Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Peng Fan <peng.fan@nxp.com> > --- > Cc: Peng Fan <peng.fan@nxp.com> > --- > arch/arm/cpu/armv7/ls102xa/clock.c | 2 +- > arch/arm/cpu/armv7/ls102xa/cpu.c | 1 - > arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- > arch/arm/cpu/armv7/ls102xa/fsl_epu.c | 1 - > arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c | 2 +- > arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c | 2 +- > arch/arm/cpu/armv7/ls102xa/soc.c | 2 +- > arch/arm/cpu/armv7/ls102xa/spl.c | 1 - > arch/arm/cpu/armv7/ls102xa/timer.c | 1 - > arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/icid.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/mp.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 +- > arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 ++ > arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 + > arch/arm/include/asm/arch-ls102xa/fsl_serdes.h | 2 ++ > 35 files changed, 40 insertions(+), 32 deletions(-) > > diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c > b/arch/arm/cpu/armv7/ls102xa/clock.c > index 4e1fe281201f..e885a85ce65c 100644 > --- a/arch/arm/cpu/armv7/ls102xa/clock.c > +++ b/arch/arm/cpu/armv7/ls102xa/clock.c > @@ -3,7 +3,7 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <clock_legacy.h> > #include <asm/global_data.h> > #include <asm/io.h> > diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c > b/arch/arm/cpu/armv7/ls102xa/cpu.c > index c455969609f6..74a2dcbc116a 100644 > --- a/arch/arm/cpu/armv7/ls102xa/cpu.c > +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c > @@ -4,7 +4,6 @@ > * Copyright 2021 NXP > */ > > -#include <common.h> > #include <cpu_func.h> > #include <init.h> > #include <net.h> > diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c > b/arch/arm/cpu/armv7/ls102xa/fdt.c > index 1c3d24bcad94..34eea22eb923 100644 > --- a/arch/arm/cpu/armv7/ls102xa/fdt.c > +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c > @@ -3,7 +3,7 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <clock_legacy.h> > #include <net.h> > #include <asm/global_data.h> > diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c > b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c > index e31a4fb6c31b..664eae532d5f 100644 > --- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c > +++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c > @@ -3,7 +3,6 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > #include <asm/io.h> > > #include "fsl_epu.h" > diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c > b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c > index f74d819ea1ea..c1eadb34523f 100644 > --- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c > +++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c > @@ -3,7 +3,7 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch/fsl_serdes.h> > #include <asm/arch/immap_ls102xa.h> > #include <linux/errno.h> > diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c > b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c > index 8c030be8b36f..3032e266c5d4 100644 > --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c > +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c > @@ -3,7 +3,7 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <linux/kernel.h> > #include <asm/arch/fsl_serdes.h> > #include <asm/arch/immap_ls102xa.h> > > diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c > b/arch/arm/cpu/armv7/ls102xa/soc.c > index 84d4ea3a8f4a..7ff59edd452e 100644 > --- a/arch/arm/cpu/armv7/ls102xa/soc.c > +++ b/arch/arm/cpu/armv7/ls102xa/soc.c > @@ -3,7 +3,7 @@ > * Copyright 2015 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <log.h> > #include <asm/arch/clock.h> > #include <asm/io.h> > diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c > b/arch/arm/cpu/armv7/ls102xa/spl.c > index a19496862359..374de92d026c 100644 > --- a/arch/arm/cpu/armv7/ls102xa/spl.c > +++ b/arch/arm/cpu/armv7/ls102xa/spl.c > @@ -3,7 +3,6 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > #include <spl.h> > > u32 spl_boot_device(void) > diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c > b/arch/arm/cpu/armv7/ls102xa/timer.c > index c6126b10c355..6f32ced5aec3 100644 > --- a/arch/arm/cpu/armv7/ls102xa/timer.c > +++ b/arch/arm/cpu/armv7/ls102xa/timer.c > @@ -3,7 +3,6 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > #include <init.h> > #include <time.h> > #include <asm/global_data.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c > b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c > index 12d31184ad91..d2dbfdd08a02 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c > @@ -4,7 +4,7 @@ > * Copyright 2014-2015 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <clock_legacy.h> > #include <cpu_func.h> > #include <env.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c > b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c > index 22ce6992165b..ca6be3626fbe 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c > @@ -4,7 +4,7 @@ > * Copyright 2020-2021 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <clock_legacy.h> > #include <efi_loader.h> > #include <log.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c > b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c > index b1bb29bcaf55..78961d8089e4 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c > @@ -3,11 +3,12 @@ > * Copyright 2015 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <log.h> > #include <asm/io.h> > #include <linux/delay.h> > #include <linux/errno.h> > +#include <linux/string.h> > #include <asm/arch/fsl_serdes.h> > #include <asm/arch/soc.h> > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c > b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c > index 4455eb1726dc..9a24d4b30313 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c > @@ -4,7 +4,7 @@ > * Copyright 2019 NXP. > */ > > -#include <common.h> > +#include <config.h> > #include <clock_legacy.h> > #include <cpu_func.h> > #include <asm/global_data.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c > b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c > index fbd5fd7d433b..b768790437fd 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c > @@ -4,7 +4,7 @@ > * Copyright 2014-2015 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <env.h> > #include <log.h> > #include <asm/io.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c > b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c > index 137778dc136b..452246e0e67f 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c > @@ -6,7 +6,7 @@ > * Derived from arch/power/cpu/mpc85xx/speed.c > */ > > -#include <common.h> > +#include <config.h> > #include <clock_legacy.h> > #include <cpu_func.h> > #include <asm/global_data.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c > b/arch/arm/cpu/armv8/fsl-layerscape/icid.c > index c22e73253c3c..04ffefafbf73 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c > @@ -3,7 +3,7 @@ > * Copyright 2018 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <linux/libfdt.h> > #include <fdt_support.h> > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c > index 8d7beca7db38..c0e5455507a4 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c > @@ -3,7 +3,7 @@ > * Copyright 2016 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch/fsl_serdes.h> > #include <asm/arch/immap_lsch2.h> > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c > index 86a49b152e44..d48baa63816f 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c > @@ -3,9 +3,9 @@ > * Copyright 2019 NXP > */ > > -#include <common.h> > #include <fdt_support.h> > #include <log.h> > +#include <asm/arch/stream_id_lsch3.h> > #include <asm/arch-fsl-layerscape/immap_lsch3.h> > #include <asm/arch-fsl-layerscape/fsl_icid.h> > #include <asm/arch-fsl-layerscape/fsl_portals.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c > index 80d2910f679f..1b4eab3613e5 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c > @@ -3,7 +3,8 @@ > * Copyright 2019 NXP > */ > > -#include <common.h> > +#include <config.h> > +#include <linux/kernel.h> > #include <asm/arch/fsl_serdes.h> > > struct serdes_config { > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c > index e3c3fc6bfb55..ec80e42055d9 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c > @@ -3,11 +3,12 @@ > * Copyright 2018 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch-fsl-layerscape/immap_lsch2.h> > #include <asm/arch-fsl-layerscape/fsl_icid.h> > #include <asm/arch-fsl-layerscape/fsl_portals.h> > #include <fsl_sec.h> > +#include <asm/arch/stream_id_lsch3.h> > > #ifdef CONFIG_SYS_DPAA_QBMAN > struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = { diff --git > a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c > index 6c5e52ebaa69..1911ca1a175b 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c > @@ -3,7 +3,7 @@ > * Copyright 2015 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch/fsl_serdes.h> > #include <asm/arch/immap_lsch2.h> > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c > index 333d7e2fa21a..a73dd316f8d0 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c > @@ -3,10 +3,11 @@ > * Copyright 2018 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch-fsl-layerscape/immap_lsch2.h> > #include <asm/arch-fsl-layerscape/fsl_icid.h> > #include <asm/arch-fsl-layerscape/fsl_portals.h> > +#include <asm/arch/stream_id_lsch3.h> > > #ifdef CONFIG_SYS_DPAA_QBMAN > struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = { diff --git > a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c > index 9347e516bf69..26ca4ca10f3d 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c > @@ -4,7 +4,7 @@ > * Copyright 2019 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch/fsl_serdes.h> > #include <asm/arch/immap_lsch2.h> > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c > index 23743ae10cff..3a076ca04f6e 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c > @@ -3,10 +3,11 @@ > * Copyright 2019 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch-fsl-layerscape/immap_lsch3.h> > #include <asm/arch-fsl-layerscape/fsl_icid.h> > #include <asm/arch-fsl-layerscape/fsl_portals.h> > +#include <asm/arch/stream_id_lsch3.h> > > struct icid_id_table icid_tbl[] = { > SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git > a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c > index fe667f06c395..154b727392e1 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c > @@ -3,7 +3,7 @@ > * Copyright 2017-2019 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch/fsl_serdes.h> > #include <asm/arch/soc.h> > #include <asm/io.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c > index 7997422840f2..5088c8ebb7ff 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c > @@ -3,7 +3,7 @@ > * Copyright 2014-2015 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch/fsl_serdes.h> > > struct serdes_config { > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c > b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c > index e6403b795263..c320e835c996 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c > @@ -3,10 +3,11 @@ > * Copyright 2019 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch-fsl-layerscape/immap_lsch3.h> > #include <asm/arch-fsl-layerscape/fsl_icid.h> > #include <asm/arch-fsl-layerscape/fsl_portals.h> > +#include <asm/arch/stream_id_lsch3.h> > > struct icid_id_table icid_tbl[] = { > SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git > a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c > b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c > index 3a0ed1fa550c..df9329df77e1 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c > @@ -3,10 +3,11 @@ > * Copyright 2019 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch-fsl-layerscape/immap_lsch3.h> > #include <asm/arch-fsl-layerscape/fsl_icid.h> > #include <asm/arch-fsl-layerscape/fsl_portals.h> > +#include <asm/arch/stream_id_lsch3.h> > > struct icid_id_table icid_tbl[] = { > SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git > a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c > b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c > index 5941d90e036f..43f0e8c87ba9 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c > @@ -3,7 +3,7 @@ > * Copyright 2018, 2020 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <asm/arch/fsl_serdes.h> > > struct serdes_config { > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c > b/arch/arm/cpu/armv8/fsl-layerscape/mp.c > index ce0c46ad0d4e..db913208b9e9 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c > @@ -3,7 +3,7 @@ > * Copyright 2014-2015 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <clock_legacy.h> > #include <cpu_func.h> > #include <image.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c > b/arch/arm/cpu/armv8/fsl-layerscape/soc.c > index 4c61d28c20f0..d85a630f8a3c 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c > @@ -4,7 +4,7 @@ > * Copyright 2019-2021 NXP > */ > > -#include <common.h> > +#include <config.h> > #include <clock_legacy.h> > #include <cpu_func.h> > #include <env.h> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c > b/arch/arm/cpu/armv8/fsl-layerscape/spl.c > index 232adfa843a2..a739ff2da581 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c > @@ -3,7 +3,7 @@ > * Copyright 2014-2015 Freescale Semiconductor, Inc. > */ > > -#include <common.h> > +#include <config.h> > #include <clock_legacy.h> > #include <cpu_func.h> > #include <debug_uart.h> > diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h > b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h > index 9e29350ca4ba..a02bec9371c0 100644 > --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h > +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h > @@ -7,6 +7,8 @@ > #ifndef __FSL_SERDES_H__ > #define __FSL_SERDES_H__ > > +#include <linux/types.h> > + > #ifdef CONFIG_FSL_LSCH3 > enum srds_prtcl { > /* > diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h > b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h > index 9794db044996..147ca2f99de6 100644 > --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h > +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h > @@ -6,6 +6,7 @@ > #ifndef __ARCH_FSL_LSCH2_IMMAP_H__ > #define __ARCH_FSL_LSCH2_IMMAP_H__ > > +#include <config.h> > #include <fsl_immap.h> > #ifndef __ASSEMBLY__ > #include <linux/bitops.h> > diff --git a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h > b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h > index 9244e0a78fd3..35e3ec7a9878 100644 > --- a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h > +++ b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h > @@ -6,6 +6,8 @@ > #ifndef __FSL_SERDES_H > #define __FSL_SERDES_H > > +#include <linux/types.h> > + > enum srds_prtcl { > /* > * Nobody will check whether the device 'NONE' has been configured, > -- > 2.34.1
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c index 4e1fe281201f..e885a85ce65c 100644 --- a/arch/arm/cpu/armv7/ls102xa/clock.c +++ b/arch/arm/cpu/armv7/ls102xa/clock.c @@ -3,7 +3,7 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <asm/global_data.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index c455969609f6..74a2dcbc116a 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -4,7 +4,6 @@ * Copyright 2021 NXP */ -#include <common.h> #include <cpu_func.h> #include <init.h> #include <net.h> diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index 1c3d24bcad94..34eea22eb923 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -3,7 +3,7 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <net.h> #include <asm/global_data.h> diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c index e31a4fb6c31b..664eae532d5f 100644 --- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c +++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c @@ -3,7 +3,6 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include <common.h> #include <asm/io.h> #include "fsl_epu.h" diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c index f74d819ea1ea..c1eadb34523f 100644 --- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c +++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c @@ -3,7 +3,7 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/immap_ls102xa.h> #include <linux/errno.h> diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c index 8c030be8b36f..3032e266c5d4 100644 --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c @@ -3,7 +3,7 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <linux/kernel.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/immap_ls102xa.h> diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c index 84d4ea3a8f4a..7ff59edd452e 100644 --- a/arch/arm/cpu/armv7/ls102xa/soc.c +++ b/arch/arm/cpu/armv7/ls102xa/soc.c @@ -3,7 +3,7 @@ * Copyright 2015 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <log.h> #include <asm/arch/clock.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c b/arch/arm/cpu/armv7/ls102xa/spl.c index a19496862359..374de92d026c 100644 --- a/arch/arm/cpu/armv7/ls102xa/spl.c +++ b/arch/arm/cpu/armv7/ls102xa/spl.c @@ -3,7 +3,6 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include <common.h> #include <spl.h> u32 spl_boot_device(void) diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c index c6126b10c355..6f32ced5aec3 100644 --- a/arch/arm/cpu/armv7/ls102xa/timer.c +++ b/arch/arm/cpu/armv7/ls102xa/timer.c @@ -3,7 +3,6 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include <common.h> #include <init.h> #include <time.h> #include <asm/global_data.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 12d31184ad91..d2dbfdd08a02 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -4,7 +4,7 @@ * Copyright 2014-2015 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <cpu_func.h> #include <env.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 22ce6992165b..ca6be3626fbe 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -4,7 +4,7 @@ * Copyright 2020-2021 NXP */ -#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <efi_loader.h> #include <log.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c index b1bb29bcaf55..78961d8089e4 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c @@ -3,11 +3,12 @@ * Copyright 2015 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <log.h> #include <asm/io.h> #include <linux/delay.h> #include <linux/errno.h> +#include <linux/string.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c index 4455eb1726dc..9a24d4b30313 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c @@ -4,7 +4,7 @@ * Copyright 2019 NXP. */ -#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <cpu_func.h> #include <asm/global_data.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c index fbd5fd7d433b..b768790437fd 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c @@ -4,7 +4,7 @@ * Copyright 2014-2015 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <env.h> #include <log.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c index 137778dc136b..452246e0e67f 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c @@ -6,7 +6,7 @@ * Derived from arch/power/cpu/mpc85xx/speed.c */ -#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <cpu_func.h> #include <asm/global_data.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c index c22e73253c3c..04ffefafbf73 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c @@ -3,7 +3,7 @@ * Copyright 2018 NXP */ -#include <common.h> +#include <config.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c index 8d7beca7db38..c0e5455507a4 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c @@ -3,7 +3,7 @@ * Copyright 2016 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/immap_lsch2.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c index 86a49b152e44..d48baa63816f 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c @@ -3,9 +3,9 @@ * Copyright 2019 NXP */ -#include <common.h> #include <fdt_support.h> #include <log.h> +#include <asm/arch/stream_id_lsch3.h> #include <asm/arch-fsl-layerscape/immap_lsch3.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> #include <asm/arch-fsl-layerscape/fsl_portals.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c index 80d2910f679f..1b4eab3613e5 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c @@ -3,7 +3,8 @@ * Copyright 2019 NXP */ -#include <common.h> +#include <config.h> +#include <linux/kernel.h> #include <asm/arch/fsl_serdes.h> struct serdes_config { diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c index e3c3fc6bfb55..ec80e42055d9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c @@ -3,11 +3,12 @@ * Copyright 2018 NXP */ -#include <common.h> +#include <config.h> #include <asm/arch-fsl-layerscape/immap_lsch2.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> #include <asm/arch-fsl-layerscape/fsl_portals.h> #include <fsl_sec.h> +#include <asm/arch/stream_id_lsch3.h> #ifdef CONFIG_SYS_DPAA_QBMAN struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = { diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c index 6c5e52ebaa69..1911ca1a175b 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c @@ -3,7 +3,7 @@ * Copyright 2015 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/immap_lsch2.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c index 333d7e2fa21a..a73dd316f8d0 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c @@ -3,10 +3,11 @@ * Copyright 2018 NXP */ -#include <common.h> +#include <config.h> #include <asm/arch-fsl-layerscape/immap_lsch2.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> #include <asm/arch-fsl-layerscape/fsl_portals.h> +#include <asm/arch/stream_id_lsch3.h> #ifdef CONFIG_SYS_DPAA_QBMAN struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = { diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c index 9347e516bf69..26ca4ca10f3d 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c @@ -4,7 +4,7 @@ * Copyright 2019 NXP */ -#include <common.h> +#include <config.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/immap_lsch2.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c index 23743ae10cff..3a076ca04f6e 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c @@ -3,10 +3,11 @@ * Copyright 2019 NXP */ -#include <common.h> +#include <config.h> #include <asm/arch-fsl-layerscape/immap_lsch3.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> #include <asm/arch-fsl-layerscape/fsl_portals.h> +#include <asm/arch/stream_id_lsch3.h> struct icid_id_table icid_tbl[] = { SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c index fe667f06c395..154b727392e1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c @@ -3,7 +3,7 @@ * Copyright 2017-2019 NXP */ -#include <common.h> +#include <config.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c index 7997422840f2..5088c8ebb7ff 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c @@ -3,7 +3,7 @@ * Copyright 2014-2015 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <asm/arch/fsl_serdes.h> struct serdes_config { diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c index e6403b795263..c320e835c996 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c @@ -3,10 +3,11 @@ * Copyright 2019 NXP */ -#include <common.h> +#include <config.h> #include <asm/arch-fsl-layerscape/immap_lsch3.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> #include <asm/arch-fsl-layerscape/fsl_portals.h> +#include <asm/arch/stream_id_lsch3.h> struct icid_id_table icid_tbl[] = { SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c index 3a0ed1fa550c..df9329df77e1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c @@ -3,10 +3,11 @@ * Copyright 2019 NXP */ -#include <common.h> +#include <config.h> #include <asm/arch-fsl-layerscape/immap_lsch3.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> #include <asm/arch-fsl-layerscape/fsl_portals.h> +#include <asm/arch/stream_id_lsch3.h> struct icid_id_table icid_tbl[] = { SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c index 5941d90e036f..43f0e8c87ba9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c @@ -3,7 +3,7 @@ * Copyright 2018, 2020 NXP */ -#include <common.h> +#include <config.h> #include <asm/arch/fsl_serdes.h> struct serdes_config { diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c index ce0c46ad0d4e..db913208b9e9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c @@ -3,7 +3,7 @@ * Copyright 2014-2015 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <cpu_func.h> #include <image.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 4c61d28c20f0..d85a630f8a3c 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -4,7 +4,7 @@ * Copyright 2019-2021 NXP */ -#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <cpu_func.h> #include <env.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 232adfa843a2..a739ff2da581 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -3,7 +3,7 @@ * Copyright 2014-2015 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <cpu_func.h> #include <debug_uart.h> diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h index 9e29350ca4ba..a02bec9371c0 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h @@ -7,6 +7,8 @@ #ifndef __FSL_SERDES_H__ #define __FSL_SERDES_H__ +#include <linux/types.h> + #ifdef CONFIG_FSL_LSCH3 enum srds_prtcl { /* diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h index 9794db044996..147ca2f99de6 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h @@ -6,6 +6,7 @@ #ifndef __ARCH_FSL_LSCH2_IMMAP_H__ #define __ARCH_FSL_LSCH2_IMMAP_H__ +#include <config.h> #include <fsl_immap.h> #ifndef __ASSEMBLY__ #include <linux/bitops.h> diff --git a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h index 9244e0a78fd3..35e3ec7a9878 100644 --- a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h +++ b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h @@ -6,6 +6,8 @@ #ifndef __FSL_SERDES_H #define __FSL_SERDES_H +#include <linux/types.h> + enum srds_prtcl { /* * Nobody will check whether the device 'NONE' has been configured,
Remove <common.h> from all fsl-layerscape related files and when needed add missing include files directly. Signed-off-by: Tom Rini <trini@konsulko.com> --- Cc: Peng Fan <peng.fan@nxp.com> --- arch/arm/cpu/armv7/ls102xa/clock.c | 2 +- arch/arm/cpu/armv7/ls102xa/cpu.c | 1 - arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- arch/arm/cpu/armv7/ls102xa/fsl_epu.c | 1 - arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c | 2 +- arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c | 2 +- arch/arm/cpu/armv7/ls102xa/soc.c | 2 +- arch/arm/cpu/armv7/ls102xa/spl.c | 1 - arch/arm/cpu/armv7/ls102xa/timer.c | 1 - arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/icid.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/mp.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 +- arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 ++ arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 + arch/arm/include/asm/arch-ls102xa/fsl_serdes.h | 2 ++ 35 files changed, 40 insertions(+), 32 deletions(-)