From patchwork Tue Sep 20 10:48:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 76602 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1408909qgf; Tue, 20 Sep 2016 03:34:13 -0700 (PDT) X-Received: by 10.66.157.103 with SMTP id wl7mr53918493pab.116.1474367652989; Tue, 20 Sep 2016 03:34:12 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h84si69563665pfh.47.2016.09.20.03.34.12; Tue, 20 Sep 2016 03:34:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933006AbcITKdq (ORCPT + 27 others); Tue, 20 Sep 2016 06:33:46 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:42425 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932163AbcITKde (ORCPT ); Tue, 20 Sep 2016 06:33:34 -0400 Received: from 172.24.1.136 (EHLO SZXEML423-HUB.china.huawei.com) ([172.24.1.136]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CHZ46248; Tue, 20 Sep 2016 18:33:29 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by SZXEML423-HUB.china.huawei.com (10.82.67.154) with Microsoft SMTP Server id 14.3.235.1; Tue, 20 Sep 2016 18:33:18 +0800 From: John Garry To: , , , , CC: , , , , , , , John Garry , Xiang Chen Subject: [PATCH 2/3] hisi_sas: add device tree support for hip07 Date: Tue, 20 Sep 2016 18:48:59 +0800 Message-ID: <1474368540-186535-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1474368540-186535-1-git-send-email-john.garry@huawei.com> References: <1474368540-186535-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.57E11079.01F9, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: da434dd1763f3dec4c04aab50f81a63a Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Chipset hip07 incorporates v2 hw. Signed-off-by: John Garry Signed-off-by: Xiang Chen --- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c index 9825a3f..c1e3aa7 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c @@ -777,7 +777,8 @@ static void init_reg_v2_hw(struct hisi_hba *hisi_hba) /* Global registers init */ /* Deal with am-max-transmissions quirk */ - if (device_property_present(dev, "hip06-sas-v2-quirk-amt")) { + if (device_property_present(dev, "hip06-sas-v2-quirk-amt") || + device_property_present(dev, "hip07-sas-v2-quirk-amt")) { hisi_sas_write32(hisi_hba, AM_CFG_MAX_TRANS, 0x2020); hisi_sas_write32(hisi_hba, AM_CFG_SINGLE_PORT_MAX_TRANS, 0x2020); @@ -2319,6 +2320,7 @@ static int hisi_sas_v2_remove(struct platform_device *pdev) static const struct of_device_id sas_v2_of_match[] = { { .compatible = "hisilicon,hip06-sas-v2",}, + { .compatible = "hisilicon,hip07-sas-v2",}, {}, }; MODULE_DEVICE_TABLE(of, sas_v2_of_match);