From patchwork Sun Dec 16 23:09:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10732629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 26E8F17E1 for ; Sun, 16 Dec 2018 23:10:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13CB229953 for ; Sun, 16 Dec 2018 23:10:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10F4329AE3; Sun, 16 Dec 2018 23:10:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 96C2429935 for ; Sun, 16 Dec 2018 23:10:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jupzvMuK1hb+BgqBlCPaVEJMeWqP0kzKRwzz4vPfV0Q=; b=pbFVyLZ5gkW3jI KpAuxvdhhkCByyECveBYFFQUU3TjzZQl+8uvlkXosz29p1XLTTYQdoek5jU0aEoxUzJPBUPeqO1Gl P7jbgu+zF+/uAWu+tQlo078Djd82jl/ltX9rLMPgkKVJRGmBmkn5nzAywDyHe4Aod2pUBYm7wDE3y z1Uan0TvLJbBlskvey5HH5JpxMO+fs7zr5CkrfLGWX7Nx9W2ZLcajyVxlVPrTFpIGiYEmZYO6+dvM TCarsHZ9s3CCLmGwUM7pjipiqOyNvFYAGxic/nOkkVR7995D/mtLuTDRQMH5y7AWWdCcWT97oYMiq +51umTx5iUOmOby2ET4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gYfYM-0001zr-Pu; Sun, 16 Dec 2018 23:10:30 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gYfXk-0000AL-Gr for linux-arm-kernel@lists.infradead.org; Sun, 16 Dec 2018 23:09:53 +0000 Received: by mail-pg1-x541.google.com with SMTP id w6so5174537pgl.6 for ; Sun, 16 Dec 2018 15:09:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=630bTHnJjqwfGqvwds3Arb51H+EGehA9C94eFD613KI=; b=X672KZFE92BRla2JFSoPoNeUns+n7a5/84TFppsKFpoG4xa0SgdhWK8AWWfkhMkHUf Tj/yPBcGWr89ZoyZLwasu/T1alnt2F4nZCa34sH+suoZOLMbE4oLShOBIRE0MZd7SmoI d3IIbxbkRPGH0lEYUtGHcIXPu6Ay95GVWqTaPOdrPA0cF6MpUYNaTNxBNqxOAlUr0Ito SkTjXzuzycZI000LslYUSOnZCVjzODqSgL4tuyftG6HyktxtdJlPvqgYTckQeJ4ehaV2 YgigRSDiq9dzgoKSnZgUP4CM4mBZHoW0K5/f0ZU+NgOm/GiqQP/U9HGZGgyQqJH/HnMS kufg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=630bTHnJjqwfGqvwds3Arb51H+EGehA9C94eFD613KI=; b=iygKxabeOlCKDSwPd7Qsr4Fg4uvO6Pe6jgtRgPxx9Rdhl2C6etfxHT6U6xNMVJDyyR /+yOK4mrfuY715LvkzVY2c7h+jPRfJzv+jhFNkolmMxw7ew0QMqz2vLlq8+8Csb8q2Ls qfIxIQyaqJAxbnFUTnH2yArD/HxS/MlpBL2FGQS8thsFSMCJb4i160h6sF8+k7y8Zz/g hYuvplFP473fb8/hLDG0K0NsyissA9xmr8atboaF+pJGOT78s3XvV0onSETjH3lNiMvA k7n95KB02sPOXZXOpmesSLCBmOhJIxH8iv3QwGI7je1cb1gLrAulwz7P3kjefhvgaHs+ HT5w== X-Gm-Message-State: AA+aEWZGryM4XMC+g5faBX1Cg927UiTyXjf41U/84VR25NOxKic7FfBs 1/k1VputZkt3uE/XyJoiuzY= X-Google-Smtp-Source: AFSGD/UyHsKL9Qn3NP34DOD/KjQSdkrY6aB0QcpgakfwuqCeosmY57w6BcYvSr8IX1U0njnVsENeWw== X-Received: by 2002:a63:a112:: with SMTP id b18mr10246376pgf.440.1545001781772; Sun, 16 Dec 2018 15:09:41 -0800 (PST) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id d18sm13837878pfj.47.2018.12.16.15.09.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Dec 2018 15:09:40 -0800 (PST) From: Andrey Smirnov To: Lorenzo Pieralisi Subject: [PATCH 2/3] PCI: imx6: Invert checks in imx6_pcie_reset_phy() and imx6_setup_phy_mpll() Date: Sun, 16 Dec 2018 15:09:15 -0800 Message-Id: <20181216230916.22982-3-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181216230916.22982-1-andrew.smirnov@gmail.com> References: <20181216230916.22982-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181216_150952_557297_8AA1B246 X-CRM114-Status: GOOD ( 11.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "A.s. Dong" , Richard Zhu , linux-arm-kernel@lists.infradead.org, Andrey Smirnov , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Fabio Estevam , linux-imx@nxp.com, Bjorn Helgaas , Leonard Crestez , Chris Healy , Lucas Stach Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In order to avoid having potentially ever growing list of variants that don't support methods implemented in imx6_pcie_reset_phy() and imx6_setup_phy_mpll(), change logical checks in the to check for SoC's that _do_ support what they implement. While at it, share the code via a small helper function. Cc: Bjorn Helgaas Cc: Fabio Estevam Cc: Chris Healy Cc: Lucas Stach Cc: Leonard Crestez Cc: "A.s. Dong" Cc: Richard Zhu Cc: linux-imx@nxp.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-pci@vger.kernel.org Suggested-by: Bjorn Helgaas Signed-off-by: Andrey Smirnov --- drivers/pci/controller/dwc/pci-imx6.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 4b7f638b8aff..59658577e81d 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -256,12 +256,18 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data) return 0; } +static bool imx6_pcie_has_imx6_phy(struct imx6_pcie *imx6_pcie) +{ + return imx6_pcie->variant == IMX6Q || + imx6_pcie->variant == IMX6SX || + imx6_pcie->variant == IMX6QP; +} + static void imx6_pcie_reset_phy(struct imx6_pcie *imx6_pcie) { u32 tmp; - if (imx6_pcie->variant == IMX7D || - imx6_pcie->variant == IMX8MQ) + if (!imx6_pcie_has_imx6_phy(imx6_pcie)) return; pcie_phy_read(imx6_pcie, PHY_RX_OVRD_IN_LO, &tmp); @@ -637,8 +643,7 @@ static int imx6_setup_phy_mpll(struct imx6_pcie *imx6_pcie) int mult, div; u32 val; - if (imx6_pcie->variant == IMX7D || - imx6_pcie->variant == IMX8MQ) + if (!imx6_pcie_has_imx6_phy(imx6_pcie)) return 0; switch (phy_rate) {