ar71xx: fix Compex WPE72 detection
SVN-Revision: 30902
This commit is contained in:
parent
0f77d0b2ba
commit
0814e61841
4 changed files with 14 additions and 8 deletions
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
@@ -69,6 +70,34 @@ static const char * __init ath79_prom_fi
|
@@ -69,6 +70,37 @@ static const char * __init ath79_prom_fi
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,6 +26,9 @@
|
||||||
+ case DEVID_COMPEX_WP543:
|
+ case DEVID_COMPEX_WP543:
|
||||||
+ ath79_prom_append_cmdline("board", "WP543");
|
+ ath79_prom_append_cmdline("board", "WP543");
|
||||||
+ break;
|
+ break;
|
||||||
|
+ case DEVID_COMPEX_WPE72:
|
||||||
|
+ ath79_prom_append_cmdline("board", "WPE72");
|
||||||
|
+ break;
|
||||||
+ default:
|
+ default:
|
||||||
+ pr_warn("prom: unknown device id: %x\n", mylo->did);
|
+ pr_warn("prom: unknown device id: %x\n", mylo->did);
|
||||||
+ return 0;
|
+ return 0;
|
||||||
|
@ -43,7 +46,7 @@
|
||||||
static __init void ath79_prom_init_cmdline(int argc, char **argv)
|
static __init void ath79_prom_init_cmdline(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@@ -88,6 +117,9 @@ void __init prom_init(void)
|
@@ -88,6 +120,9 @@ void __init prom_init(void)
|
||||||
const char *env;
|
const char *env;
|
||||||
char **envp;
|
char **envp;
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
static int __init ath79_prom_init_myloader(void)
|
static int __init ath79_prom_init_myloader(void)
|
||||||
{
|
{
|
||||||
struct myloader_info *mylo;
|
struct myloader_info *mylo;
|
||||||
@@ -95,6 +124,8 @@ static int __init ath79_prom_init_myload
|
@@ -98,6 +127,8 @@ static int __init ath79_prom_init_myload
|
||||||
|
|
||||||
ath79_prom_append_cmdline("ethaddr", mac_buf);
|
ath79_prom_append_cmdline("ethaddr", mac_buf);
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,6 +133,9 @@ static __init void ath79_prom_init_cmdli
|
@@ -105,6 +136,9 @@ static __init void ath79_prom_init_cmdli
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
@@ -69,6 +70,34 @@ static const char * __init ath79_prom_fi
|
@@ -69,6 +70,37 @@ static const char * __init ath79_prom_fi
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,6 +26,9 @@
|
||||||
+ case DEVID_COMPEX_WP543:
|
+ case DEVID_COMPEX_WP543:
|
||||||
+ ath79_prom_append_cmdline("board", "WP543");
|
+ ath79_prom_append_cmdline("board", "WP543");
|
||||||
+ break;
|
+ break;
|
||||||
|
+ case DEVID_COMPEX_WPE72:
|
||||||
|
+ ath79_prom_append_cmdline("board", "WPE72");
|
||||||
|
+ break;
|
||||||
+ default:
|
+ default:
|
||||||
+ pr_warn("prom: unknown device id: %x\n", mylo->did);
|
+ pr_warn("prom: unknown device id: %x\n", mylo->did);
|
||||||
+ return 0;
|
+ return 0;
|
||||||
|
@ -43,7 +46,7 @@
|
||||||
static __init void ath79_prom_init_cmdline(int argc, char **argv)
|
static __init void ath79_prom_init_cmdline(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@@ -88,6 +117,9 @@ void __init prom_init(void)
|
@@ -88,6 +120,9 @@ void __init prom_init(void)
|
||||||
const char *env;
|
const char *env;
|
||||||
char **envp;
|
char **envp;
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
static int __init ath79_prom_init_myloader(void)
|
static int __init ath79_prom_init_myloader(void)
|
||||||
{
|
{
|
||||||
struct myloader_info *mylo;
|
struct myloader_info *mylo;
|
||||||
@@ -95,6 +124,8 @@ static int __init ath79_prom_init_myload
|
@@ -98,6 +127,8 @@ static int __init ath79_prom_init_myload
|
||||||
|
|
||||||
ath79_prom_append_cmdline("ethaddr", mac_buf);
|
ath79_prom_append_cmdline("ethaddr", mac_buf);
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,6 +133,9 @@ static __init void ath79_prom_init_cmdli
|
@@ -105,6 +136,9 @@ static __init void ath79_prom_init_cmdli
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue