From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4E90C432C0 for ; Fri, 22 Nov 2019 10:49:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B30372072E for ; Fri, 22 Nov 2019 10:49:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419753; bh=JZdrSf66McTwmVPyGVXRXf/zpqf72r7V9/3MkaYOAbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EszxF2gJpWkQ1RATYZLKte+RWjGG3jnkDcgEfLR5EIy5iM7r+22xhXhaeS36svROJ E4/W1IfaAJHq0EuhA5V6mGPrrFn/EgKtWVn0TVNqoz9DFENd36HnwEUtW46ryMXPvC KPf9zkUN/RJlnkg9F15OdaeuKFHY6zzdqrZjqmcg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729640AbfKVKtM (ORCPT ); Fri, 22 Nov 2019 05:49:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:58260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729995AbfKVKtG (ORCPT ); Fri, 22 Nov 2019 05:49:06 -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 2A51520715; Fri, 22 Nov 2019 10:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419744; bh=JZdrSf66McTwmVPyGVXRXf/zpqf72r7V9/3MkaYOAbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hszOb+BKfTOLAcdM9CKoSpzqOVQmVCC2XgZOfnT0w/ktvV4YZEJaY59SXQN11OZ2M wazEiElggdPRhkhi8i648RUBeG6kW0pDxNdBvPlNbx+6FCeBXgn2m09IzbfaZngaru 7kUVDHF50cY1VwgFhk8n3Ys0woJ+Apl+Iqfw4Usk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , Jens Axboe , Sasha Levin Subject: [PATCH 4.9 163/222] ata: ahci_brcm: Allow using driver or DSL SoCs Date: Fri, 22 Nov 2019 11:28:23 +0100 Message-Id: <20191122100914.392555480@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Fainelli [ Upstream commit 7fb44929cb0e5cdcde143e1ca3ca57b5b8247db0 ] The Broadcom STB AHCI controller is the same as the one found on DSL SoCs, so we will utilize the same driver on these systems as well. Signed-off-by: Florian Fainelli Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/ata/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 5d16fc4fa46c7..a8d4f4b5a77eb 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -100,7 +100,8 @@ config SATA_AHCI_PLATFORM config AHCI_BRCM tristate "Broadcom AHCI SATA support" - depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP + depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP || \ + ARCH_BCM_63XX help This option enables support for the AHCI SATA3 controller found on Broadcom SoC's. -- 2.20.1