From patchwork Wed Jul 19 11:48:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Sahu X-Patchwork-Id: 790983 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ieEHWehj"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="sc3XfxI8"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="fqevmUid"; dkim=neutral (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="GFS47mKg"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xCG3Y04vCz9s83 for ; Wed, 19 Jul 2017 22:06:49 +1000 (AEST) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=01eQUR5qpTokNTiTX3Ffyobxg4yt8H+W0CsfwNIsrUU=; b=ieEHWehjfAL3R7SKOemWUnwwsv jXcUEjSFzKbJqxcn68bmV4h90TNOs2bGoztHrWICc4e7GPNPg+hLRQKl+Eph+pjED9AKvg9kveH/l izkmkb/hATKNK6HVXzTuy+vqXaEHpL1iW8ZRVqiLdI3vIqgLGCoLeq9coBUdvjACx3NtmlziOqLg/ XdBCjSkHmocDs7TJ4EtM5pr6phx3GrWKTkDqrcjI6zKmOAHYdWlxCbmOz5J4z2RWzZc43kiCSOKTF pDepmgRQn/KlOrARgmrTjYv1C7iTln4xnpfvto/vXhj6nWSi8cOhzQ+xzpKSKUGjTTA43GGdH/WFR Cq/DYIjg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dXnkV-00085n-0N; Wed, 19 Jul 2017 12:06:39 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXnkT-0007xF-Q3 for linux-mtd@bombadil.infradead.org; Wed, 19 Jul 2017 12:06:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=DGN00UAUntHtKAElTirswJEMY875kLdR0KwEjWXZS+s=; b=sc3XfxI8XX8jgO7g22ReDXoEP CfDB9HIuUIMatd4JSp8cfAiL2X4QTbFAP2t3vB6Om9MsRHWZQkgcN6sxgv9LC6bbI0LwDp8CZbN2Y K++nb0Gq7IJ/AWskaLbyMewXvFw9ok4nQKKCg2W24jn6R/ljr/cdzzhEnYWfMm+OnCjUot1cQuZp+ ZrssI6J1oXShEgvOlULr4lieybuSYBIm2hYnvGEA8iWbXZOBsD5YrXvdFT4xbp9XWc8mahzwbEKdp +OgQHW6G36a7HwFEVJGBtUCEqCoQafQ6jrLXsd7JqPe9M5GpAahPR24IwCUuETbJei7+7rn03e7N4 7fo2owGpA==; Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXnXm-0002cl-0K for linux-mtd@lists.infradead.org; Wed, 19 Jul 2017 11:53:31 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E0FA161472; Wed, 19 Jul 2017 11:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1500465190; bh=hbS+mRtUOM/a/wnx4DazR0h0Piq8wzFH+OBJOrJVStQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fqevmUidTFe1PV1QQGw7PuHY1W1i04OKA2FK1b8xWoWJXXb6Yb3/0EN1577zRiIJA Xk4ljsHzMV+uK85hqYD6vAFZAMwaauAsfRuHFEXYcY70vhTCxM9/KIQKdi4z6/x6Xr XfCTuqg2bHbOk7qH6OuF4mREanv0uVCPmwghVio4= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from absahu-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: absahu@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 1147C615AB; Wed, 19 Jul 2017 11:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1500465185; bh=hbS+mRtUOM/a/wnx4DazR0h0Piq8wzFH+OBJOrJVStQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GFS47mKgYR6+tbag+lRfE07N/GikqLcdeNcBoy+ussLqUWoCjSUfRfZsRec1CkJLk Pl5Qai7WMdQZRnUPUmtOpRN4Z1hSyx7+W9AHYo1Mg5eH/2pGKK0kZCpsSMKf/zK7GF Ux9P/EMTU3N4VoV8Uoy1zIeBmWOMRGF/cPkVKHkA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 1147C615AB Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=absahu@codeaurora.org From: Abhishek Sahu To: dwmw2@infradead.org, computersforpeace@gmail.com, boris.brezillon@free-electrons.com, marek.vasut@gmail.com, richard@nod.at, cyrille.pitchen@wedev4u.fr, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH v2 25/25] mtd: nand: qcom: support for QPIC version 1.5.0 Date: Wed, 19 Jul 2017 17:18:13 +0530 Message-Id: <1500464893-11352-26-git-send-email-absahu@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500464893-11352-1-git-send-email-absahu@codeaurora.org> References: <1500464893-11352-1-git-send-email-absahu@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170719_125330_311181_714E1C10 X-CRM114-Status: GOOD ( 21.10 ) X-Spam-Score: -4.3 (----) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (-4.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [198.145.29.96 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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 X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, architt@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Abhishek Sahu , linux-mtd@lists.infradead.org, andy.gross@linaro.org, sricharan@codeaurora.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The current QCOM NAND driver only supports version 1.4.0 QCOM QPIC NAND controller. This patch adds the support for version 1.5.0 which contains some of the registers at different offsets. The driver data contains the register offset field which is being initialized with its corresponding register offsets array. A new compatible string has been added for version 1.5.0 in BAM mode which uses version 1.5.0 register offsets. Signed-off-by: Abhishek Sahu --- drivers/mtd/nand/qcom_nandc.c | 52 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c index 0896e56..52173f1 100644 --- a/drivers/mtd/nand/qcom_nandc.c +++ b/drivers/mtd/nand/qcom_nandc.c @@ -445,8 +445,9 @@ struct qcom_props { const u32 *reg_offsets; }; -/* Mapping table which contains the actual register offsets */ -static const u32 nandc_reg_offsets[] = { +/* Mapping tables which contains the actual register offsets */ +/* NAND controller Version 1.4.0 mapping table */ +static const u32 reg_offsets_v1_4_0[] = { [NAND_FLASH_CMD] = 0x00, [NAND_ADDR0] = 0x04, [NAND_ADDR1] = 0x08, @@ -479,6 +480,40 @@ struct qcom_props { [NAND_READ_LOCATION_3] = 0xf2c, }; +/* NAND controller Version 1.5.0 mapping table */ +static const u32 reg_offsets_v1_5_0[] = { + [NAND_FLASH_CMD] = 0x00, + [NAND_ADDR0] = 0x04, + [NAND_ADDR1] = 0x08, + [NAND_FLASH_CHIP_SELECT] = 0x0c, + [NAND_EXEC_CMD] = 0x10, + [NAND_FLASH_STATUS] = 0x14, + [NAND_BUFFER_STATUS] = 0x18, + [NAND_DEV0_CFG0] = 0x20, + [NAND_DEV0_CFG1] = 0x24, + [NAND_DEV0_ECC_CFG] = 0x28, + [NAND_DEV1_ECC_CFG] = 0x2c, + [NAND_DEV1_CFG0] = 0x30, + [NAND_DEV1_CFG1] = 0x34, + [NAND_READ_ID] = 0x40, + [NAND_READ_STATUS] = 0x44, + [NAND_DEV_CMD0] = 0x70a0, + [NAND_DEV_CMD1] = 0x70a4, + [NAND_DEV_CMD2] = 0x70a8, + [NAND_DEV_CMD_VLD] = 0x70ac, + [SFLASHC_BURST_CFG] = 0xe0, + [NAND_ERASED_CW_DETECT_CFG] = 0xe8, + [NAND_ERASED_CW_DETECT_STATUS] = 0xec, + [NAND_EBI2_ECC_BUF_CFG] = 0xf0, + [FLASH_BUF_ACC] = 0x100, + [NAND_CTRL] = 0xf00, + [NAND_VERSION] = 0x4f08, + [NAND_READ_LOCATION_0] = 0xf20, + [NAND_READ_LOCATION_1] = 0xf24, + [NAND_READ_LOCATION_2] = 0xf28, + [NAND_READ_LOCATION_3] = 0xf2c, +}; + /* Frees the BAM transaction memory */ static void free_bam_transaction(struct qcom_nand_controller *nandc) { @@ -2882,13 +2917,19 @@ static int qcom_nandc_remove(struct platform_device *pdev) static const struct qcom_props ebi2_nandc_data = { .ecc_modes = (ECC_RS_4BIT | ECC_BCH_8BIT), .is_bam = false, - .reg_offsets = nandc_reg_offsets, + .reg_offsets = reg_offsets_v1_4_0, }; static const struct qcom_props qpic_nandc_v1_4_0_data = { .ecc_modes = (ECC_BCH_4BIT | ECC_BCH_8BIT), .is_bam = true, - .reg_offsets = nandc_reg_offsets, + .reg_offsets = reg_offsets_v1_4_0, +}; + +static const struct qcom_props qpic_nandc_v1_5_0_data = { + .ecc_modes = (ECC_BCH_4BIT | ECC_BCH_8BIT), + .is_bam = true, + .reg_offsets = reg_offsets_v1_5_0, }; /* @@ -2902,6 +2943,9 @@ static int qcom_nandc_remove(struct platform_device *pdev) { .compatible = "qcom,qpic-nandc-v1.4.0", .data = &qpic_nandc_v1_4_0_data, }, + { .compatible = "qcom,qpic-nandc-v1.5.0", + .data = (void *)&qpic_nandc_v1_5_0_data, + }, {} }; MODULE_DEVICE_TABLE(of, qcom_nandc_of_match);