From patchwork Fri Sep 26 09:45:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 37950 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0D4AB20447 for ; Fri, 26 Sep 2014 09:52:34 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id c13sf5801866eek.7 for ; Fri, 26 Sep 2014 02:52:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=34za7MrahBSfV0Y/HFCMifSFVdgvRz1EyldQCy93tlU=; b=lpj2slLVr+/XBOmLsTWLSYR1tveNIZBXohizTPwCkakzxFsenVuNRVv8cXGbRJyqny GL+inX/Ay7WnzkYDbqUHo8F8wB4uBA6MlEHLLOuQUMnVho9b8Rk8Z/Do/+26SUHOgTIu 5QQ4B1hG8y8vY633bReuTDrt7PBtRhakfYdHhBFFEqZTGqnC3U8Jjawf5U13pTw1Hi+B qqVDyL0omFKvpUQaMT5alhRyinV0fkjRcuruMXkALz03T0dzoZ3PBt4lwfIsK5uUa0Tr CgIBtvj/e3RMwEgwZfrnd1DWcyPZIZERu0qPtHrvhEVi703Jevwh8Td5DMtiowsRY9aP uBAA== X-Gm-Message-State: ALoCoQnJ1ZL252QDxqqapLzXO9t+4CxT4k08nCZ21lcmpGg9qAArKPk1ww0fDegiM1OYxsxzF/LO X-Received: by 10.194.3.19 with SMTP id 19mr86375wjy.5.1411725154236; Fri, 26 Sep 2014 02:52:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.104 with SMTP id lf8ls319632lac.87.gmail; Fri, 26 Sep 2014 02:52:34 -0700 (PDT) X-Received: by 10.152.7.145 with SMTP id j17mr18790987laa.77.1411725154088; Fri, 26 Sep 2014 02:52:34 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by mx.google.com with ESMTPS id pk5si6457897lbb.60.2014.09.26.02.52.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Sep 2014 02:52:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id gi9so3844612lab.5 for ; Fri, 26 Sep 2014 02:52:33 -0700 (PDT) X-Received: by 10.152.246.6 with SMTP id xs6mr19231541lac.56.1411725153839; Fri, 26 Sep 2014 02:52:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp31299lbb; Fri, 26 Sep 2014 02:52:33 -0700 (PDT) X-Received: by 10.70.130.195 with SMTP id og3mr33739367pdb.59.1411725151925; Fri, 26 Sep 2014 02:52:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wn5si8409301pbc.94.2014.09.26.02.52.31 for ; Fri, 26 Sep 2014 02:52:31 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754640AbaIZJwW (ORCPT + 27 others); Fri, 26 Sep 2014 05:52:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32952 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755109AbaIZJqw (ORCPT ); Fri, 26 Sep 2014 05:46:52 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D077BAE08; Fri, 26 Sep 2014 09:45:55 +0000 (UTC) Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.83) (envelope-from ) id 1XXS67-0008Vp-Hu; Fri, 26 Sep 2014 11:45:55 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Murali Karicheri , Tejun Heo , Santosh Shilimkar , Jiri Slaby Subject: [PATCH 3.12 139/142] ahci: add pcid for Marvel 0x9182 controller Date: Fri, 26 Sep 2014 11:45:50 +0200 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <406eb8e630446eff74211cba53a536f232bbefd1.1411724723.git.jslaby@suse.cz> References: <406eb8e630446eff74211cba53a536f232bbefd1.1411724723.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Murali Karicheri 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit c5edfff9db6f4d2c35c802acb4abe0df178becee upstream. Keystone K2E EVM uses Marvel 0x9182 controller. This requires support for the ID in the ahci driver. Signed-off-by: Murali Karicheri Signed-off-by: Tejun Heo Cc: Santosh Shilimkar Signed-off-by: Jiri Slaby --- drivers/ata/ahci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 7edbd1e41164..a875de67fb7c 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -449,6 +449,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a), .driver_data = board_ahci_yes_fbs }, /* 88se9172 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172), + .driver_data = board_ahci_yes_fbs }, /* 88se9182 */ + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9182), .driver_data = board_ahci_yes_fbs }, /* 88se9172 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192), .driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */