Skip to content

Commit 3f47810

Browse files
andy2_kuoAndroid Partner Code Review
authored andcommitted
Revert "arm: tegra: kai: read mac address from board eeprom"
This reverts commit 8f9962b. Change-Id: I529de950411d55931f06ad8b7d4b80c9e6d71c26
1 parent 5c6426d commit 3f47810

File tree

5 files changed

+0
-99
lines changed

5 files changed

+0
-99
lines changed

arch/arm/mach-tegra/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ obj-${CONFIG_MACH_GROUPER} += board-grouper-power.o
202202
obj-${CONFIG_MACH_GROUPER} += board-grouper-power-ti.o
203203
obj-${CONFIG_MACH_GROUPER} += board-grouper-sdhci.o
204204
obj-${CONFIG_MACH_GROUPER} += board-grouper-sensors.o
205-
obj-y += eeprom-wifi-mac.o
206205

207206
obj-${CONFIG_TEGRA_BB_XMM_POWER} += baseband-xmm-power.o
208207
obj-${CONFIG_TEGRA_BB_XMM_POWER2} += baseband-xmm-power2.o

arch/arm/mach-tegra/board-grouper.c

100755100644
Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#include <linux/smb347-charger.h>
4242
#include <linux/max17048_battery.h>
4343
#include <linux/leds.h>
44-
#include <linux/i2c/at24.h>
4544

4645
#include <mach/clk.h>
4746
#include <mach/iomap.h>
@@ -276,26 +275,13 @@ struct max17048_battery_model max17048_mdata = {
276275
.ocvtest = 55600,
277276
};
278277

279-
280-
static struct at24_platform_data eeprom_info = {
281-
.byte_len = (256*1024)/8,
282-
.page_size = 64,
283-
.flags = AT24_FLAG_ADDR16,
284-
.setup = get_mac_addr,
285-
};
286-
287278
static struct i2c_board_info grouper_i2c4_max17048_board_info[] = {
288279
{
289280
I2C_BOARD_INFO("max17048", 0x36),
290281
.platform_data = &max17048_mdata,
291282
},
292283
};
293284

294-
static struct i2c_board_info grouper_eeprom_mac_add = {
295-
I2C_BOARD_INFO("at24", 0x56),
296-
.platform_data = &eeprom_info,
297-
};
298-
299285
static struct i2c_board_info cardhu_i2c4_bq27541_board_info[] = {
300286
{
301287
I2C_BOARD_INFO("bq27541-battery", 0x55),
@@ -342,8 +328,6 @@ static void grouper_i2c_init(void)
342328

343329
i2c_register_board_info(4, &rt5640_board_info, 1);
344330

345-
i2c_register_board_info(4, &grouper_eeprom_mac_add, 1);
346-
347331
i2c_register_board_info(4, cardhu_i2c4_bq27541_board_info,
348332
ARRAY_SIZE(cardhu_i2c4_bq27541_board_info));
349333

arch/arm/mach-tegra/board-kai.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#include <linux/smb349-charger.h>
4343
#include <linux/max17048_battery.h>
4444
#include <linux/leds.h>
45-
#include <linux/i2c/at24.h>
4645

4746
#include <mach/clk.h>
4847
#include <mach/iomap.h>
@@ -272,26 +271,13 @@ struct max17048_battery_model max17048_mdata = {
272271
.ocvtest = 55600,
273272
};
274273

275-
276-
static struct at24_platform_data eeprom_info = {
277-
.byte_len = (256*1024)/8,
278-
.page_size = 64,
279-
.flags = AT24_FLAG_ADDR16,
280-
.setup = get_mac_addr,
281-
};
282-
283274
static struct i2c_board_info kai_i2c4_max17048_board_info[] = {
284275
{
285276
I2C_BOARD_INFO("max17048", 0x36),
286277
.platform_data = &max17048_mdata,
287278
},
288279
};
289280

290-
static struct i2c_board_info kai_eeprom_mac_add = {
291-
I2C_BOARD_INFO("at24", 0x56),
292-
.platform_data = &eeprom_info,
293-
};
294-
295281
static struct regulator_consumer_supply smb349_vbus_supply[] = {
296282
REGULATOR_SUPPLY("usb_bat_chg", NULL),
297283
};
@@ -346,8 +332,6 @@ static void kai_i2c_init(void)
346332
else
347333
i2c_register_board_info(4, &rt5639_board_info, 1);
348334

349-
i2c_register_board_info(4, &kai_eeprom_mac_add, 1);
350-
351335
i2c_register_board_info(4, kai_i2c4_max17048_board_info,
352336
ARRAY_SIZE(kai_i2c4_max17048_board_info));
353337

arch/arm/mach-tegra/board.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
struct memory_accessor;
7171

7272
void tegra_assert_system_reset(char mode, const char *cmd);
73-
void get_mac_addr(struct memory_accessor *, void *);
7473

7574
void __init tegra_init_early(void);
7675
void __init tegra_mc_init(void);

arch/arm/mach-tegra/eeprom-wifi-mac.c

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)