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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 248F1C43331 for ; Wed, 13 Nov 2019 02:15:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4D0221783 for ; Wed, 13 Nov 2019 02:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573611356; bh=J20p1/Lr/01/XEt36tAe2egFoTNQR+l+SkJZYjRWPi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xMoP2PPfCWkby2aDZWLWZY//uRNpw396M4K7um0RFFSE7D3OLDguishzCkTPC07iB 8Cvd4UC4QMcLYKCE0SHK3lXRoz4FeHJbgCi6zSEU6J8CuRxWQCGUOSNjINFYTm0B6k g81TjQHJRzotLExP7jkwrzZr0h1m6wca2xKIIBFE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729591AbfKMCPz (ORCPT ); Tue, 12 Nov 2019 21:15:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:49246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729562AbfKMB4m (ORCPT ); Tue, 12 Nov 2019 20:56:42 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC6142245D; Wed, 13 Nov 2019 01:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610202; bh=J20p1/Lr/01/XEt36tAe2egFoTNQR+l+SkJZYjRWPi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IHns/YwV0+AxY3LRYZf3FCauPOSIrmY7FncFo0bIma9CHODl5FdH0elQkjT1pDF2D BfqXAfKhl7kuZVHW3sGgyBa8/zMZ2v1lkxwMMZe5gqDINNDMct5YBmxOB86VWm5FXy 4d1A9MGAE0ptXMYmaXZrn7udqjrBvsBdQ0cKpxdM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Fainelli , Jens Axboe , Sasha Levin , linux-ide@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 014/115] ata: ahci_brcm: Match BCM63138 compatible strings Date: Tue, 12 Nov 2019 20:54:41 -0500 Message-Id: <20191113015622.11592-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015622.11592-1-sashal@kernel.org> References: <20191113015622.11592-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Florian Fainelli [ Upstream commit fb8506f15f2e394f5f648575cf48a26e8744390c ] Match the "brcm,bcm63138-ahci" compatible string in order to allow this driver to probe on such platforms. Signed-off-by: Florian Fainelli Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/ata/ahci_brcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c index 5936d1679bf3a..0a3998526bb1d 100644 --- a/drivers/ata/ahci_brcm.c +++ b/drivers/ata/ahci_brcm.c @@ -297,6 +297,7 @@ static struct scsi_host_template ahci_platform_sht = { static const struct of_device_id ahci_of_match[] = { {.compatible = "brcm,bcm7425-ahci", .data = (void *)BRCM_SATA_BCM7425}, {.compatible = "brcm,bcm7445-ahci", .data = (void *)BRCM_SATA_BCM7445}, + {.compatible = "brcm,bcm63138-ahci", .data = (void *)BRCM_SATA_BCM7445}, {.compatible = "brcm,bcm-nsp-ahci", .data = (void *)BRCM_SATA_NSP}, {}, }; -- 2.20.1