diff --git a/arch/ppc/syslib/ppc_sys.c b/arch/ppc/syslib/ppc_sys.c --- a/arch/ppc/syslib/ppc_sys.c +++ b/arch/ppc/syslib/ppc_sys.c @@ -6,6 +6,7 @@ * Maintainer: Kumar Gala * * Copyright 2005 Freescale Semiconductor Inc. + * Copyright 2005 MontaVista, Inc. by Vitaly Bordug * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -33,10 +34,48 @@ void __init identify_ppc_sys_by_id(u32 i return; } -void __init identify_ppc_sys_by_name(char *name) +static int __init count_sys_specs(void) { - /* TODO */ - return; + int i = 0; + while (strcmp(ppc_sys_specs[i].ppc_sys_name,"")) + i++; + return i; +} + +static int __init find_chip_by_name_and_id(char *name, u32 id) +{ + int ret = -1; + unsigned int i = 0; + unsigned int j = 0; + unsigned int dups = 0; + + unsigned int matched[count_sys_specs()]; + + while (strcmp(ppc_sys_specs[i].ppc_sys_name,"")) { + if (!strcmp(ppc_sys_specs[i].ppc_sys_name, name)) + matched[j++]=i; + i++; + } + if(j != 0) + { + for(i = 0;i < j;i++) + { + if ((ppc_sys_specs[matched[i]].mask & id) == ppc_sys_specs[matched[i]].value) + { + ret = matched[i]; + dups++; + } + } + ret = (dups == 1) ? ret : (-1*dups); + } + return ret; +} + +void __init identify_ppc_sys_by_name_and_id(char* name, u32 id) +{ + int i = find_chip_by_name_and_id(name,id); + BUG_ON(i < 0); + cur_ppc_sys_spec = &ppc_sys_specs[i]; } /* Update all memory resources by paddr, call before platform_device_register */ diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h --- a/include/asm-ppc/ppc_sys.h +++ b/include/asm-ppc/ppc_sys.h @@ -51,7 +51,7 @@ extern struct ppc_sys_spec *cur_ppc_sys_ /* determine which specific SOC we are */ extern void identify_ppc_sys_by_id(u32 id) __init; -extern void identify_ppc_sys_by_name(char *name) __init; +extern void identify_ppc_sys_by_name_and_id(char *name, u32 id) __init; /* describes all devices that may exist in a given family of processors */ extern struct platform_device ppc_sys_platform_devices[];