From patchwork Sun Oct 25 18:32:43 2015 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: 7483991 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 C7AAFBEEA4 for ; Sun, 25 Oct 2015 18:33:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFC2420637 for ; Sun, 25 Oct 2015 18:33:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDAAF2062A for ; Sun, 25 Oct 2015 18:33:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969AbbJYSdU (ORCPT ); Sun, 25 Oct 2015 14:33:20 -0400 Received: from mail-lf0-f46.google.com ([209.85.215.46]:33187 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751701AbbJYScz (ORCPT ); Sun, 25 Oct 2015 14:32:55 -0400 Received: by lffv3 with SMTP id v3so126605489lff.0 for ; Sun, 25 Oct 2015 11:32:54 -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-type:content-transfer-encoding; bh=p9gcGXbPAozFtTeO9QYxydu6UgEkTY+tnMynGk/BZ00=; b=BeQUqSWmA/wUxKQbCXmB9uYii8O1A06ql9yz/LxJWoQOJjee9DlS4CWNdwmrjHLzRu wFa3QiEP4sdCo+MVcBmCRyqzc9C3Ys7EfSGplZ7/r3ZXaSs6SN5xw5mICNJRULH4P4ZE pbn0jm4JR+U8BsQzKg+85Hv7FCrwoagFo7tXnIvmXZFZ+HKNiDRYJeOtqEIG+zrENL7i vZ0Qmz9FAQflr7ZBMqvFJOlyyE/YNlHUR2zwu5oD9t7/rR3IBhrDuaWRkpVvQV/g3nqf iANBHL1DOuxrvgVY+JZVUmLRWp1pCWh3w5Wq1Su0gJY11aCj+ZfxSFf+xNbbrS3C7C/V 2ytA== X-Received: by 10.112.136.39 with SMTP id px7mr15350107lbb.77.1445797974108; Sun, 25 Oct 2015 11:32:54 -0700 (PDT) Received: from linux-tdhb.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id k1sm5214933lbc.28.2015.10.25.11.32.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Oct 2015 11:32:53 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo , linux-wireless@vger.kernel.org Cc: =?UTF-8?q?Michael=20B=C3=BCsch?= , Hauke Mehrtens , Larry Finger , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 2/2] ssb: add Kconfig entry for compiling SoC related code Date: Sun, 25 Oct 2015 19:32:43 +0100 Message-Id: <1445797963-5968-2-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1445797963-5968-1-git-send-email-zajec5@gmail.com> References: <1445797963-5968-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-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 This allows saving a little of space when not using ssb on Broadcom SoC. Signed-off-by: Rafa? Mi?ecki Acked-by: Michael Buesch --- arch/mips/bcm47xx/Kconfig | 1 + drivers/ssb/Kconfig | 9 +++++++++ drivers/ssb/Makefile | 2 +- drivers/ssb/main.c | 2 ++ drivers/ssb/ssb_private.h | 2 ++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig index 51ed599..e970fd9 100644 --- a/arch/mips/bcm47xx/Kconfig +++ b/arch/mips/bcm47xx/Kconfig @@ -4,6 +4,7 @@ config BCM47XX_SSB bool "SSB Support for Broadcom BCM47XX" select SYS_HAS_CPU_BMIPS32_3300 select SSB + select SSB_HOST_SOC select SSB_DRIVER_MIPS select SSB_DRIVER_EXTIF select SSB_EMBEDDED diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig index f0d22cd..149214b 100644 --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig @@ -80,6 +80,15 @@ config SSB_SDIOHOST If unsure, say N +config SSB_HOST_SOC + bool "Support for SSB bus on SoC" + depends on SSB + help + Host interface for a SSB directly mapped into memory. This is + for some Broadcom SoCs from the BCM47xx and BCM53xx lines. + + If unsure, say N + config SSB_SILENT bool "No SSB kernel messages" depends on SSB && EXPERT diff --git a/drivers/ssb/Makefile b/drivers/ssb/Makefile index 30194c5..64a0968 100644 --- a/drivers/ssb/Makefile +++ b/drivers/ssb/Makefile @@ -7,7 +7,7 @@ ssb-$(CONFIG_SSB_SPROM) += sprom.o ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o ssb-$(CONFIG_SSB_PCMCIAHOST) += pcmcia.o bridge_pcmcia_80211.o ssb-$(CONFIG_SSB_SDIOHOST) += sdio.o -ssb-y += host_soc.o +ssb-$(CONFIG_SSB_HOST_SOC) += host_soc.o # built-in drivers ssb-y += driver_chipcommon.o diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index bea823e..5d1e9a0 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -761,6 +761,7 @@ int ssb_bus_sdiobus_register(struct ssb_bus *bus, struct sdio_func *func, EXPORT_SYMBOL(ssb_bus_sdiobus_register); #endif /* CONFIG_SSB_PCMCIAHOST */ +#ifdef CONFIG_SSB_HOST_SOC int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr, ssb_invariants_func_t get_invariants) { @@ -777,6 +778,7 @@ int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr, return err; } +#endif int __ssb_driver_register(struct ssb_driver *drv, struct module *owner) { diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h index 0a756c2..15bfd5c 100644 --- a/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h @@ -161,7 +161,9 @@ static inline int ssb_sdio_init(struct ssb_bus *bus) * host_soc.c **************************************************/ +#ifdef CONFIG_SSB_HOST_SOC extern const struct ssb_bus_ops ssb_host_soc_ops; +#endif /* scan.c */ extern const char *ssb_core_name(u16 coreid);