From patchwork Mon Mar 7 15:49:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 85761 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 34F19B70E8 for ; Tue, 8 Mar 2011 02:50:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754554Ab1CGPuX (ORCPT ); Mon, 7 Mar 2011 10:50:23 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:46573 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754543Ab1CGPuT (ORCPT ); Mon, 7 Mar 2011 10:50:19 -0500 Received: by wyg36 with SMTP id 36so4271418wyg.19 for ; Mon, 07 Mar 2011 07:50:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer; bh=sBd4fepuRXq/wy6G8Ps4OBzHr6Saxods/hRH+GT5+DA=; b=MpbCkVifTjanJc4dCCKmEPkASXwgi7QXgugwHdvaEDja8KGgRGMIGx8m//jowk6oMl VRU5LVG3zC1S6Ge+/q2tI8x//Y0zRXfoQShCGL8wxEPVCHlLTsxjhhzrzT4x52bi2Ob6 MgVVi19f25s1V91vcVPju59yJAWGxEApgiqmw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=u7eitYYIfrIpY+a5eGV43cZGrc9qO9HVOHkPpCT2zGiL2OCiqXBxDG75FS/ncLXH7p zAxfIQiOJmHqhux0I+CCTAYX9MhWFAnmxqGr5BYBseDmWNJsTg1t0b6Fy1nSz0lv9bdi GBNiT8K3HOM3AiQ3KNnOHgnjmSvllWeOQwTBI= Received: by 10.227.177.204 with SMTP id bj12mr3607139wbb.195.1299513018228; Mon, 07 Mar 2011 07:50:18 -0800 (PST) Received: from macbook.be.48ers.dk (191.207-78-194.adsl-fix.skynet.be [194.78.207.191]) by mx.google.com with ESMTPS id bd8sm2247250wbb.1.2011.03.07.07.50.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 Mar 2011 07:50:16 -0800 (PST) Received: by macbook.be.48ers.dk (Postfix, from userid 1000) id 4A05AC3CCE; Mon, 7 Mar 2011 16:50:06 +0100 (CET) From: Peter Korsgaard To: davem@davemloft.net, buytenh@wantstofly.org, netdev@vger.kernel.org Cc: Peter Korsgaard Subject: [PATCH] dsa/mv88e6060: support nonzero mii base address Date: Mon, 7 Mar 2011 16:49:47 +0100 Message-Id: <1299512987-11152-1-git-send-email-jacmet@sunsite.dk> X-Mailer: git-send-email 1.7.2.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The mv88e6060 uses either the lower 16 or upper 16 mii addresses, depending on the value of the EE_CLK/ADDR4 pin. Support both configurations by using the sw_addr setting as base address. Signed-off-by: Peter Korsgaard Acked-by: Lennert Buytenhek --- net/dsa/mv88e6060.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net/dsa/mv88e6060.c b/net/dsa/mv88e6060.c index 83277f4..8f4ff5a 100644 --- a/net/dsa/mv88e6060.c +++ b/net/dsa/mv88e6060.c @@ -18,7 +18,7 @@ static int reg_read(struct dsa_switch *ds, int addr, int reg) { - return mdiobus_read(ds->master_mii_bus, addr, reg); + return mdiobus_read(ds->master_mii_bus, ds->pd->sw_addr + addr, reg); } #define REG_READ(addr, reg) \ @@ -34,7 +34,8 @@ static int reg_read(struct dsa_switch *ds, int addr, int reg) static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val) { - return mdiobus_write(ds->master_mii_bus, addr, reg, val); + return mdiobus_write(ds->master_mii_bus, ds->pd->sw_addr + addr, + reg, val); } #define REG_WRITE(addr, reg, val) \ @@ -50,7 +51,7 @@ static char *mv88e6060_probe(struct mii_bus *bus, int sw_addr) { int ret; - ret = mdiobus_read(bus, REG_PORT(0), 0x03); + ret = mdiobus_read(bus, sw_addr + REG_PORT(0), 0x03); if (ret >= 0) { ret &= 0xfff0; if (ret == 0x0600)