From patchwork Fri Sep 26 09:41:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 37943 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B17AC206A0 for ; Fri, 26 Sep 2014 09:42:11 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id b57sf5792961eek.10 for ; Fri, 26 Sep 2014 02:42:10 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=rFiw7iuQ4HR98v3aQpROcwSvt8D9IPeL7IrDY5GyC9k=; b=S5ozxX7xVEXefzNB2e2PUx94pRdZVd91uIt/RC5QBr1szmBh/Xy/FSob+vubhWeIux sJiMlbSNFv9giDAi2Na4wBFrzqWnPC2rIdR11p0hAsG4xdZOPMf5pmsLaInxSGQ7hN+t S7OOwgCfB0x+kKGi4N0i+O4R6c7f1YWVGfC0Bq+sS9BX0TDJRYMJddV43ETn/VrEwo9W UEmNZGObRvq7fQprKwrqhjQ6vSmZ3bXA+cAJTrwEdjEUtHwPXTDR8umnt1e7wkHOpV4+ lo4ZScF+K+tTKc+zPil6GDpkKc2RIYN3E07C3WihBdtUnKugolzHnW5Rc/getiLo5qm8 Kqmg== X-Gm-Message-State: ALoCoQkQmKk+sHsYHzNJhOIqpOLLDHCl8b8QyMYvT/qUTv8XHA87NroaVhW8/UQ9GEw/fpfjzORh X-Received: by 10.180.14.225 with SMTP id s1mr561716wic.5.1411724530844; Fri, 26 Sep 2014 02:42:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.129 with SMTP id o1ls352003lal.75.gmail; Fri, 26 Sep 2014 02:42:10 -0700 (PDT) X-Received: by 10.112.130.129 with SMTP id oe1mr18051251lbb.4.1411724530727; Fri, 26 Sep 2014 02:42:10 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by mx.google.com with ESMTPS id ge3si6452861lbc.40.2014.09.26.02.42.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Sep 2014 02:42:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id f15so669727lbj.11 for ; Fri, 26 Sep 2014 02:42:09 -0700 (PDT) X-Received: by 10.152.204.231 with SMTP id lb7mr18885818lac.44.1411724529919; Fri, 26 Sep 2014 02:42:09 -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 of9csp30182lbb; Fri, 26 Sep 2014 02:42:09 -0700 (PDT) X-Received: by 10.66.66.229 with SMTP id i5mr28188143pat.131.1411724526474; Fri, 26 Sep 2014 02:42:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pd4si8270255pdb.173.2014.09.26.02.42.05 for ; Fri, 26 Sep 2014 02:42:06 -0700 (PDT) Received-SPF: none (google.com: stable-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 S1753523AbaIZJmD (ORCPT + 1 other); Fri, 26 Sep 2014 05:42:03 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60825 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753533AbaIZJmA (ORCPT ); Fri, 26 Sep 2014 05:42:00 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 96611AC39; Fri, 26 Sep 2014 09:41:59 +0000 (UTC) Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.83) (envelope-from ) id 1XXS2I-0008BC-Q2; Fri, 26 Sep 2014 11:41:58 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Murali Karicheri , Tejun Heo , Santosh Shilimkar , Jiri Slaby Subject: [patch added to the 3.12 stable tree] ahci: add pcid for Marvel 0x9182 controller Date: Fri, 26 Sep 2014 11:41:58 +0200 Message-Id: <1411724518-31392-4-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411724518-31392-1-git-send-email-jslaby@suse.cz> References: <1411724518-31392-1-git-send-email-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.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.217.180 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 This patch has been added to the 3.12 stable tree. If you have any objections, please let us 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 */