From patchwork Sun Dec 16 23:09:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10732627 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 95F7817E1 for ; Sun, 16 Dec 2018 23:10:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83C8D2991D for ; Sun, 16 Dec 2018 23:10:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 817A529928; Sun, 16 Dec 2018 23:10:06 +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 25F6F29953 for ; Sun, 16 Dec 2018 23:10:06 +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=p+mI6djn6UL5ZLTLdwkMb+fPkUniT0+GnB8REreRx9U=; b=uLB3YS4RH2mcSc MhfCiVBJj5kqKpHCXGdoBiJ8xE6dM8otMeGIp/TRsFnOq0vblRgtT9SHdUWRRUtE1nolzXZVCmgU3 pry128FJNca6mDIdmr6Q7Vf/308vho53cOnmArV9V1thgZnPUNJ47xRJP5r51RINQXEhQEoBpVwpK aqAsTFlg0rSqRkhgvNA58WrvAF8z2TChMl7ok8E8a7Z0z5zgXK8HC+OEzH5rBcVaHf5dLN+El3+ul czVniH3vjhNG6SQ6QMfYkTIHO5LLWbmjFKWKmEm5azkem1esizclWA2+8EVuGFCXw+VdLxdsqi+Qq Uw87enEd1PYHre/wpqqA==; 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 1gYfXt-0000K4-5l; Sun, 16 Dec 2018 23:10:01 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gYfXi-0000AF-Sv for linux-arm-kernel@lists.infradead.org; Sun, 16 Dec 2018 23:09:52 +0000 Received: by mail-pf1-x442.google.com with SMTP id i12so5395850pfo.7 for ; Sun, 16 Dec 2018 15:09:40 -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=ThdCHGx7HMeXDSODXXhk1TA+McwuEBwFRrEXyBqC4tY=; b=QXYMqlK3GSzfXI7WNRhf3Lz0lj8ztycPnCZijolGGZxyteGhEryVwQu+wNKPAUY+YP fo+Tg1U2Uo8OzVLtxtxMbZeWIeoOFNtkWQa3txQbNhbx5isGQaM31MOeLS1EG1V2/Aw/ PgkX2upipOZOjpz/GhPPaHJ6s4ZBQtHsmZfdAKG7vakzIsckbF/66owIY2jK4U9jH8Gx 3qTVt5orgN7K0HlBrnD6gTv+hcgH6OBftgBrN9nG/GtjXuyVwCp7aZVSGqBjH/inSNVw hNfD4FhGss5YL3gZJRrvma3EFKIvfSU4ng5gKPqww+mXYicev6szBieKPoA833+I0QdV OKSA== 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=ThdCHGx7HMeXDSODXXhk1TA+McwuEBwFRrEXyBqC4tY=; b=fJ/eM5ea3w1NTbk63C3lv8hfLRmpp9rli0oC3JlVF8rPKI6JG/SR13gbk/QcxLMuvj 69bU/uhCkYDl1vjU8hBSd4OJWWiLg1dKyp0TriF4pnDMBSTSPsSRNy5s8ghRCp89gVsT hhnX8fPCNZVXEeWEIgqhmcK9FVGwdWkPtCnZEmR6IoWGg04PRkYYLyB3l5tZ8a9IyUw8 CroD1dlvSWvJ1ngIZxnDWYfOuWPGWp5eLq5rOO+9NUT591/leFOYcKPWH+t0m+rIPjnr 9cFLFCsdrPLCA3gJ7v450hPOR0GWiGm+Qljvsl3bJHtPUMaCukMTwxJ0p8D5RJp3/9Cv 91ng== X-Gm-Message-State: AA+aEWYs/l8+L97ggboVrU617Hzv34J9TvL5gu/qheFIMPXtxSBrukCE 3aGeeWHe7FHEegxNw2xp7To= X-Google-Smtp-Source: AFSGD/W1bNEAwXlRjNa/wfgL9IEzOfuTo7fwcKylCFfKncceXmLpYw3zP057F6Lfib8rOiNANa1KIw== X-Received: by 2002:a63:1013:: with SMTP id f19mr10316563pgl.38.1545001779866; Sun, 16 Dec 2018 15:09:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Dec 2018 15:09:39 -0800 (PST) From: Andrey Smirnov To: Lorenzo Pieralisi Subject: [PATCH 1/3] PCI: imx6: Fixup Kconfig and #endif placement Date: Sun, 16 Dec 2018 15:09:14 -0800 Message-Id: <20181216230916.22982-2-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_150950_928120_9B7AACC0 X-CRM114-Status: GOOD ( 12.96 ) 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 Fixup Kconfig, which lost SOC_IMX7D during merge as well as move "endif" to its original placement to only imx6q_pcie_abort_handler() when building for AArch64 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 Signed-off-by: Andrey Smirnov --- drivers/pci/controller/dwc/Kconfig | 4 ++-- drivers/pci/controller/dwc/pci-imx6.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig index 0c8142529241..b5202ed78762 100644 --- a/drivers/pci/controller/dwc/Kconfig +++ b/drivers/pci/controller/dwc/Kconfig @@ -89,8 +89,8 @@ config PCI_EXYNOS select PCIE_DW_HOST config PCI_IMX6 - bool "Freescale i.MX6/7 PCIe controller" - depends on SOC_IMX8MQ || SOC_IMX6Q || (ARM && COMPILE_TEST) + bool "Freescale i.MX6/7/8 PCIe controller" + depends on SOC_IMX8MQ || SOC_IMX6Q || SOC_IMX7D || (ARM && COMPILE_TEST) depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index e563ca9bdb78..4b7f638b8aff 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -311,6 +311,7 @@ static int imx6q_pcie_abort_handler(unsigned long addr, return 1; } +#endif static int imx6_pcie_attach_pd(struct device *dev) { @@ -389,7 +390,6 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) ret); } } -#endif static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) { 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) { From patchwork Sun Dec 16 23:09:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10732631 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 8C7C014E2 for ; Sun, 16 Dec 2018 23:10:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AFCE298EF for ; Sun, 16 Dec 2018 23:10:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79256298E7; Sun, 16 Dec 2018 23:10:47 +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=unavailable 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 EE6DF299EE for ; Sun, 16 Dec 2018 23:10:46 +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=P13feE+kDidqkpVbFOBgk8W+niWrNdRn6ibcYbYQoaM=; b=XoI6mOtIIFgkui ygKrctzBpqY+guseUHBtHIe4ebNMUprBHDLiAZxQAP27m7jwdTr2wTwNPU+gHvu8f1OidWXjZYlXl 7pY19FEjKWApL81IqyfOeFQmgB2R6/5OyqSqRgtHybEvhOEn+XdD9kAsrEVcRFSM/qCOdL+oOTxb+ EI4PYx1cTCTHLHO4kzOzZ3WMG+5a0yCAdQq4vQs+64YsRt7X8cpv7H2/iLj+jd4C4w/paoTip2q/2 /9MLuDIvADc3cun3ERqMrWX1PG+xSb7hI0vWvePKcWyzmApebqVt4gEDtO8/hWd437uS4K6Gy69ds U5KgdxbBsp9GXsp4IyOA==; 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 1gYfYY-0002A5-QX; Sun, 16 Dec 2018 23:10:42 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gYfXm-0000Au-HR for linux-arm-kernel@lists.infradead.org; Sun, 16 Dec 2018 23:09:56 +0000 Received: by mail-pg1-x542.google.com with SMTP id v28so5167813pgk.10 for ; Sun, 16 Dec 2018 15:09:44 -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=5Ky7pgVvvF9hLcoAABtSFG13zMfTe+6ohhmnBjH727g=; b=tGIdgDb675KcT+PZnOTanBgWwaRyRZ8akrzY/vSuOGVM6xzj5vyScaAVotj5bZpEkE FVoDtXtL3k7gKaJWHU1Wq0E21vMIcZNUIHPcWwH452UDtgxX4pkbAaFCA906Abxtu30a Db9Iti09HC0aKdfYRLmzFKM90w3eRdmmBx2fJqoBDNvKjWufckWbDUJJuwUsdDoLctMK VUz8KjXSvUV09jhFTOVucBOU8bP+6Rj/qXvMSXsKM9pPCoWVTpJsptes7aHLA8QP0EGH Yr03NV4WKX2YCp5CECk6Bjw0nNcJ5WnlmWHMrB3RGn8DpJDgdLCFxE9uF3xG/aomtjU8 GDbw== 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=5Ky7pgVvvF9hLcoAABtSFG13zMfTe+6ohhmnBjH727g=; b=FVGq9vSYSz0CCAcUoXwlxdgB5bLyzoQPKCH0qh2vmV/AzMa8nmjjYO1rno4gJ77792 NJ17kNVrYwJIez7f+iO/f+i6Jhn4/PRomPnShr38WzL8C52fpual4u8whwruzn0kFYU6 XTdmvy54xO22VAPwfHEYe5gbc+E+f1V2gHk3Doj4iAe3Lo2WX5ZwiqB0XeDHQ6qH6wt0 3VCwu9gvYiUHaSIaGlSOe8cqAluDW3CrZ+yCNP1Ujl40DvUzZINoQHS9NgUXSaSzqVb9 wMWgvwWf+fHVsk0ssWqOUQhI9eTHwtpqugCMRyb9D1YOFSv3ahEAE4MJwsyZKEqV0bnX 4Rdw== X-Gm-Message-State: AA+aEWZC1HlKwtH8PwB+xLiw7+2tZhkLtEx2bQMSalV1IZ/+e7cAQx6i 9Cr6dKyS2XiJl58lE/lzkNo= X-Google-Smtp-Source: AFSGD/XZNYx2ZnQ0ULXCggr6Tfm83Im0nuTyZ09O2JjFgAMUa2UbKSPGJU0RhePW3s4ea+HzH6fobg== X-Received: by 2002:a63:1e56:: with SMTP id p22mr10128690pgm.126.1545001783805; Sun, 16 Dec 2018 15:09:43 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Dec 2018 15:09:42 -0800 (PST) From: Andrey Smirnov To: Lorenzo Pieralisi Subject: [PATCH 3/3] PCI: imx6: Make fallthrough comments more consistent Date: Sun, 16 Dec 2018 15:09:16 -0800 Message-Id: <20181216230916.22982-4-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_150954_915724_56D4D1AF X-CRM114-Status: GOOD ( 12.54 ) 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 Convert all fallthrough comments to say "fall through", as well as modify their placement to the point where the "break" would normally be. 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 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 59658577e81d..a0510e185d44 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -362,7 +362,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) switch (imx6_pcie->variant) { case IMX7D: - case IMX8MQ: /* FALLTHROUGH */ + /* fall through */ + case IMX8MQ: reset_control_assert(imx6_pcie->pciephy_reset); reset_control_assert(imx6_pcie->apps_reset); break; @@ -415,7 +416,8 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6SX_GPR12_PCIE_TEST_POWERDOWN, 0); break; - case IMX6QP: /* FALLTHROUGH */ + case IMX6QP: + /* fall through */ case IMX6Q: /* power up core phy and enable ref clock */ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1, @@ -607,7 +609,7 @@ static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6SX_GPR12_PCIE_RX_EQ_MASK, IMX6SX_GPR12_PCIE_RX_EQ_2); - /* FALLTHROUGH */ + /* fall through */ default: regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6Q_GPR12_PCIE_CTL_2, 0 << 10); @@ -731,7 +733,8 @@ static void imx6_pcie_ltssm_enable(struct device *dev) IMX6Q_GPR12_PCIE_CTL_2); break; case IMX7D: - case IMX8MQ: /* FALLTHROUGH */ + /* fall through */ + case IMX8MQ: reset_control_deassert(imx6_pcie->apps_reset); break; } @@ -1076,7 +1079,8 @@ static int imx6_pcie_probe(struct platform_device *pdev) } break; case IMX8MQ: - case IMX7D: /* FALLTHROUGH */ + /* fall through */ + case IMX7D: imx6_pcie->pciephy_reset = devm_reset_control_get_exclusive(dev, "pciephy"); if (IS_ERR(imx6_pcie->pciephy_reset)) {