From patchwork Wed Apr 13 18:17:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 8824931 Return-Path: X-Original-To: patchwork-linux-arm@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 C62A0C0553 for ; Wed, 13 Apr 2016 18:22:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 029F220272 for ; Wed, 13 Apr 2016 18:22:21 +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 2C09320034 for ; Wed, 13 Apr 2016 18:22:20 +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 1aqPPM-0000SX-4f; Wed, 13 Apr 2016 18:20:56 +0000 Received: from mail-pf0-x22a.google.com ([2607:f8b0:400e:c00::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aqPOj-00073p-4M for linux-arm-kernel@lists.infradead.org; Wed, 13 Apr 2016 18:20:19 +0000 Received: by mail-pf0-x22a.google.com with SMTP id n1so37417514pfn.2 for ; Wed, 13 Apr 2016 11:19:56 -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=3WhdQkNyDr0f94mo6TSlaNQD3amlDeddyHWapxshXIc=; b=AwuXYzn0GfEJOFNY0X0O7ghHG4umYkCdvxfMU3ek4dc/jOb800o/AmOjySuGjla/6V y2tSvPRL8qyu1JtB6fsGftU/JRFvTBGohHumSEzgUHu3+fjc9/95djq2v7vqQQKN/gKy SGPFsz+CV5SSx19qoYbJbbLjmC9p1hKTfWRFPJ7QvR2/CZiLfAW8S+WKiX6MLgS2mgCH tgpsdHZNxVTd6Ykzb64plm7/HsuHv2rOIahmhwnarS4dtzSzUYHEUDF24z7ZV9K5FM8R qoom4aH+JLV9aNrA0GskaJrrXQNV/Zot+fKVXl57DFpWe4zAuHaAcTVJ6GvxUt82Aezu b44Q== 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=3WhdQkNyDr0f94mo6TSlaNQD3amlDeddyHWapxshXIc=; b=cfcSSOnlA1fO6G2a59Fx1HnFBAzdVkOGxUAZg44CJBB4A4TmlLC5MXJ898gCpVq++y sbYcj6cPTHP4pv5j3zZgN103PeOf5MAyeTTx2ZcSKDUENpwtZDAYiYUEPk0oiVtA6xYi wI0DSB/1WMkwZbPcV4y8JN4YM1U0UFTAPsTwZcibJZAnTyUgg0nBKxcq2IUWCT4dy5cR /0HCuDwaKtYtOCanKbbwqraT6PBs9bGszX5joTalX7LMMI4oz9Z/wYr3RaaToxmhaXuh QH6qRKkMBIY5hZ99iyEzUkHeFuqaKqNe3gOwppV5Ev9RiFX1Lupa/vKF04nyyBvFKFpc UvOw== X-Gm-Message-State: AOPr4FXMab9bWD05DuZ9nn025d8sOlIrXgAIW5sshaQABCk57Tt4RxqpndDSwUBmAIlFtQ== X-Received: by 10.98.70.67 with SMTP id t64mr14915648pfa.110.1460571596398; Wed, 13 Apr 2016 11:19:56 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id 17sm52598818pfp.96.2016.04.13.11.19.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Apr 2016 11:19:55 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] bus: brcmstb_gisb: Rework dependencies Date: Wed, 13 Apr 2016 11:17:48 -0700 Message-Id: <1460571469-20201-1-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160413_112017_470160_60E62CE9 X-CRM114-Status: GOOD ( 13.06 ) 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: Mark Rutland , 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 --- arch/arm/mach-bcm/Kconfig | 1 - drivers/bus/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 7ef121472cdd..af10ff27a2ed 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..85c66e5028c1 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -58,6 +58,8 @@ config ARM_CCN config BRCMSTB_GISB_ARB bool "Broadcom STB GISB bus arbiter" depends on ARM || MIPS + default ARCH_BRCMSTB + default 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