From patchwork Sun Dec 29 17:25:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 11312317 X-Patchwork-Delegate: paulburton@kernel.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6AF13138C for ; Sun, 29 Dec 2019 18:03:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49AAD206DB for ; Sun, 29 Dec 2019 18:03:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642607; bh=aZoWN10Nz1jaXQcyMMAW7mBPOrCR5zcxUc8nfzrtGUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=d8cZU6I9BenFj9ctX3PrqaOvb+vQPfO2VLxiDmg4j0ULQYQAGn6NjREX8HFYzrBxU t+E8tWe3rzZJdm5u5RsaMNqozXUYo54qTJ4jeahCX/S3rkXzSLcw5J46l+Lz3dFR/N zJGxRdIjk8tNItiBLSFPz7efwKQJahM6puf9PIcs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732498AbfL2Rxf (ORCPT ); Sun, 29 Dec 2019 12:53:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:40656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732496AbfL2Rxf (ORCPT ); Sun, 29 Dec 2019 12:53:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E290206DB; Sun, 29 Dec 2019 17:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642014; bh=aZoWN10Nz1jaXQcyMMAW7mBPOrCR5zcxUc8nfzrtGUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lZSh7JnnpPBJl6GoZJUFkEvweZCguN4P8QnOkMz1lGQaoTYxRg8gdDwn/B2MdN5rm wwOPJiXSKkFM8EMRQO6BHCMeEFUdDTeqF1oNw+uCT/melK34TRknHwON+wklSAz3Gb S8CS5WAUbM9wZ/IKIG9VpO/cCpYB3SvwrE11n1oI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hauke Mehrtens , ralf@linux-mips.org, jhogan@kernel.org, john@phrozen.org, NeilBrown , linux-mips@vger.kernel.org, Sergio Paracuellos , Sasha Levin Subject: [PATCH 5.4 306/434] MIPS: ralink: enable PCI support only if driver for mt7621 SoC is selected Date: Sun, 29 Dec 2019 18:25:59 +0100 Message-Id: <20191229172722.278894483@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Sergio Paracuellos [ Upstream commit 3b2fa0c92686562ac0b8cf00c0326a45814f8e18 ] Some versions of SoC MT7621 have three PCI express hosts. Some boards make use of those PCI through the staging driver mt7621-pci. Recently PCI support has been removed from MT7621 Soc kernel configuration due to a build error. This makes imposible to compile staging driver and produces a regression for gnubee based boards. Enable support for PCI again but enable it only if staging mt7621-pci driver is selected. Fixes: c4d48cf5e2f0 ("MIPS: ralink: deactivate PCI support for SOC_MT7621") Cc: Hauke Mehrtens Cc: ralf@linux-mips.org Cc: jhogan@kernel.org Cc: john@phrozen.org Cc: NeilBrown Cc: linux-mips@vger.kernel.org Signed-off-by: Sergio Paracuellos Link: https://lore.kernel.org/r/20191019081233.7337-1-sergio.paracuellos@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- arch/mips/ralink/Kconfig | 1 + drivers/staging/mt7621-pci/Kconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig index 1434fa60f3db..94e9ce994494 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -51,6 +51,7 @@ choice select MIPS_GIC select COMMON_CLK select CLKSRC_MIPS_GIC + select HAVE_PCI if PCI_MT7621 endchoice choice diff --git a/drivers/staging/mt7621-pci/Kconfig b/drivers/staging/mt7621-pci/Kconfig index af928b75a940..ce58042f2f21 100644 --- a/drivers/staging/mt7621-pci/Kconfig +++ b/drivers/staging/mt7621-pci/Kconfig @@ -2,7 +2,6 @@ config PCI_MT7621 tristate "MediaTek MT7621 PCI Controller" depends on RALINK - depends on PCI select PCI_DRIVERS_GENERIC help This selects a driver for the MediaTek MT7621 PCI Controller.