From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30C95C43612 for ; Fri, 4 Jan 2019 16:54:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01941218CD for ; Fri, 4 Jan 2019 16:54:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FXKYvmWr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728321AbfADQyR (ORCPT ); Fri, 4 Jan 2019 11:54:17 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42016 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728153AbfADQyB (ORCPT ); Fri, 4 Jan 2019 11:54:01 -0500 Received: by mail-pf1-f193.google.com with SMTP id 64so18555739pfr.9; Fri, 04 Jan 2019 08:54:00 -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=4NEECKxkIUpvSN6zGsm7tNAQxLgNjozzJMg2Nudc0PU=; b=FXKYvmWr1Bi/6TwoHJ6obTPz0e4w3xPKDDDv8Wd3Qr8JhMl3BoVsO1z3Z4R8C/VgOk lUhdAglRAgvm2MpE77Ky1gCdZdIqm4Ag3OTfj79ii33uVa34k7RDFbIhCx3bnM4Pgjpa RIYCLAuFbVcnH0x+7hxzbYFivboH0hT/tHjIh6K94CB7X6/+D/e60KZSLFv7dHeXJ7Mn DEvccGftfQuX7FL/UqqQs8/Ufq9rbwO3W96hgPZLrpYBNpzV1d3DFO0x8Hbnvb2HGjmx 4MUZKEIUDCXQMow6Tdc1ORKBrzKeZ+houhlvjaBlnr90UhmTFzrLZFDSJGtzD9gyYJ+S 23Xw== 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=4NEECKxkIUpvSN6zGsm7tNAQxLgNjozzJMg2Nudc0PU=; b=kem37P9WfhkJAp5v4L16KdCxZRi4xWmmNS6b9mWK+nuDa/R33YZ+Lz2yqXbQQm4BrW 555qjvqafSfRhM8k19JXlI1p4m1T460Vo232CLydb6XakZWUeBMRrmpKG1YzrNlNOaDa 9KqirilnaFXxaE/OGNh3MJAtDAO1ZqnD30oox4tMGJYAu8A4yxMifzC7zjQA65cxkMWI IpPH5g9rJvl56DO9gybVzEypRXtwicrfRph4u2/HVvuDm0O0LjX4DCf0AkhxVaN5EQdz jGt2+qTakQ9jfBMdLs3/Y58N5xpygj9FaOuTQbLR8J0nhRsg9dTXoh8YEafwuic5wy5C Jfxw== X-Gm-Message-State: AA+aEWY7dJqOPPSxAcb946pZfQKWnm5D6umfIMP9ijwnNIk794+Dr8p8 7W8JNvYze6RYZU+EJKVKs5w= X-Google-Smtp-Source: ALg8bN4D1CKt/AUPshFmZDT16xoKhutjLiqIIIIVrU3y+rDCgyxP1DkOgi0g35bH153/z9gLjNpS5w== X-Received: by 2002:a62:870e:: with SMTP id i14mr54166502pfe.41.1546620840281; Fri, 04 Jan 2019 08:54:00 -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 p67sm101900564pfg.44.2019.01.04.08.53.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Jan 2019 08:53:59 -0800 (PST) From: Andrey Smirnov To: Lorenzo Pieralisi Cc: Andrey Smirnov , Trent Piepho , Lucas Stach , Bjorn Helgaas , Fabio Estevam , Chris Healy , Leonard Crestez , "A.s. Dong" , Richard Zhu , linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v4 2/4] PCI: imx6: Mark PHY functions as i.MX6 specific Date: Fri, 4 Jan 2019 08:53:33 -0800 Message-Id: <20190104165335.13205-3-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104165335.13205-1-andrew.smirnov@gmail.com> References: <20190104165335.13205-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PCIE PHY IP block on i.MX7D differs from the one used on i.MX6 family, so none of the code in current implementation of imx6_setup_phy_mpll() is applicable. Tested-by: Trent Piepho Signed-off-by: Andrey Smirnov Reviewed-by: Lucas Stach 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 --- drivers/pci/controller/dwc/pci-imx6.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index efff3d5e9162..c55d93c1187d 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -41,8 +41,11 @@ enum imx6_pcie_variants { IMX7D, }; +#define IMX6_PCIE_FLAG_IMX6_PHY BIT(0) + struct imx6_pcie_drvdata { enum imx6_pcie_variants variant; + u32 flags; }; struct imx6_pcie { @@ -256,6 +259,9 @@ static void imx6_pcie_reset_phy(struct imx6_pcie *imx6_pcie) { u32 tmp; + if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_IMX6_PHY)) + return; + pcie_phy_read(imx6_pcie, PHY_RX_OVRD_IN_LO, &tmp); tmp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN | PHY_RX_OVRD_IN_LO_RX_PLL_EN); @@ -573,6 +579,9 @@ static int imx6_setup_phy_mpll(struct imx6_pcie *imx6_pcie) int mult, div; u32 val; + if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_IMX6_PHY)) + return 0; + switch (phy_rate) { case 125000000: /* @@ -1088,12 +1097,15 @@ static void imx6_pcie_shutdown(struct platform_device *pdev) static const struct imx6_pcie_drvdata drvdata[] = { [IMX6Q] = { .variant = IMX6Q, + .flags = IMX6_PCIE_FLAG_IMX6_PHY, }, [IMX6SX] = { .variant = IMX6SX, + .flags = IMX6_PCIE_FLAG_IMX6_PHY, }, [IMX6QP] = { .variant = IMX6QP, + .flags = IMX6_PCIE_FLAG_IMX6_PHY, }, [IMX7D] = { .variant = IMX7D, -- 2.20.1