Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc45815 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

MIPS: TXx9: Fix RBTX4939 ethernet address initialization 



Fix location of ethernet adddress when booted from external ROM.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e946217e

arch/mips/txx9/rbtx4939/setup.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -308,16 +308,22 @@ static void __init rbtx4939_device_init(void) 
#if defined(CONFIG_TC35815) || defined(CONFIG_TC35815_MODULE)

#if defined(CONFIG_TC35815) || defined(CONFIG_TC35815_MODULE)

	int i, j;

	int i, j;

	unsigned char ethaddr[2][6];

	unsigned char ethaddr[2][6];

	u8 bdipsw = readb(rbtx4939_bdipsw_addr) & 0x0f;



	for (i = 0; i < 2; i++) {

	for (i = 0; i < 2; i++) {

		unsigned long area = CKSEG1 + 0x1fff0000 + (i * 0x10);

		unsigned long area = CKSEG1 + 0x1fff0000 + (i * 0x10);

		if (readb(rbtx4939_bdipsw_addr) & 8) {

		if (bdipsw == 0)

			memcpy(ethaddr[i], (void *)area, 6);

		else {

			u16 buf[3];

			u16 buf[3];

			if (bdipsw & 8)

				area -= 0x03000000;

				area -= 0x03000000;

			else

				area -= 0x01000000;

			for (j = 0; j < 3; j++)

			for (j = 0; j < 3; j++)

				buf[j] = le16_to_cpup((u16 *)(area + j * 2));

				buf[j] = le16_to_cpup((u16 *)(area + j * 2));

			memcpy(ethaddr[i], buf, 6);

			memcpy(ethaddr[i], buf, 6);

		} else

		}

			memcpy(ethaddr[i], (void *)area, 6);

	}

	}

	tx4939_ethaddr_init(ethaddr[0], ethaddr[1]);

	tx4939_ethaddr_init(ethaddr[0], ethaddr[1]);

#endif

#endif