From efea05644c867a9509591087f00e8773c2baebb7 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Wed, 30 Oct 2019 12:37:19 +0900 Subject: [PATCH] ODROID-COMMON: refactoring board macro functions Signed-off-by: Dongjin Kim Change-Id: Icf0266d5123a649b9707650faeb04953b34bacc4 --- arch/arm64/kernel/cpuinfo.c | 2 ++ arch/arm64/kernel/setup.c | 2 ++ include/linux/platform_data/board_odroid.h | 15 +++++++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index b7f5d9973f52..70503ebcc42c 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -203,8 +203,10 @@ static int c_show(struct seq_file *m, void *v) seq_puts(m, "\n"); #endif #endif +#ifdef CONFIG_ARCH_MESON64_ODROID_COMMON seq_printf(m, "Hardware\t: %s\n", machine_name); seq_printf(m, "Revision\t: %04x\n\n", system_rev); +#endif return 0; } diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 5b0db641326c..d6d2c1517280 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -219,7 +219,9 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) name = of_flat_dt_get_machine_name(); if (!name) return; +#ifdef CONFIG_ARCH_MESON64_ODROID_COMMON machine_name = name; +#endif pr_info("Machine model: %s\n", name); dump_stack_set_arch_desc("%s (DT)", name); diff --git a/include/linux/platform_data/board_odroid.h b/include/linux/platform_data/board_odroid.h index ca2e8a99b19f..6fca5e2c415f 100644 --- a/include/linux/platform_data/board_odroid.h +++ b/include/linux/platform_data/board_odroid.h @@ -6,11 +6,18 @@ #define BOARD_ODROIDN2 0x09221000 #define BOARD_ODROIDC4 0x09051000 +#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) + extern u32 odroid_model(void); - -#define board_is_odroidn2() (odroid_model() == BOARD_ODROIDN2) -#define board_is_odroidc4() (odroid_model() == BOARD_ODROIDC4) - extern bool odroid_amlogic_usb3(void); +#define __board_is_odroid(x) (odroid_model() == (x)) +#else +#define __board_is_odroid(x) false +#define odroid_amlogic_usb3(void) false +#endif + +#define board_is_odroidn2() __board_is_odroid(BOARD_ODROIDN2) +#define board_is_odroidc4() __board_is_odroid(BOARD_ODROIDC4) + #endif