From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3836577-1523240775-2-1915213748133663655 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES ensvda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523240774; b=iAQDWHGCij92gNO00u4MjU0/lLsTaNjLMZZJVZ1sfzIR37/gnY Kh509OKKJpROi5Sfn6EfuTgkKthK7NsJzYZe463DEZBUlPYhim75yewQMnM5vMxK gESdmtv8rGS9gYfByl+y2hS6loQ/ZUouoVteKQ4krMXcJo6+zXayk9a1Q5pCCPiW vvT+EHTjCi/7jfi+nUlVShOmqwWMQ+8DRGCP4AkFAxYAOXZv0rqnBmEfzB3JrEJ7 PJQ1iyJDHejizJR+fXYOumqOzcWV7rFS/Jt+7CgjGxCUChUv4bDPbZou705XXuPh niNU1+Nc4/oQRsWjSMJFDrD0yxrjESjN4x+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=fm2; t=1523240774; bh=Na78k2vRm1 vR2tmUJ/LPWticAIh31CUSumUZWWxEVIg=; b=GGKumn79WmqcNwQphQR7hlgI8/ xsbwz668coYQHaIuOQOv6uJvUmUTeMdBTNwxaVxG7bWHiXdiyEXs8F5Sg5MePK96 rN176KSe7HBvHNGJ4wSF2gfBsxVtyP9HKGH9iZXn1RAyWiI+j2D73FsOr83bOAR2 SCYApqdDPPbgIkuCJQUIm2Vd+WcaVaBHMh/LzytYc5snWxPl+RCPrE6CKGa3mWd4 f9K2X4156+EtLStNMcCsOVOxWcwMnt6bejuttwB8j2Hhcbl9B9Zx/sdjYElUkzj7 o/jDDHD9A0lGfxr5oL9TDzyUjdO5TMbWsIGHrXnsOL04nlJRaVnN7cE1BZFA== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=oh9bY7PM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=oh9bY7PM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfOdFGCvexzFbKM24T/z/sMgktVOPX5sd0uosR/zXIfdq7G7M5YVEwDatrAdi415jxjpQbTFdZzzoD10K668hXmAW30bEHYJ1S2OvmvLsy5IC+zYrpNpR sWKqe5pi6Fr/d1aBn1d/yiFtmiioYhnF0Kh9aY6Uy2iRIvCa7sJOXLapLAj/mcIhUB4eNhaM+frWcGVzD6Equ5Ed1p311fpqAYbt8xrouwVVtG3JJS3hjbqJ X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=VwQbUJbxAAAA:8 a=LpQP-O61AAAA:8 a=yMhMjlubAAAA:8 a=lOoD4gDX1kpuODFa1F0A:9 a=wPNLvfGTeEIA:10 a=AjGcO6oz07-iQ99wixmX:22 a=pioyyrs4ZptJ924tMmac:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932625AbeDICZn (ORCPT ); Sun, 8 Apr 2018 22:25:43 -0400 Received: from mail-by2nam03on0120.outbound.protection.outlook.com ([104.47.42.120]:61603 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754244AbeDIA3N (ORCPT ); Sun, 8 Apr 2018 20:29:13 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Dinh Nguyen , Stephen Boyd , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 096/293] clk: socfpga: Fix the smplsel on Arria10 and Stratix10 Thread-Topic: [PATCH AUTOSEL for 4.9 096/293] clk: socfpga: Fix the smplsel on Arria10 and Stratix10 Thread-Index: AQHTz5kTtBWW+r5hPUOx9Kv8llpArw== Date: Mon, 9 Apr 2018 00:24:08 +0000 Message-ID: <20180409002239.163177-96-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0967;7:LughjaDsL6e1QDUpeebvgtzOSOxjFM/Kh6XdxMF0fkUsxulBIySWvernLH5RnA2Mav02A9U0jA0PCptEkNEZQEA8fE+m7ktHR6Gu/hI6uNfUdbtk2B0A3/x5Dr0Ft69PD6NEYoojAJym8bTlS8G/7LVutPJXxgRaxqcY7i+IU4A5PyBYtc8KNpYlZlaeJGj6NVLgcbKnUd0wloheP7VVzJ0yXYp8LkdrdE+fQngSlyrAHx2jCapk9du/tYI3vhQi;20:oAqwOMICdJfdQ3MGMim2uPYk4OFzNknlC+EEAWz+i7gMujeebEXxfx20kvAmZbLkSGGYPLAB6JiyT8L8mjVwpz14VN9bVGkZvB6Fvn7NNjpnVvD40l1KAyIBqBkGoo3I3uYl8cvupCmsywUQ0BfSOlHrQxJRr2JaLkLJlwakFf4= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 0ed9c68a-e0d5-4116-3b85-08d59db0ea37 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0967; x-ms-traffictypediagnostic: DM5PR2101MB0967: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011);SRVR:DM5PR2101MB0967;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0967; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39860400002)(366004)(376002)(39380400002)(346002)(199004)(189003)(6506007)(486006)(86362001)(14454004)(59450400001)(68736007)(102836004)(99286004)(26005)(3846002)(6116002)(186003)(476003)(2616005)(1076002)(3280700002)(86612001)(72206003)(4326008)(446003)(54906003)(76176011)(11346002)(2906002)(22452003)(3660700001)(110136005)(97736004)(316002)(6666003)(5660300001)(478600001)(8676002)(6512007)(8936002)(107886003)(6486002)(53936002)(81166006)(36756003)(81156014)(10290500003)(6436002)(10090500001)(25786009)(66066001)(106356001)(305945005)(7736002)(2501003)(5250100002)(105586002)(2900100001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0967;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: 6XDYMh+2XgttHzgGS7/FAbsDIPqaWmpxTuZvQGwPl/ScbUJUe140R0mdrLryX8ZFwWBtXaRkezDpUMZFXhMrvIUuew3acV+0Cq6DO9PHT8+4LBdbMHXmtE7JeSDDkd9D1vIi8NCdo/j5T5HWN1Jh7DEl/hY31h6jUONPzbhXG7QnBwldpeQbC+gLNKx9BU0SDYNcsR+JoRRKoGFPi7tzAVgcLOJ2xk/Lfa6qzA/7wl0Rd/ttUQ/jyOvyAkg+uj9TMA+6tfT0cCSvUMuOiWGtio3Ms2NwDkBQ5sgMG9nzj3v/OIFQK7Z0RtRJ3IuUSE4MeXRf01llShrr4IKKWEsFCHjv2np+5fUx3C/XFfzbrtwBlDiSYGUlyTGRkDgRKwyfsDvLht5WPjfO6KmBCRL2SKsCbCSC7q5BDoGRG++K/b8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ed9c68a-e0d5-4116-3b85-08d59db0ea37 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:24:08.8781 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0967 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Dinh Nguyen [ Upstream commit b7f8101d6e75fefd22c39624a30c9ed3d7a72463 ] The smplsel bits for the SDMMC clock on Arria10 and Stratix10 platforms are offset by 1 additional bit. Add a new macro SYSMGR_SDMMC_CTRL_SET_AS10 for usage on the Arria10 and Stratix10 platforms. Fixes: 5611a5ba8e54 ("clk: socfpga: update clk.h so for Arria10 platform to= use") Signed-off-by: Dinh Nguyen Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/socfpga/clk-gate-a10.c | 2 +- drivers/clk/socfpga/clk.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/clk-g= ate-a10.c index c2d572748167..36376c542055 100644 --- a/drivers/clk/socfpga/clk-gate-a10.c +++ b/drivers/clk/socfpga/clk-gate-a10.c @@ -86,7 +86,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk) } } =20 - hs_timing =3D SYSMGR_SDMMC_CTRL_SET(clk_phase[0], clk_phase[1]); + hs_timing =3D SYSMGR_SDMMC_CTRL_SET_AS10(clk_phase[0], clk_phase[1]); if (!IS_ERR(socfpgaclk->sys_mgr_base_addr)) regmap_write(socfpgaclk->sys_mgr_base_addr, SYSMGR_SDMMCGRP_CTRL_OFFSET, hs_timing); diff --git a/drivers/clk/socfpga/clk.h b/drivers/clk/socfpga/clk.h index 814c7247bf73..9cf1230115b1 100644 --- a/drivers/clk/socfpga/clk.h +++ b/drivers/clk/socfpga/clk.h @@ -32,6 +32,9 @@ #define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel) \ ((((smplsel) & 0x7) << 3) | (((drvsel) & 0x7) << 0)) =20 +#define SYSMGR_SDMMC_CTRL_SET_AS10(smplsel, drvsel) \ + ((((smplsel) & 0x7) << 4) | (((drvsel) & 0x7) << 0)) + extern void __iomem *clk_mgr_base_addr; extern void __iomem *clk_mgr_a10_base_addr; =20 --=20 2.15.1