From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wolfgang Grandegger <wg@grandegger.com>
Date: Fri, 11 Nov 2011 13:33:00 +0100
Subject: [U-Boot] [PATCH 1/3] smsc95xx: Fix MAC address programming
In-Reply-To: <201111111204.24639.marek.vasut@gmail.com>
References: <1321009198-20695-1-git-send-email-wg@denx.de>	<1321009198-20695-2-git-send-email-wg@denx.de>
	<201111111204.24639.marek.vasut@gmail.com>
Message-ID: <4EBD15FC.9070301@grandegger.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 11/11/2011 12:04 PM, Marek Vasut wrote:
>> Commit 79ad54400932d6484178a372fb3b659e3437473b broke the MAC
>> address programming. Fix this by using the method from Linux'
>> smsc95xx_set_mac_address().
>>
>> Signed-off-by: Wolfgang Grandegger <wg@denx.de>
>> Cc: Marek Vasut <marek.vasut@gmail.com>
>> Cc: Simon Glass <sjg@chromium.org>
>> ---
>>  drivers/usb/eth/smsc95xx.c |    7 ++++---
>>  1 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
>> index 7ee4f87..eb529f1 100644
>> --- a/drivers/usb/eth/smsc95xx.c
>> +++ b/drivers/usb/eth/smsc95xx.c
>> @@ -372,13 +372,14 @@ static int smsc95xx_init_mac_address(struct
>> eth_device *eth, static int smsc95xx_write_hwaddr(struct eth_device *eth)
>>  {
>>  	struct ueth_data *dev = (struct ueth_data *)eth->priv;
>> -	u32 addr_lo, addr_hi;
>> +	u32 addr_lo = eth->enetaddr[0] | eth->enetaddr[1] << 8 |
>> +		eth->enetaddr[2] << 16 | eth->enetaddr[3] << 24;
>> +	u32 addr_hi = eth->enetaddr[4] | eth->enetaddr[5] << 8;
>>  	int ret;
>>
>>  	/* set hardware address */
>>  	debug("** %s()\n", __func__);
>> -	addr_lo = cpu_to_le32(*eth->enetaddr);
>> -	addr_hi = cpu_to_le16(*((u16 *)(eth->enetaddr + 4)));
>> +
>>  	ret = smsc95xx_write_reg(dev, ADDRL, addr_lo);
>>  	if (ret < 0) {
>>  		debug("Failed to write ADDRL: %d\n", ret);
> 
> Hey,
> 
> didn't Mike Frysinger send similar patch yesterday? Also, do you have the 

Ah, I obviously missed that.

> hardware? If so, that's good, we know you can provide tested fix.

Well, yes, I know somebody who has smsc95xx hardware ;-).

> Mike, are you good with using this fix instead or can you two negotiate?

Let's await Mike's answer (now on CC as well). I need to re-send the
series anyway due to a stupid typo.

Wolfgang