lkml.org 
[lkml]   [2023]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 6/8] ARM: mach-airoha: Rework support and directory structure
    Date
    Having a platform need a mach-* directory should be seen as a negative,
    it means the platform needs special non-standard handling. ARM64 support
    does not allow mach-* directories at all. While we may not get to that
    given all the non-standard architectures we support, we should still try
    to get as close as we can and reduce the number of mach directories.

    The mach-airoha/ directory, and files within, provide just one "feature":
    having the kernel print the machine name if the DTB does not also contain
    a "model" string (which they always do). To reduce the number of mach-*
    directories let's do without that feature and remove this directory.

    It also seems there was a copy/paste error and the "MEDIATEK_DT"
    name was re-used in the DT_MACHINE_START macro. This may have caused
    conflicts if this was built in a multi-arch configuration.

    NOTE: The default l2c_aux_mask is now ~0 but these devices never have
    this type of cache controller so this is safe.

    Signed-off-by: Andrew Davis <afd@ti.com>
    ---
    arch/arm/Kconfig | 11 -----------
    arch/arm/Kconfig.platforms | 11 +++++++++++
    arch/arm/Makefile | 1 -
    arch/arm/mach-airoha/Makefile | 2 --
    arch/arm/mach-airoha/airoha.c | 16 ----------------
    5 files changed, 11 insertions(+), 30 deletions(-)
    delete mode 100644 arch/arm/mach-airoha/Makefile
    delete mode 100644 arch/arm/mach-airoha/airoha.c

    diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
    index 09fa512932ab4..5002d507bd081 100644
    --- a/arch/arm/Kconfig
    +++ b/arch/arm/Kconfig
    @@ -341,17 +341,6 @@ config ARCH_MULTIPLATFORM

    source "arch/arm/Kconfig.platforms"

    -config ARCH_AIROHA
    - bool "Airoha SoC Support"
    - depends on ARCH_MULTI_V7
    - select ARM_AMBA
    - select ARM_GIC
    - select ARM_GIC_V3
    - select ARM_PSCI
    - select HAVE_ARM_ARCH_TIMER
    - help
    - Support for Airoha EN7523 SoCs
    -
    #
    # This is sorted alphabetically by mach-* pathname. However, plat-*
    # Kconfigs may be included either alphabetically (according to the
    diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
    index 4b5fad18ca8b0..38457d5a18fff 100644
    --- a/arch/arm/Kconfig.platforms
    +++ b/arch/arm/Kconfig.platforms
    @@ -67,6 +67,17 @@ config ARCH_VIRT
    select ARM_PSCI
    select HAVE_ARM_ARCH_TIMER

    +config ARCH_AIROHA
    + bool "Airoha SoC Support"
    + depends on ARCH_MULTI_V7
    + select ARM_AMBA
    + select ARM_GIC
    + select ARM_GIC_V3
    + select ARM_PSCI
    + select HAVE_ARM_ARCH_TIMER
    + help
    + Support for Airoha EN7523 SoCs
    +
    config MACH_ASM9260
    bool "Alphascale ASM9260"
    depends on ARCH_MULTI_V5
    diff --git a/arch/arm/Makefile b/arch/arm/Makefile
    index 32e99aa282bf9..e20c8af34d518 100644
    --- a/arch/arm/Makefile
    +++ b/arch/arm/Makefile
    @@ -167,7 +167,6 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
    # Machine directory name. This list is sorted alphanumerically
    # by CONFIG_* macro name.
    machine-$(CONFIG_ARCH_ACTIONS) += actions
    -machine-$(CONFIG_ARCH_AIROHA) += airoha
    machine-$(CONFIG_ARCH_ALPINE) += alpine
    machine-$(CONFIG_ARCH_ARTPEC) += artpec
    machine-$(CONFIG_ARCH_ASPEED) += aspeed
    diff --git a/arch/arm/mach-airoha/Makefile b/arch/arm/mach-airoha/Makefile
    deleted file mode 100644
    index a5857d0d02ebf..0000000000000
    --- a/arch/arm/mach-airoha/Makefile
    +++ /dev/null
    @@ -1,2 +0,0 @@
    -# SPDX-License-Identifier: GPL-2.0-only
    -obj-y += airoha.o
    diff --git a/arch/arm/mach-airoha/airoha.c b/arch/arm/mach-airoha/airoha.c
    deleted file mode 100644
    index ea23b5abb478e..0000000000000
    --- a/arch/arm/mach-airoha/airoha.c
    +++ /dev/null
    @@ -1,16 +0,0 @@
    -// SPDX-License-Identifier: GPL-2.0-or-later
    -/*
    - * Device Tree support for Airoha SoCs
    - *
    - * Copyright (c) 2022 Felix Fietkau <nbd@nbd.name>
    - */
    -#include <asm/mach/arch.h>
    -
    -static const char * const airoha_board_dt_compat[] = {
    - "airoha,en7523",
    - NULL,
    -};
    -
    -DT_MACHINE_START(MEDIATEK_DT, "Airoha Cortex-A53 (Device Tree)")
    - .dt_compat = airoha_board_dt_compat,
    -MACHINE_END
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-09-12 00:17    [W:4.813 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site