From patchwork Sat Apr 16 20:46:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 8862111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4A2379F3A0 for ; Sat, 16 Apr 2016 20:48:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 751CF201DD for ; Sat, 16 Apr 2016 20:48:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B3407201CE for ; Sat, 16 Apr 2016 20:48:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1arX78-0004Cd-AV; Sat, 16 Apr 2016 20:46:46 +0000 Received: from mail-ob0-x229.google.com ([2607:f8b0:4003:c01::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1arX76-00044e-AX for linux-arm-kernel@lists.infradead.org; Sat, 16 Apr 2016 20:46:44 +0000 Received: by mail-ob0-x229.google.com with SMTP id tz8so80206890obc.0 for ; Sat, 16 Apr 2016 13:46:23 -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; bh=wmJstHIczQ72X61LUWvNefY/GdO3raS/ErYUXp7eets=; b=tJwXTmPPZuXtJqpL1jO1XzEBK4eVxusogY+qP6h4TCNg49XVr81kXW9HTaTyBHrDYB BMxlZaaLNVimAKDlRPftXjvfh5Xq6HTATKRee0SFuQFJ27jHOVNNqQvQmvQVayFrauWS gE5a6CAR+To7FYd0VL/23M9KBsTnzkttXvY4iQlzLglFkIiuBBvu53GjsfPnDERWLLBq T1RgGCFNAxM263suAK25/HBzzAnjm09G0b7M7TCfySh8WA66U1eLCvS3A3juvUiRDKpI 2aHspL2S5DXIrXtPNsxiaLHD/mOCig7G8NbGg5AL3UO7E/LpwV4xM5YZdOaFE9fNVFLk t+gw== 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; bh=wmJstHIczQ72X61LUWvNefY/GdO3raS/ErYUXp7eets=; b=cFmb4v+5SyHuvBMTTX8Lqf+TsO+Nrj/mF1+y+9Q1h1qNjPqwpftcQGJVeXHS6xuJ2c EArECFif8WFhsnNC5FKYpCR+kfzSekC/CTWG2V+2c0aRQnsNK+x2fXtzcwKmsqGPl2Q2 46PBskiZNJuTGaT3F72/VU9gtTlKCKy/2EpmrFsWYUd+1hhebgfzlZUpaxTUzyPoB6YH ADgnfaWc8Ktc7a+so84sluXG1HepVA6iI/blK5ftecTwajC1Z0AouUosvDURyb4UcVCc OCF3B+r+U9qdaWG8A6LXot8dqykOwBHeENHKIi7vs+2QsbjakdJv0X1Ss4aftlCGf8bc rLZA== X-Gm-Message-State: AOPr4FV2Dvv/BDXPk9GHRO+uOcNLMVwW183sXPs7GcxWxNVE6Aac3PXlIvK0hNPBL5Mt1w== X-Received: by 10.60.52.35 with SMTP id q3mr14047301oeo.42.1460839583254; Sat, 16 Apr 2016 13:46:23 -0700 (PDT) Received: from bender.lan (ip68-5-39-32.oc.oc.cox.net. [68.5.39.32]) by smtp.gmail.com with ESMTPSA id vi2sm16725895obb.8.2016.04.16.13.46.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Apr 2016 13:46:22 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] bus: brcmstb_gisb: Rework dependencies Date: Sat, 16 Apr 2016 13:46:14 -0700 Message-Id: <1460839575-16869-1-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.5.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160416_134644_447145_6C982920 X-CRM114-Status: GOOD ( 12.58 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, Florian Fainelli , Russell King , Arnd Bergmann , Scott Branden , Suzuki K Poulose , Ray Jui , Punit Agrawal , open list , Masahiro Yamada , Chen-Yu Tsai , "open list:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..." , Olof Johansson MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 Do not have the machine Kconfig entry point need to select BRCMSTB_GISB_ARB, instead, just let it be default ARCH_BRCMSTB which is a better way to deal with this. While at it, also make it default BMIPS_GENERIC so the legacy MIPS-based STB platforms can benefit from the same thing. Signed-off-by: Florian Fainelli --- Changes in v2: - put conditional on the same line, do not use two default lines arch/arm/mach-bcm/Kconfig | 1 - drivers/bus/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index b95ea1135ef9..68ab6412392a 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -173,7 +173,6 @@ config ARCH_BRCMSTB select ARM_GIC select ARM_ERRATA_798181 if SMP select HAVE_ARM_ARCH_TIMER - select BRCMSTB_GISB_ARB select BRCMSTB_L2_IRQ select BCM7120_L2_IRQ select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index d4a3a3133da5..8807495e0efd 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -58,6 +58,7 @@ config ARM_CCN config BRCMSTB_GISB_ARB bool "Broadcom STB GISB bus arbiter" depends on ARM || MIPS + default ARCH_BRCMSTB || BMIPS_GENERIC help Driver for the Broadcom Set Top Box System-on-a-chip internal bus arbiter. This driver provides timeout and target abort error handling