From patchwork Fri Jul 8 15:14:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9221183 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B0276044F for ; Fri, 8 Jul 2016 15:14:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D81D28880 for ; Fri, 8 Jul 2016 15:14:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61EB828883; Fri, 8 Jul 2016 15:14:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0928228880 for ; Fri, 8 Jul 2016 15:14:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755307AbcGHPOd (ORCPT ); Fri, 8 Jul 2016 11:14:33 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:35896 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754881AbcGHPOb (ORCPT ); Fri, 8 Jul 2016 11:14:31 -0400 Received: by mail-lf0-f65.google.com with SMTP id a2so7691501lfe.3; Fri, 08 Jul 2016 08:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QKek5Nam1bncLxeOhhMh6S1Q2KiL2zOwg06KJywoovA=; b=SDRMk9ZajjD3w/3GDUomC1e0UDuVo09C8ed/a7n71MBZJxcrwPdNInJi5a4C4ALB9B 2DZ5Bv5Ad16Q6xefnhMxINarvYYyAwX/mKQUR8nru35eKkZCousGMqjdMgsavs9XZ5BC Bj7Frs8qJLtCJl4ux803fUGYnYig0HCIOn+pUFUkD1VSY5Sy5omuGLLCeK3QPuvWhMNJ 0Lm9HGPa5OccbTDYcNiMaN16hE0yHKo27mj9EPb8D1KTyZ69h/V33wQeWsKoVfZ4+2uF HZSvud2b/Xg2jeTO8J55yV7JWqhXv66tBRDuamz7KcBZO/jirseN2W1OE3vy38mU1Nwf KQTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QKek5Nam1bncLxeOhhMh6S1Q2KiL2zOwg06KJywoovA=; b=gGhGE1/sBY4D106gfeV9kZs1xi7A/RDar2XTo4lR1ittzzGpNtA2KnLImZbsSMbfN1 +a61jsBgZA5QZr4Zh9IwHw7px89rlphuTh44vVwaUqDyPLpv7sWfQEdd2RMHYC1jQdeY kwxwMCTvphgYK9XfM4wMK0WMJ8oKHZJLEcDuzaxvlb+litLxGa+KFZqVoghOCbtlP2LB YhBlrmxa2rE+EWWj9RBC4eBIn3MmmwyCkXdbLjVfnNui+YnS0kFaOfD9PFX0j/bbuLrk AQWYUnIJmk/KquzRKlcdHPy+Yjsftg+tRrtgunhAZTdRCpkAossLYaYkvU/11R+ewg9a 5h6g== X-Gm-Message-State: ALyK8tJ8lyw3BzDYfGyskHt4vSEN8pjBOkyEUkWSvMrj/mA/N6UewuzlCJQ4757MDQQGJA== X-Received: by 10.25.24.98 with SMTP id o95mr1407729lfi.23.1467990869131; Fri, 08 Jul 2016 08:14:29 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id f66sm936507lji.13.2016.07.08.08.14.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2016 08:14:28 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , linux-wireless@vger.kernel.org (open list:BROADCOM SPECIFIC AMBA DRIVER (BCMA)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2] bcma: define ChipCommon B MII registers Date: Fri, 8 Jul 2016 17:14:18 +0200 Message-Id: <1467990860-10663-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1467970091-8308-1-git-send-email-zajec5@gmail.com> References: <1467970091-8308-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We don't have access to datasheets to document all the bits but we can name these registers at least. Signed-off-by: Rafał Miłecki --- V2: Fix mistake in V1 that used BCMA_CCB_MII_MNG_CMD_DATA instead of BCMA_CCB_MII_MNG_CTL in the second bcma_wait_reg call. --- drivers/bcma/driver_chipcommon_b.c | 9 +++++---- include/linux/bcma/bcma_driver_chipcommon.h | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/bcma/driver_chipcommon_b.c b/drivers/bcma/driver_chipcommon_b.c index c20b5f4..57f10b5 100644 --- a/drivers/bcma/driver_chipcommon_b.c +++ b/drivers/bcma/driver_chipcommon_b.c @@ -33,11 +33,12 @@ static bool bcma_wait_reg(struct bcma_bus *bus, void __iomem *addr, u32 mask, void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value) { struct bcma_bus *bus = ccb->core->bus; + void __iomem *mii = ccb->mii; - writel(offset, ccb->mii + 0x00); - bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100); - writel(value, ccb->mii + 0x04); - bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100); + writel(offset, mii + BCMA_CCB_MII_MNG_CTL); + bcma_wait_reg(bus, mii + BCMA_CCB_MII_MNG_CTL, 0x0100, 0x0000, 100); + writel(value, mii + BCMA_CCB_MII_MNG_CMD_DATA); + bcma_wait_reg(bus, mii + BCMA_CCB_MII_MNG_CTL, 0x0100, 0x0000, 100); } EXPORT_SYMBOL_GPL(bcma_chipco_b_mii_write); diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index a5ac2ca..b20e3d5 100644 --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h @@ -504,6 +504,9 @@ #define BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_MASK 0x1ff00000 #define BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_SHIFT 20 +#define BCMA_CCB_MII_MNG_CTL 0x0000 +#define BCMA_CCB_MII_MNG_CMD_DATA 0x0004 + /* BCM4331 ChipControl numbers. */ #define BCMA_CHIPCTL_4331_BT_COEXIST BIT(0) /* 0 disable */ #define BCMA_CHIPCTL_4331_SECI BIT(1) /* 0 SECI is disabled (JATG functional) */