From patchwork Sun Jan 24 15:37:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 8100691 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8FD8DBEEE5 for ; Sun, 24 Jan 2016 15:38:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A357720364 for ; Sun, 24 Jan 2016 15:38:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEF6920328 for ; Sun, 24 Jan 2016 15:38:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751711AbcAXPhw (ORCPT ); Sun, 24 Jan 2016 10:37:52 -0500 Received: from mail-lb0-f178.google.com ([209.85.217.178]:32897 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751608AbcAXPhu (ORCPT ); Sun, 24 Jan 2016 10:37:50 -0500 Received: by mail-lb0-f178.google.com with SMTP id x4so63218509lbm.0 for ; Sun, 24 Jan 2016 07:37:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=f81yxDZ/+7YL2NzIB/IqFKIAGV3HfKa2iazO1DJQ+hE=; b=gcMn9/E4MOdb+prTTl0Gmu7qLOiVGjrT3lnv191oGnjqKzZwp+Bb0ksoAbk8MIlrtw Okf98rVqkCfthdEl1TzOR5uMz//8uB1hJFhhCwj9iPYG9MaJXMO+VZURVOJoJMnu8yhE k/GLtFvS2TlYjqy1T1s40TCe8xhafoxZKNOGE7NrWCKTR48P8tY9fk8GoKF+x9Lz2V+f 17jRkhQvbteIXdtI99jr/8lHO2AwQd3yj399zHmtvBqh5ORgYMFRTJZMBtjdvyngH20W 3XF2xyHqBD/+5ko8GJwUojuwX+lsOrBk/8XsweYe5KI3oWngw5Edb8DzXR0c/tmcTijb svwQ== 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:mime-version :content-type:content-transfer-encoding; bh=f81yxDZ/+7YL2NzIB/IqFKIAGV3HfKa2iazO1DJQ+hE=; b=Qj80Ueh86vpHrEOdu5p6NjqPusQ2iVF9lMoG/E944Aueidnq+mKd8soS9lM3AlB/K3 0NGlP3r8L5kjRhPLI3MGMWJEXfYlW3dLqThOFXFV+GLmQc61Q+byqyKElUIl6gDlUOPd o4egeNpUOQrBrVq+xS9AuAj74nidmjW2iBac2nWjYfqawsewcLtgTUD5g9r6ZT28N3pz jEttdiFMKJY4VsXZm/OZHlcVCVtYebraxODkXNN8Qwngiq5CpkAlyt3C9HmH2bK+HfCd 1/dsQdA9npN1f1DmpDqV2UUHlr07REn1jPKxfSBI35VfvDMpUQ/5SdNBEJ4KWzjb49gk SJlw== X-Gm-Message-State: AG10YORSKmyd/eotob90RxFK4Kcfvxi4AM/T1rVKon97k0tAmCTLGgplTp7EJKRXWK9u6Q== X-Received: by 10.112.163.170 with SMTP id yj10mr967365lbb.141.1453649868995; Sun, 24 Jan 2016 07:37:48 -0800 (PST) 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 c192sm2174478lfb.16.2016.01.24.07.37.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jan 2016 07:37:48 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo , linux-wireless@vger.kernel.org Cc: Hauke Mehrtens , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH] bcma: add support for BCM47094 Date: Sun, 24 Jan 2016 16:37:33 +0100 Message-Id: <1453649853-11412-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's another SoC with 32 GPIOs and simplified watchdog handling. It was tested on D-Link DIR-885L. Signed-off-by: Rafa? Mi?ecki --- drivers/bcma/driver_chipcommon.c | 1 + drivers/bcma/driver_gpio.c | 1 + include/linux/bcma/bcma.h | 1 + 3 files changed, 3 insertions(+) diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c index bdb73d9..b0f44a2 100644 --- a/drivers/bcma/driver_chipcommon.c +++ b/drivers/bcma/driver_chipcommon.c @@ -197,6 +197,7 @@ u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks) struct bcma_bus *bus = cc->core->bus; if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4707 && + bus->chipinfo.id != BCMA_CHIP_ID_BCM47094 && bus->chipinfo.id != BCMA_CHIP_ID_BCM53018) bcma_core_set_clockmode(cc->core, ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC); diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c index 504899a7..77b0738f 100644 --- a/drivers/bcma/driver_gpio.c +++ b/drivers/bcma/driver_gpio.c @@ -197,6 +197,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) case BCMA_CHIP_ID_BCM4707: case BCMA_CHIP_ID_BCM5357: case BCMA_CHIP_ID_BCM53572: + case BCMA_CHIP_ID_BCM47094: chip->ngpio = 32; break; default: diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h index 991ebb4..0367c63 100644 --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h @@ -201,6 +201,7 @@ struct bcma_host_ops { #define BCMA_PKG_ID_BCM4707 1 #define BCMA_PKG_ID_BCM4708 2 #define BCMA_PKG_ID_BCM4709 0 +#define BCMA_CHIP_ID_BCM47094 53030 #define BCMA_CHIP_ID_BCM53018 53018 /* Board types (on PCI usually equals to the subsystem dev id) */