From patchwork Sun Feb 2 12:59:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 11361589 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 53DDA921 for ; Sun, 2 Feb 2020 13:00:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1310A2067C for ; Sun, 2 Feb 2020 13:00:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Tqt06dwf"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JgIz0s5w" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1310A2067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: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:In-Reply-To:References: List-Owner; bh=ddLXP4mXBQcZpuVZSpaOiHxQT7wJEKnrT/wBXhhpBvc=; b=Tqt06dwf8XjiTz T8Kq+mHGDsLQM0q//d+Egihb4RGlJTUTiDhR6VpV5G/1id6qMWAspjzOYdGLGU3FVLdxANoncFPeT zDwnZihG08oKQFQluVqK1IaLu/yTPunYKEvVrdoaHLjdmOooPm5/bi3A2J1enCC7PzeSdePfzXDbb lABlOesvAIu1r+Av/8C0DMy7KZ5jw6KjwmGZ4CgPtuX5Reflh8oalChI7h4LVjpiZt4Zchhfr8rqd pwli1AGtwLjN+wQMjOIKOR+PlLirrGmG0IEKDyg56lFNq3D2BeNoA+Ghb5vxOSSLwUruwqMJSmi1f mAoB79rSjs3RlqcHL2Pw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyErD-0007od-03; Sun, 02 Feb 2020 13:00:11 +0000 Received: from mail-yw1-xc44.google.com ([2607:f8b0:4864:20::c44]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyEr9-0006fV-AB for linux-arm-kernel@lists.infradead.org; Sun, 02 Feb 2020 13:00:08 +0000 Received: by mail-yw1-xc44.google.com with SMTP id l22so10484596ywc.8 for ; Sun, 02 Feb 2020 05:00:02 -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:mime-version :content-transfer-encoding; bh=AH44IHY8LM9hNPEbRtsEm9RIhekLfcrQmhRGmajQBHY=; b=JgIz0s5wSKGBK+tfeB5/vDAeI091XJabpzldKR9UAgT7pUXlJhhRG5HCDBI5LeKfic Czkl7Js+nI6YwGu4UXoN9oPjZqLGLeDYTnn+m2bo3FGLo4OzdYElucGW886I+Rz3JdC9 OX1yzKc/bUZyKyP3MdPowqOhhdcpiN+8WIHZ1l5quntT1INEmQ2oaeLEOBBMBegZbvbc jHlXkx4UL7Snn9psqzZa+EPnLs7z1hbAaU4xuxTWP0t9VgawcsH3vtNergQT5pFOER57 aOmCkJpKdgjgN0JpMWCwHkid8uEPyhFBjusCkDfrShvbsvthHYTMKNbX33rnbe5f99g6 qgUw== 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:mime-version :content-transfer-encoding; bh=AH44IHY8LM9hNPEbRtsEm9RIhekLfcrQmhRGmajQBHY=; b=CmO/BUIgvpD2uLC9+0Ptgnbng+8/3tYbPAqV7OGXbkQrPqFgtE4iTPibmCwsrkLJUf L3oi52owNCkFAsLVxb5N9zOae4QZrlH7UXC75nzFJKM8/W8mtc9TFs+JC78Ya4bsGXF1 ScnkQN64XDl3pxHQ6fDrboN7APwS8BYNi8Z8CgQHnvQ2l1Xo4LBhC0LFVNW6Z+X6mrm6 olmI2+DcHetwNhyXM4kOG2T9w2wfkKRb+QVyM7k8f/3a+4R114DGDG88Y5hGgH6TGM+M vNDlqBAYoH11VmtaCZRvkr0BHUptzL7CraeEd493hApOhrTGuCYfyE3R1iFTIPMDzMBB An1Q== X-Gm-Message-State: APjAAAU0j+8HpQN5O0i6tEYH5UX24lGoYyhRnLKuoUMrU99j1WnG03Rw SZ9U5yYwlRJdXD0jWfzVQWM= X-Google-Smtp-Source: APXvYqy+sjtTqD37PK/Ym1JLqM0bJO+tVP/hDjqdMipCl/DoBz8JAHptrKJ0YAzBNhEkhgjpLJA9RA== X-Received: by 2002:a0d:d1c6:: with SMTP id t189mr14350608ywd.393.1580648401835; Sun, 02 Feb 2020 05:00:01 -0800 (PST) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id m137sm7090013ywd.108.2020.02.02.05.00.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2020 05:00:01 -0800 (PST) From: Adam Ford To: linux-spi@vger.kernel.org Subject: [PATCH V2 1/5] spi: fspi: enable fspi on imx8qxp and imx8mm Date: Sun, 2 Feb 2020 06:59:46 -0600 Message-Id: <20200202125950.1825013-1-aford173@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200202_050007_379387_37CAAAE3 X-CRM114-Status: GOOD ( 10.43 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:c44 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [aford173[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [aford173[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Fabio Estevam , Shawn Guo , Sascha Hauer , Ashish Kumar , Rob Herring , linux-kernel@vger.kernel.org, Yogesh Gaur , Mark Brown , NXP Linux Team , Pengutronix Kernel Team , Han Xu , Adam Ford , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Han Xu Pull in this patch from NXP's upstream repo to enable fspi on imx8qxp and imx8mm Signed-off-by: Han Xu Signed-off-by: Adam Ford --- V2: Reorder s-o-b lines to give credit in proper order. diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c index 8c5084a3a617..00c7899428a1 100644 --- a/drivers/spi/spi-nxp-fspi.c +++ b/drivers/spi/spi-nxp-fspi.c @@ -324,6 +324,22 @@ static const struct nxp_fspi_devtype_data lx2160a_data = { .little_endian = true, /* little-endian */ }; +static const struct nxp_fspi_devtype_data imx8mm_data = { + .rxfifo = SZ_512, /* (64 * 64 bits) */ + .txfifo = SZ_1K, /* (128 * 64 bits) */ + .ahb_buf_size = SZ_2K, /* (256 * 64 bits) */ + .quirks = 0, + .little_endian = true, /* little-endian */ +}; + +static const struct nxp_fspi_devtype_data imx8qxp_data = { + .rxfifo = SZ_512, /* (64 * 64 bits) */ + .txfifo = SZ_1K, /* (128 * 64 bits) */ + .ahb_buf_size = SZ_2K, /* (256 * 64 bits) */ + .quirks = 0, + .little_endian = true, /* little-endian */ +}; + struct nxp_fspi { void __iomem *iobase; void __iomem *ahb_addr; @@ -1076,6 +1092,8 @@ static int nxp_fspi_resume(struct device *dev) static const struct of_device_id nxp_fspi_dt_ids[] = { { .compatible = "nxp,lx2160a-fspi", .data = (void *)&lx2160a_data, }, + { .compatible = "nxp,imx8mm-fspi", .data = (void *)&imx8mm_data, }, + { .compatible = "nxp,imx8qxp-fspi", .data = (void *)&imx8qxp_data, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, nxp_fspi_dt_ids); From patchwork Sun Feb 2 12:59:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 11361593 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 289741395 for ; Sun, 2 Feb 2020 13:00:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EFA9220658 for ; Sun, 2 Feb 2020 13:00:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oGhOp5vN"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BcLLBaeo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFA9220658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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=YEyRulEVCZWYblWM/vz//kh6YJNSf82TThQ2MTeyM1E=; b=oGhOp5vNFASY/s NIQffhiDzxDazLF4VSgzoFX7hrRLzNE+sa6CEOHF8+XBoYraVFgOOgw6rwyUgy/EMIfrUJcn1jiAt vwA8bGjwJw1Kzge+4+mqle+AEbEHBLZFNyflq8tova5QsBqgEDx32GQ1LP5Vk2ZKbsj/930/rFB0U H0Q86dPmhfxwgqIZR6FyUNHv3tGBjzs5gEItFeY4DHaYO0VkC09AHXTKR+L08AqnGKjFnBOQ8iJj8 KLZnSoKXZlFuc0zdit8xCMHLjZDKD8XBrfk2qeLbSKVsfAvVCYxaqHjlKbqrjOsYcWUqRHU7meRW6 yafZexDbFNDKb6LLsoNQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyErK-0007wH-3Q; Sun, 02 Feb 2020 13:00:18 +0000 Received: from mail-yw1-xc44.google.com ([2607:f8b0:4864:20::c44]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyEr9-0007JK-AJ for linux-arm-kernel@lists.infradead.org; Sun, 02 Feb 2020 13:00:08 +0000 Received: by mail-yw1-xc44.google.com with SMTP id i190so10518350ywc.2 for ; Sun, 02 Feb 2020 05:00:05 -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=e6rN6yJZ4eWmG/f569Zn9OH6A2Ob5WD1MTBuZuc6gi8=; b=BcLLBaeoTaZLKReT7xF4F380ZCod3MrDwYOq1eGTKZIqQMNmr/gbg7LiBc2mA2N0iG WFS59R7WRetlc/VIrBYgx7UAHtA5axveGDhJDGDTKfxjTZr5i8n9fTCYYGGiF1FsRTj/ 7g1c8UYiok0vKv/IDcAXqKagTPllBhPvvG40EgkYEABz+U0iGnZf/YwWnmQnzVGmNOqe oJVfDLUqkBD1frBo0JfA+4FYGgFai5IO5sAzpX6MdM46TgBXUIt5O1eYstP2Vq8FKf7i E2pvLkUffEnd4hICkRz/YirAScywfADg/ll1QZ0CXZoXVfHHPVhIHuJ25hWb4ms+mOsh ckRQ== 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=e6rN6yJZ4eWmG/f569Zn9OH6A2Ob5WD1MTBuZuc6gi8=; b=NWry4LuaRoUzkrwmRQctxUTQjCcDw/Lk8rNuoN+aBUM5F3Xlj0rx5LkQTMqT4eZAid iSwYpnItoojp3Zy4ng2xHcNBXZgp07MH3tyArJ43wv5H1siTsAwwcO/Bg9/ODL9YtgF/ G1kZ2ZnL0nXjRnZeUDf9iOYSX8cY9PJXWRSsZoFFNewjC7NkCxlgot4PRnm8uaUDs9He ArGMP5CPdpHkOQgQmh820xKtBt5WulCs+StxEWUM2QqbCTMDGDoiOM01eK7EFWHsRhkH SAm1j2rDy4Bvez+/hQOaKUc3nGbi1nxA5UE/o27kVaYB2cyZZDoM9ClVrWtFjSc6Xkdt UFvA== X-Gm-Message-State: APjAAAX4vivxDJQNMvQD1aFkxzBQerRGXX60YjHLiWK08hIItL86Pwoc +BmvtNeaaCDw/dhsWE8PtG0= X-Google-Smtp-Source: APXvYqx70kY7wgGOPXJWRZfeWiF9DHnZy7tefw85FuCVEcE9QFZkCaWdjfQvnlYHtM2j9I6yKoVLNA== X-Received: by 2002:a81:6055:: with SMTP id u82mr9702017ywb.35.1580648403893; Sun, 02 Feb 2020 05:00:03 -0800 (PST) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id m137sm7090013ywd.108.2020.02.02.05.00.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2020 05:00:03 -0800 (PST) From: Adam Ford To: linux-spi@vger.kernel.org Subject: [PATCH V2 2/5] spi: fspi: dynamically alloc AHB memory Date: Sun, 2 Feb 2020 06:59:47 -0600 Message-Id: <20200202125950.1825013-2-aford173@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200202125950.1825013-1-aford173@gmail.com> References: <20200202125950.1825013-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200202_050007_376632_EB1B1193 X-CRM114-Status: GOOD ( 14.98 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:c44 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [aford173[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [aford173[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Fabio Estevam , Shawn Guo , Sascha Hauer , Ashish Kumar , Rob Herring , linux-kernel@vger.kernel.org, Yogesh Gaur , Mark Brown , NXP Linux Team , Pengutronix Kernel Team , Han Xu , Adam Ford , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Han Xu Apply patch from NXP upstream repo to dynamically allocate AHB memory as needed. Signed-off-by: Han Xu Signed-off-by: Adam Ford --- V2: Reorder s-o-b lines to give credit in proper order. diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c index 00c7899428a1..23abf5ae318e 100644 --- a/drivers/spi/spi-nxp-fspi.c +++ b/drivers/spi/spi-nxp-fspi.c @@ -307,6 +307,7 @@ #define POLL_TOUT 5000 #define NXP_FSPI_MAX_CHIPSELECT 4 +#define NXP_FSPI_MIN_IOMAP SZ_4M struct nxp_fspi_devtype_data { unsigned int rxfifo; @@ -345,6 +346,8 @@ struct nxp_fspi { void __iomem *ahb_addr; u32 memmap_phy; u32 memmap_phy_size; + u32 memmap_start; + u32 memmap_len; struct clk *clk, *clk_en; struct device *dev; struct completion c; @@ -657,12 +660,35 @@ static void nxp_fspi_select_mem(struct nxp_fspi *f, struct spi_device *spi) f->selected = spi->chip_select; } -static void nxp_fspi_read_ahb(struct nxp_fspi *f, const struct spi_mem_op *op) +static int nxp_fspi_read_ahb(struct nxp_fspi *f, const struct spi_mem_op *op) { + u32 start = op->addr.val; u32 len = op->data.nbytes; + /* if necessary, ioremap before AHB read */ + if ((!f->ahb_addr) || start < f->memmap_start || + start + len > f->memmap_start + f->memmap_len) { + if (f->ahb_addr) + iounmap(f->ahb_addr); + + f->memmap_start = start; + f->memmap_len = len > NXP_FSPI_MIN_IOMAP ? + len : NXP_FSPI_MIN_IOMAP; + + f->ahb_addr = ioremap_wc(f->memmap_phy + f->memmap_start, + f->memmap_len); + + if (!f->ahb_addr) { + dev_err(f->dev, "failed to alloc memory\n"); + return -ENOMEM; + } + } + /* Read out the data directly from the AHB buffer. */ - memcpy_fromio(op->data.buf.in, (f->ahb_addr + op->addr.val), len); + memcpy_fromio(op->data.buf.in, + f->ahb_addr + start - f->memmap_start, len); + + return 0; } static void nxp_fspi_fill_txfifo(struct nxp_fspi *f, @@ -822,7 +848,7 @@ static int nxp_fspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) */ if (op->data.nbytes > (f->devtype_data->rxfifo - 4) && op->data.dir == SPI_MEM_DATA_IN) { - nxp_fspi_read_ahb(f, op); + err = nxp_fspi_read_ahb(f, op); } else { if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT) nxp_fspi_fill_txfifo(f, op); @@ -992,9 +1018,8 @@ static int nxp_fspi_probe(struct platform_device *pdev) /* find the resources - controller memory mapped space */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap"); - f->ahb_addr = devm_ioremap_resource(dev, res); - if (IS_ERR(f->ahb_addr)) { - ret = PTR_ERR(f->ahb_addr); + if (IS_ERR(res)) { + ret = PTR_ERR(res); goto err_put_ctrl; } @@ -1073,6 +1098,9 @@ static int nxp_fspi_remove(struct platform_device *pdev) mutex_destroy(&f->lock); + if (f->ahb_addr) + iounmap(f->ahb_addr); + return 0; } From patchwork Sun Feb 2 12:59:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 11361591 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2BB051395 for ; Sun, 2 Feb 2020 13:00:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 085BB20658 for ; Sun, 2 Feb 2020 13:00:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pbaF+Hlx"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a75vYtUh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 085BB20658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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=0hIArYzRO/W0Rqq4yFiMfGs5dVBdrV+toI4aUVLDIh8=; b=pbaF+HlxeFYpQc R6RPehsnZmOCLDG0KFmaLalATJbtADCXHGd0qAlQbC/0AT8I8IvERl04vkR7RcAOEr62ekNw05ET4 mFT9IhuhG1ERz07XRK9uacU2+Jnu3QboK6J+avGmEBHAPuRToa7QnMEsr4G7PAUAIKuvvUdVz4Z0W Aq8X8+kbHF7wixraaoQdSgPbM7I59MHa5600YRaLYJZMvHcfOIkLqntCwqm51rUpWP87v5uFZcqNi rBE3JApo2Aq8S6oZbweR46O/Bz2GRiGlbsAul07kAS7raKzab9gAt3eH7nk+R3QHG+mRpQX1lwt56 7+kcnQltwCBwOqaadCig==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyErb-0008DZ-ML; Sun, 02 Feb 2020 13:00:35 +0000 Received: from mail-yw1-xc42.google.com ([2607:f8b0:4864:20::c42]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyEr9-0007ce-OQ for linux-arm-kernel@lists.infradead.org; Sun, 02 Feb 2020 13:00:09 +0000 Received: by mail-yw1-xc42.google.com with SMTP id b81so10496218ywe.9 for ; Sun, 02 Feb 2020 05:00:07 -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=PfOxBTJAq7rO8Qs/IIR9mdFaCWzDGndxM56W0qKFsAU=; b=a75vYtUh5Rw+ngxoxAmQkogk5nJe9heNo+fnZRxSSEHgH73eFaWIHF5reUhTDOHEJQ aRnxGC4WbMoY4/UwuR6aHmk/dk9ay+DE550KAn/PzvUVIbz5RZeqjP+bime+eCCYGwpj 9Uvc6jHxEitN19jr219aKiZ519i/0Z3Utm4dj0rGiifnKtweBFniXv5J7SjkNJ0VdIsL pC1NZBPL6txaNR9fPe1VSSIhYAxbyEiIxAi/s9CONTP9MMSwfFPXd5r1MrsLPxmZNhQ6 0NRKahUUTnwHIrCsrt+FYHYL+pEGPIYvcK/6KPwna0hBExEQtbmNST7r/lRId4b2kBI5 3veA== 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=PfOxBTJAq7rO8Qs/IIR9mdFaCWzDGndxM56W0qKFsAU=; b=R0G6bB1LJWWsHgpMClbYGa79AA/IeucwmigFvA33kLXBoFrSvzf9wYPw4x1qRLNRRd UD6TWdnVscE5oWsg5E4Qx+BkwR5Czk4YuGqN13g0H0DxXP692ByrewwcFEMHgw9lbt4L 5m1ixLD/6SXn3H9TuLLsf5Kk7xA1Be9Co/9qOhSsCM/t4qmiN2p4lAKSvqzka8qaXJY1 bpyLmM+53rmJPI8rFiE42aRy0UjFw+B81lUycRPsQ8kkLOhDw4TgjgrHmRhmEWThkq+6 K1DuC3x2M4EDMifR5q6BRNW4OnnoK1HQMOPm8S9p2+tqL+RNM1uGoqQrNiBTlHfl3NZP u52g== X-Gm-Message-State: APjAAAUicNvj8waJGHTAyTWUTLs3R5LLSP5Q1FxKmhWbWAaBc5y3WInD tIXEI+C79K2u/FA3KHtC7Kw= X-Google-Smtp-Source: APXvYqwDc7mA8g8RNuZ15bUqAjJpKzEa7MvRr95zljOsGFKvcY0P40xqocrFDYmUh+HokkR8uI2csQ== X-Received: by 2002:a81:39c4:: with SMTP id g187mr14378569ywa.42.1580648406315; Sun, 02 Feb 2020 05:00:06 -0800 (PST) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id m137sm7090013ywd.108.2020.02.02.05.00.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2020 05:00:05 -0800 (PST) From: Adam Ford To: linux-spi@vger.kernel.org Subject: [PATCH V2 3/5] spi: spi-nxp-fspi: Enable the Octal Mode in MCR0 Date: Sun, 2 Feb 2020 06:59:48 -0600 Message-Id: <20200202125950.1825013-3-aford173@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200202125950.1825013-1-aford173@gmail.com> References: <20200202125950.1825013-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200202_050007_799158_5BFE112B X-CRM114-Status: UNSURE ( 9.00 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [aford173[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [aford173[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:c42 listed in] [list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Fabio Estevam , Shawn Guo , Sascha Hauer , Ashish Kumar , Rob Herring , linux-kernel@vger.kernel.org, Yogesh Gaur , Mark Brown , NXP Linux Team , Pengutronix Kernel Team , Han Xu , Adam Ford , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Han Xu Apply patch from NXP upstream repo to Enable the octal combination mode in MCR0 Signed-off-by: Han Xu Signed-off-by: Adam Ford --- V2: Reorder s-o-b lines to give credit in proper order. diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c index 23abf5ae318e..019f40e2917c 100644 --- a/drivers/spi/spi-nxp-fspi.c +++ b/drivers/spi/spi-nxp-fspi.c @@ -913,8 +913,9 @@ static int nxp_fspi_default_setup(struct nxp_fspi *f) fspi_writel(f, FSPI_DLLBCR_OVRDEN, base + FSPI_DLLBCR); /* enable module */ - fspi_writel(f, FSPI_MCR0_AHB_TIMEOUT(0xFF) | FSPI_MCR0_IP_TIMEOUT(0xFF), - base + FSPI_MCR0); + fspi_writel(f, FSPI_MCR0_AHB_TIMEOUT(0xFF) | + FSPI_MCR0_IP_TIMEOUT(0xFF) | (u32) FSPI_MCR0_OCTCOMB_EN, + base + FSPI_MCR0); /* * Disable same device enable bit and configure all slave devices From patchwork Sun Feb 2 12:59:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 11361595 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 973BC921 for ; Sun, 2 Feb 2020 13:00:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7300C20658 for ; Sun, 2 Feb 2020 13:00:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uihlW4/5"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WqHN4WNp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7300C20658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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=xk4MHTWVWgmic2BcNHiOuU+Sp118CBd8wQhzCu54jns=; b=uihlW4/5zrwkmb A9v2btlc6pwsHfnAtYPWRUfflQFn1aVpbVL9xaSafz5KkrL0SXtncdEKhwuhJ0sla2Ftg+jW87frv upjyo19xen6C3rF2fPdcuHYpIovfIbr21NBdzjMmLTLOl/k0yHkswYNqlgo9MM3ISz7qcZ4qSL2iq DA5uGTp8jqZfYpFRUQl8NMSZu0hM0ig0aT0powUYYxmNmkN82l7J0DbSVbHD9TulqJJNrqATwL+rW l4GzLfGoBjIEFvkBykaJZqD+5w26/582pa/krMUAcehuj6prETnsem7FCncVh0jx0J0cgLvW5jsKq taiohRo4xS4f4p0b/R7w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyErt-0008V7-Bx; Sun, 02 Feb 2020 13:00:53 +0000 Received: from mail-yw1-xc31.google.com ([2607:f8b0:4864:20::c31]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyErD-0007oV-Ex for linux-arm-kernel@lists.infradead.org; Sun, 02 Feb 2020 13:00:12 +0000 Received: by mail-yw1-xc31.google.com with SMTP id a125so10492738ywe.12 for ; Sun, 02 Feb 2020 05:00:09 -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=g41y4TduYyE4Zq7XaNgfQZ1uBYpJA8BiIYoPp6mgrtE=; b=WqHN4WNpKRHbz5KbVH2wcfUM4s+eLtY9OB1l0MbE5xT7J+rxS0aIn+7YdN6npIGcj4 ufTxwcx8G+4HpLKqBnUZ+rvW2TGwx78OtAVlQOf7mjYPqIFlD7Us5llDzZ5gjQtPWhQ7 chCniMaQ6xBLI1Key30/9fisPEg9efhoDskNpki8mmFHbofIif5s1tgZyfgCuGTz75/V lszW4MSOXINJDGYfCFGrAflmi7s0zwSPrQhaHvJjCvpMpn1ePJ1NKK1T6L/GtoTOAkdr kmylhWwtX6Ed9iSE6LJNIQm8SX68upoP9DQz4m3rCCK3LEnZqXgCu2DhTf7l2SXfOky6 OxTg== 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=g41y4TduYyE4Zq7XaNgfQZ1uBYpJA8BiIYoPp6mgrtE=; b=NVQeQB4F0iBf0LU3j+O5lL9TmaLPwi8dyLYatLGxEMXkyJ+RXrNVBaANI8QQk/4XtB 1Y+6hSRM+DjAxuLpFoXmCZ4vub3vVjJihYFpfu3SENacyCkRaz2jj/UpfBYkFgOXy8qp 2Fw5Zan4DHikLum9QAPMvLHuNfyhbJuqNQUTL3mkUHYIaAJFTuzu9BmYk+QgpgqwNMs/ eYBMTHRp4ISAcOGkNikoOBRifqmKGQ7hErhmLihz+L97ou7n2hEJG0y0/GMivDyFeZJs ABp7BlYcFQgveT2IDVOTpt4Zc4krvEpO+U4CeGGHrKfxrpKfIB+mHmQAUmlFRF7EnGFU JuVg== X-Gm-Message-State: APjAAAV0dnjrIq/dta0f5qAHh6yjqkaA7B+tTxsGmtfFez4wmXCQBBZk Y5+8y3QjsHwuLaayJn8RHc4= X-Google-Smtp-Source: APXvYqxESfjVSs4DtOWtMq7VLTeIVuSJZKG8ga+iAtfaG5fC/Sjp0XF06H7gjLbeQcvU/yBzLMS43Q== X-Received: by 2002:a81:a703:: with SMTP id e3mr15769631ywh.71.1580648408393; Sun, 02 Feb 2020 05:00:08 -0800 (PST) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id m137sm7090013ywd.108.2020.02.02.05.00.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2020 05:00:07 -0800 (PST) From: Adam Ford To: linux-spi@vger.kernel.org Subject: [PATCH V2 4/5] dt-bindings: spi: spi-nxp-fspi: Add support for imx8mm, imx8qxp Date: Sun, 2 Feb 2020 06:59:49 -0600 Message-Id: <20200202125950.1825013-4-aford173@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200202125950.1825013-1-aford173@gmail.com> References: <20200202125950.1825013-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200202_050011_504829_95B67D91 X-CRM114-Status: UNSURE ( 9.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:c31 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [aford173[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [aford173[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Fabio Estevam , Shawn Guo , Sascha Hauer , Ashish Kumar , Rob Herring , linux-kernel@vger.kernel.org, Yogesh Gaur , Mark Brown , NXP Linux Team , Pengutronix Kernel Team , Adam Ford , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add support for nxp,imx8qxp-fspi and nxp,imx8mm-fspi do the bindings document. Signed-off-by: Adam Ford --- V2: No change diff --git a/Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt b/Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt index 2cd67eb727d4..7ac60d9fe357 100644 --- a/Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt +++ b/Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt @@ -2,6 +2,9 @@ Required properties: - compatible : Should be "nxp,lx2160a-fspi" + "nxp,imx8qxp-fspi" + "nxp,imx8mm-fspi" + - reg : First contains the register location and length, Second contains the memory mapping address and length - reg-names : Should contain the resource reg names: From patchwork Sun Feb 2 12:59:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 11361597 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3E0A7921 for ; Sun, 2 Feb 2020 13:01:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F0CBB20658 for ; Sun, 2 Feb 2020 13:01:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nVDCydcc"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ijQUUDtG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0CBB20658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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=1264eUBmfH78E5HgwZ0pXtIY2rrSeX/koXAOHdQDCTQ=; b=nVDCydccjtS0bU oXT/V0QsQpPSd9Qh+Lz5lzqd7E3zKZ5Mll+KoxJeaPMhGG5hmkYZXtP5g9qQ1ZHGAR7ENspZDg+ax 7eV5KG6D1wB6LlUILxduhw+lvw2ovMVsxzaiGEZT1TpGmJoUBkCb1wtlMC4cMZtk//xCCRQPuSoMJ ApD5zI95+xf/obRMiOYVLA6aLGhvB3UhPkfHFd5ovHLWdRU6JpxRa2OdZD6HYcDw/2jpsJNLauQTG hCXtqnt6FHkkiyKvFXSz+WLQG8KRiEhCvYVqcNP6cJqzN5NxciCM2hrj1JUnjGPOBwlA4DBuRTPmJ KgDUS9zfhj53FSMI/cMg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyEs4-0000Fs-Lg; Sun, 02 Feb 2020 13:01:04 +0000 Received: from mail-yw1-xc43.google.com ([2607:f8b0:4864:20::c43]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iyErD-0007oe-K4 for linux-arm-kernel@lists.infradead.org; Sun, 02 Feb 2020 13:00:13 +0000 Received: by mail-yw1-xc43.google.com with SMTP id z141so10004408ywd.13 for ; Sun, 02 Feb 2020 05:00:11 -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=SsuOPfBklrufoFfToRN135Zc2rs5UCZymJ1rqf8A5fk=; b=ijQUUDtGpKwfUbhvL5SVvpt+vqVbACJ6PiX35Y/j3JCg7NaDX+nNFSzWxCY9E/N1as KJIQssRUYrJ5ld+sdSLiWQT9E2gNxGNdFY/oX0piRs9BzNuBEK/HbIbQKIjNgviAQnq9 mIwSnp/k7mxRI5y1lQ4VZyUsZdxrL65GNXGr5NXT/beG5LN/rl/Un2kFCUF4RqpQMCJ3 hNqY4MRMggzNmJ5mwJqGINLoxEJWLQO70fK6nhvoDmmskdGFHYtIE9nS/HD6aXZvm6k1 QGoty3d4PEiK/vAk9l/jlWPHACltCHxjsjYehOde4gXI1v3qJwEgchSPbFBAZIN7TZwS vUWw== 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=SsuOPfBklrufoFfToRN135Zc2rs5UCZymJ1rqf8A5fk=; b=JTmwuCnIgT0XOxtmNqnATEX5GRkSMOIp8j9+2UTd34oejsBhNMeA/9cFtp2QbpICd2 Vglsc7E1sKvSznzaamYyt67z+YYDUOIE4goQuxwQa+XPAdF1jYTvya+xdJ51NbEiFjbM 61jTMpXypOwoV8Mo5vP+++i0PBYWUl57YRUxwIcRS3RbEsEDDiVleXo7Ej6ytHcoQZrZ 4rSeuO5FTte9g70JpkFKseJBLGNj7Ir4nvS5RCIhTYJRjXlXxc14GempJgpXYb6K2JSg 90FD0hnkP2vYhkn+E024lGoduaY8sOnLrRbj/0gLtl25MXQg3bTV04AT4RUH9Aw7mzS9 +F5g== X-Gm-Message-State: APjAAAW8zNSBKF1uYWapXsv/I9I03oKP5hw9k8sCMdx87ymq0DHtlhxv wgX2nf8SsRp8mzhG+PA0w80= X-Google-Smtp-Source: APXvYqxcps2+b1RjCFnMPuOPzXi0K2uJFw8vIjvBLVbqj1s91p0IDLSQuX06wGYKgxezMcLqCo3DQw== X-Received: by 2002:a0d:e802:: with SMTP id r2mr15745234ywe.471.1580648410303; Sun, 02 Feb 2020 05:00:10 -0800 (PST) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id m137sm7090013ywd.108.2020.02.02.05.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2020 05:00:09 -0800 (PST) From: Adam Ford To: linux-spi@vger.kernel.org Subject: [PATCH V2 5/5] arm64: dts: enable fspi in imx8mm dts Date: Sun, 2 Feb 2020 06:59:50 -0600 Message-Id: <20200202125950.1825013-5-aford173@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200202125950.1825013-1-aford173@gmail.com> References: <20200202125950.1825013-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200202_050011_725503_228D516C X-CRM114-Status: UNSURE ( 9.74 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:c43 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [aford173[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [aford173[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Fabio Estevam , Shawn Guo , Sascha Hauer , Ashish Kumar , Rob Herring , linux-kernel@vger.kernel.org, Yogesh Gaur , Mark Brown , NXP Linux Team , Pengutronix Kernel Team , Han Xu , Adam Ford , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Pull in upstream patch from NXP repo to: enable fspi in imx8mm DT file Signed-off-by: Han Xu Signed-off-by: Adam Ford --- V2: Reorder s-o-b lines to give credit in proper order. diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index 1e5e11592f7b..679769fe6cab 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -558,7 +558,21 @@ aips3: bus@30800000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - ranges = <0x30800000 0x30800000 0x400000>; + ranges = <0x30800000 0x30800000 0x400000>, + <0x8000000 0x8000000 0x10000000>; + + flexspi: spi@30bb0000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "nxp,imx8mm-fspi"; + reg = <0x30bb0000 0x10000>, <0x8000000 0x10000000>; + reg-names = "fspi_base", "fspi_mmap"; + interrupts = ; + clocks = <&clk IMX8MM_CLK_QSPI_ROOT>, + <&clk IMX8MM_CLK_QSPI_ROOT>; + clock-names = "fspi", "fspi_en"; + status = "disabled"; + }; ecspi1: spi@30820000 { compatible = "fsl,imx8mm-ecspi", "fsl,imx51-ecspi";