|
|
@ -398,6 +398,7 @@ |
|
|
|
+static struct cambria_board_info * __init cambria_find_board_info(char *model)
|
|
|
|
+static struct cambria_board_info * __init cambria_find_board_info(char *model)
|
|
|
|
+{
|
|
|
|
+{
|
|
|
|
+ int i;
|
|
|
|
+ int i;
|
|
|
|
|
|
|
|
+ model[6] = '\0';
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(cambria_boards); i++) {
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(cambria_boards); i++) {
|
|
|
|
+ struct cambria_board_info *info = &cambria_boards[i];
|
|
|
|
+ struct cambria_board_info *info = &cambria_boards[i];
|
|
|
@ -413,7 +414,7 @@ |
|
|
|
+static void at24_setup(struct memory_accessor *mem_acc, void *context)
|
|
|
|
+static void at24_setup(struct memory_accessor *mem_acc, void *context)
|
|
|
|
+{
|
|
|
|
+{
|
|
|
|
+ char mac_addr[ETH_ALEN];
|
|
|
|
+ char mac_addr[ETH_ALEN];
|
|
|
|
+ char model[6];
|
|
|
|
+ char model[7];
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ at24_mem_acc = mem_acc;
|
|
|
|
+ at24_mem_acc = mem_acc;
|
|
|
|
+
|
|
|
|
+
|
|
|
@ -421,7 +422,6 @@ |
|
|
|
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
|
|
|
|
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
|
|
|
|
+ memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN);
|
|
|
|
+ memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
|
|
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
|
|
|
|
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
|
|
|
|
+ memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN);
|
|
|
|
+ memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|