From f48ff21aca7f440de7ce936fb7da5f4cc7c9071e Mon Sep 17 00:00:00 2001 From: Enric Balletbo i Serra Date: Wed, 25 May 2011 09:53:41 +0200 Subject: [PATCH] OMAP3: Move get_cpu_family() function to not duplicate code The get_cpu_family() function is implemented by various boards, this patch moves this function to a common place to not duplicate code. board/igep00x0/igep00x0.c :129:u32 get_cpu_family(void) board/overo/overo.c :164:u32 get_cpu_family(void) Signed-off-by: Enric Balletbo i Serra Signed-off-by: Anand Gadiyar --- board/igep00x0/igep00x0.c | 30 ------------------------------ board/overo/overo.c | 30 ------------------------------ cpu/omap3/sys_info.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 60 deletions(-) diff --git a/board/igep00x0/igep00x0.c b/board/igep00x0/igep00x0.c index bb45637..ab90606 100644 --- a/board/igep00x0/igep00x0.c +++ b/board/igep00x0/igep00x0.c @@ -123,36 +123,6 @@ u32 wait_on_value(u32 read_bit_mask, u32 match_value, u32 read_addr, u32 bound) } while (1); } -/****************************************** - * get_cpu_family(void) - extract cpu info - ******************************************/ -u32 get_cpu_family(void) -{ - u16 hawkeye; - u32 cpu_family; - u32 cpuid = get_cpu_id(); - - if (cpuid == 0) - return CPU_OMAP34XX; - - hawkeye = (cpuid >> HAWKEYE_SHIFT) & 0xffff; - switch (hawkeye) { - case HAWKEYE_OMAP34XX: - cpu_family = CPU_OMAP34XX; - break; - case HAWKEYE_AM35XX: - cpu_family = CPU_AM35XX; - break; - case HAWKEYE_OMAP36XX: - cpu_family = CPU_OMAP36XX; - break; - default: - cpu_family = CPU_OMAP34XX; - } - - return cpu_family; -} - /****************************************** * get_cpu_rev(void) - extract version info ******************************************/ diff --git a/board/overo/overo.c b/board/overo/overo.c index 165c503..bd03b55 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -158,36 +158,6 @@ u32 get_mem_type(void) } } -/****************************************** - * get_cpu_family(void) - extract cpu info - ******************************************/ -u32 get_cpu_family(void) -{ - u16 hawkeye; - u32 cpu_family; - u32 cpuid = get_cpu_id(); - - if (cpuid == 0) - return CPU_OMAP34XX; - - hawkeye = (cpuid >> HAWKEYE_SHIFT) & 0xffff; - switch (hawkeye) { - case HAWKEYE_OMAP34XX: - cpu_family = CPU_OMAP34XX; - break; - case HAWKEYE_AM35XX: - cpu_family = CPU_AM35XX; - break; - case HAWKEYE_OMAP36XX: - cpu_family = CPU_OMAP36XX; - break; - default: - cpu_family = CPU_OMAP34XX; - } - - return cpu_family; -} - /****************************************** * get_cpu_rev(void) - extract version info ******************************************/ diff --git a/cpu/omap3/sys_info.c b/cpu/omap3/sys_info.c index 8422b4e..ef18d60 100644 --- a/cpu/omap3/sys_info.c +++ b/cpu/omap3/sys_info.c @@ -64,3 +64,33 @@ u32 get_cpu_id(void) return cpuid; } + +/* + * get_cpu_family(void): extract cpu info + */ +u32 get_cpu_family(void) +{ + u16 hawkeye; + u32 cpu_family; + u32 cpuid = get_cpu_id(); + + if (cpuid == 0) + return CPU_OMAP34XX; + + hawkeye = (cpuid >> HAWKEYE_SHIFT) & 0xffff; + switch (hawkeye) { + case HAWKEYE_OMAP34XX: + cpu_family = CPU_OMAP34XX; + break; + case HAWKEYE_AM35XX: + cpu_family = CPU_AM35XX; + break; + case HAWKEYE_OMAP36XX: + cpu_family = CPU_OMAP36XX; + break; + default: + cpu_family = CPU_OMAP34XX; + } + + return cpu_family; +} -- 2.39.5