From patchwork Tue Apr 4 19:32:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 96759 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp344993qgd; Tue, 4 Apr 2017 12:32:46 -0700 (PDT) X-Received: by 10.84.138.193 with SMTP id 59mr31127434plp.167.1491334366416; Tue, 04 Apr 2017 12:32:46 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p89si18339852pfa.239.2017.04.04.12.32.46; Tue, 04 Apr 2017 12:32:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@verizon.com; dkim=pass header.i=@verizon.com; dkim=pass header.i=@verizon.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752949AbdDDTcp (ORCPT + 6 others); Tue, 4 Apr 2017 15:32:45 -0400 Received: from omzsmtpe03.verizonbusiness.com ([199.249.25.208]:19767 "EHLO omzsmtpe03.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753683AbdDDTcl (ORCPT ); Tue, 4 Apr 2017 15:32:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334361; x=1522870361; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=TLYkjprzh0vvA21TEzvOoUzszn9ecdhqjgtmTfAbglc=; b=VMOLaI5RZrNysLKnh4nYuh8WMKNZO2lHV8q62CBlDRo9yI/PI6Hj6DiB VMP88llWJURccUR+nL/yhUdAR6wkqkE/QAXFd5rYbwLIfkVOCjxiHEMjw n68CZxtPel2o+PobS09dEmDRtzi1p3G1noi/mK3UKPbaaa0NRdrNL35UP I=; X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi01.verizon.com) ([166.68.71.143]) by omzsmtpe03.verizonbusiness.com with ESMTP; 04 Apr 2017 19:32:37 +0000 X-IronPort-AV: E=Sophos;i="5.36,275,1486425600"; d="scan'208";a="182587261" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi01.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 19:32:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334328; x=1522870328; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=TLYkjprzh0vvA21TEzvOoUzszn9ecdhqjgtmTfAbglc=; b=O+loaSfxtoTmAxqvWHbrTepvw37KXwKym+vtM6tZnUtlp4SzvpMWEAnZ le5Wa4yJAzQKneAu0S9MVgvc519NNT4wJfvmd0HAZ1pbMQcnfdaima1L6 0+ODird3x2u+ZSeGV4J4n08VgIa+MR3jqhLR/hjjDW1CDRn1HG8uvRhaP E=; Received: from discovery.odc.vzwcorp.com (HELO mercury.verizonwireless.com) ([10.255.240.25]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 15:32:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334328; x=1522870328; h=to:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from; bh=TLYkjprzh0vvA21TEzvOoUzszn9ecdhqjgtmTfAbglc=; b=VfXkIhjHfAgMiSQf2GxuARW/h7BbBXx2QtlwheB1nhtrRyoJbKwwTlUu T5QrwsXYtzs398/+7Axw4aOcvdx3g146opS+mQgV54P+tW2EJUjxATE5b NZSgP3gPkQ/VoVsQH/YSuvp0qPKbe2WFLDKvWvbWT5zGC6MuuI4VokTEQ s=; From: alexander.levin@verizon.com X-Host: discovery.odc.vzwcorp.com Received: from nyora1hub003.uswin.ad.vzwcorp.com ([10.170.34.218]) by mercury.verizonwireless.com with ESMTP/TLS/AES256-SHA; 04 Apr 2017 19:32:08 +0000 Received: from OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) by NYORA1HUB003.uswin.ad.vzwcorp.com (10.170.34.218) with Microsoft SMTP Server (TLS) id 8.3.406.0; Tue, 4 Apr 2017 15:32:07 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 4 Apr 2017 14:32:06 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1210.000; Tue, 4 Apr 2017 14:32:06 -0500 To: "gregkh@linuxfoundation.org" CC: "stable@vger.kernel.org" Subject: [PATCH for 4.9 06/98] arm64: dts: hisi: fix hip06 sas am-max-trans quirk Thread-Topic: [PATCH for 4.9 06/98] arm64: dts: hisi: fix hip06 sas am-max-trans quirk Thread-Index: AQHSrXoj+3orM3fS8UmIPjLFHd56cA== Date: Tue, 4 Apr 2017 19:32:04 +0000 Message-ID: <20170404193158.19041-7-alexander.levin@verizon.com> References: <20170404193158.19041-1-alexander.levin@verizon.com> In-Reply-To: <20170404193158.19041-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Garry [ Upstream commit f65e786604b34d0b599b8c01ecca28be2d746290 ] The string for the am max transmissions quirk property is not correct -> fix it. Signed-off-by: John Garry Reviewed-by: Xiang Chen Signed-off-by: Wei Xu Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/hisilicon/hip06.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.3 diff --git a/arch/arm64/boot/dts/hisilicon/hip06.dtsi b/arch/arm64/boot/dts/hisilicon/hip06.dtsi index af45041..f2eb12c 100644 --- a/arch/arm64/boot/dts/hisilicon/hip06.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hip06.dtsi @@ -590,7 +590,7 @@ reg = <0 0xa2000000 0 0x10000>; sas-addr = [50 01 88 20 16 00 00 00]; hisilicon,sas-syscon = <&pcie_subctl>; - am-max-trans; + hip06-sas-v2-quirk-amt; ctrl-reset-reg = <0xa18>; ctrl-reset-sts-reg = <0x5a0c>; ctrl-clock-ena-reg = <0x318>;