{"id":902011,"url":"http://patchwork.ozlabs.org/api/patches/902011/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20180420155314.8920-7-stefan@agner.ch/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20180420155314.8920-7-stefan@agner.ch>","list_archive_url":null,"date":"2018-04-20T15:53:11","name":"[U-Boot,v1,6/9] mtd: nand: mxs_nand: add device tree support","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"89de6deed2ac3c47ae8cc8a52eb8353f9a6c0624","submitter":{"id":4137,"url":"http://patchwork.ozlabs.org/api/people/4137/?format=json","name":"Stefan Agner","email":"stefan@agner.ch"},"delegate":{"id":1693,"url":"http://patchwork.ozlabs.org/api/users/1693/?format=json","username":"sbabic","first_name":"Stefano","last_name":"Babic","email":"sbabic@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20180420155314.8920-7-stefan@agner.ch/mbox/","series":[{"id":40110,"url":"http://patchwork.ozlabs.org/api/series/40110/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=40110","date":"2018-04-20T15:53:05","name":"mtd: nand: mxs_nand: add device tree support","version":1,"mbox":"http://patchwork.ozlabs.org/series/40110/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/902011/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/902011/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=agner.ch","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tsecure) header.d=agner.ch header.i=@agner.ch header.b=\"Kfdqq9Fe\";\n\tdkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 40SLBN3nWgz9s1p\n\tfor ;\n\tSat, 21 Apr 2018 01:58:52 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 2EEE4C21DB5; Fri, 20 Apr 2018 15:56:41 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 4914BC21CB1;\n\tFri, 20 Apr 2018 15:54:44 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 264F9C21CB6; Fri, 20 Apr 2018 15:54:29 +0000 (UTC)","from mail.kmu-office.ch (mail.kmu-office.ch [178.209.48.109])\n\tby lists.denx.de (Postfix) with ESMTPS id C4D63C21D8E\n\tfor ; Fri, 20 Apr 2018 15:54:25 +0000 (UTC)","from trochilidae.toradex.int (unknown [IPv6:2001:1620:c6e:10::3])\n\tby mail.kmu-office.ch (Postfix) with ESMTPSA id 420325C1769;\n\tFri, 20 Apr 2018 17:54:25 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED,\n\tSPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no\n\tversion=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim;\n\tt=1524239665;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:content-type:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=kjSzJ2cjx0ZuWVOh4O9SlFFLcXrUgKJUEnIq5CPJmzM=;\n\tb=Kfdqq9FeqKdgyKyUBVcVz+nys3/ymbsB3bcaXEalBr7jvGsQUkpJ8F+J2ScdBC7gyQAfTo\n\tryqwFQeiGglFeALXFajdBxkRRk9K6L4u+XzKlESubc3aM+TniZGUO4yij+fqnClKz3ABjB\n\tD/fJIZSPXuxYnO2bmNiwbLBNCPiXx40=","From":"Stefan Agner ","To":"u-boot@lists.denx.de, Stefano Babic , oss@buserror.net","Date":"Fri, 20 Apr 2018 17:53:11 +0200","Message-Id":"<20180420155314.8920-7-stefan@agner.ch>","X-Mailer":"git-send-email 2.17.0","In-Reply-To":"<20180420155314.8920-1-stefan@agner.ch>","References":"<20180420155314.8920-1-stefan@agner.ch>","X-Spamd-Result":"default: False [-2.10 / 15.00]; RCVD_TLS_ALL(0.00)[];\n\tASN(0.00)[asn:13030, ipnet:2001:1620::/32, country:CH];\n\tRCVD_COUNT_ZERO(0.00)[0]; FROM_HAS_DN(0.00)[];\n\tMID_CONTAINS_FROM(1.00)[]; TO_DN_SOME(0.00)[];\n\tMIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[];\n\tTO_MATCH_ENVRCPT_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%];\n\tARC_NA(0.00)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_SEVEN(0.00)[10]","Cc":"marex@denx.de, Stefan Agner ,\n\tMarcel Ziswiler ,\n\tMax Krummenacher , han.xu@nxp.com","Subject":"[U-Boot] [PATCH v1 6/9] mtd: nand: mxs_nand: add device tree support","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"From: Stefan Agner \n\nSupport driver data from device tree. Also support fsl,use-minimal-ecc\nsimilar to Linux' GPMI NAND driver.\n\nSigned-off-by: Stefan Agner \n---\n\n drivers/mtd/nand/Kconfig | 7 +++\n drivers/mtd/nand/Makefile | 1 +\n drivers/mtd/nand/mxs_nand.c | 5 ++\n drivers/mtd/nand/mxs_nand_dt.c | 86 ++++++++++++++++++++++++++++++++++\n 4 files changed, 99 insertions(+)\n create mode 100644 drivers/mtd/nand/mxs_nand_dt.c","diff":"diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig\nindex c039b9cc60..bdc272142e 100644\n--- a/drivers/mtd/nand/Kconfig\n+++ b/drivers/mtd/nand/Kconfig\n@@ -154,6 +154,13 @@ config NAND_MXS\n \n if NAND_MXS\n \n+config NAND_MXS_DT\n+\tbool \"Support MXS NAND controller as a DT device\"\n+\tdepends on OF_CONTROL && MTD\n+\thelp\n+\t Enable the driver for MXS NAND flash on platforms using\n+\t device tree.\n+\n config NAND_MXS_USE_MINIMUM_ECC\n \tbool \"Use minimum ECC strength supported by the controller\"\n \tdefault false\ndiff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile\nindex 332d905a3a..86877e1592 100644\n--- a/drivers/mtd/nand/Makefile\n+++ b/drivers/mtd/nand/Makefile\n@@ -57,6 +57,7 @@ obj-$(CONFIG_NAND_LPC32XX_SLC) += lpc32xx_nand_slc.o\n obj-$(CONFIG_NAND_VF610_NFC) += vf610_nfc.o\n obj-$(CONFIG_NAND_MXC) += mxc_nand.o\n obj-$(CONFIG_NAND_MXS) += mxs_nand.o\n+obj-$(CONFIG_NAND_MXS_DT) += mxs_nand_dt.o\n obj-$(CONFIG_NAND_PXA3XX) += pxa3xx_nand.o\n obj-$(CONFIG_NAND_SPEAR) += spr_nand.o\n obj-$(CONFIG_TEGRA_NAND) += tegra_nand.o\ndiff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c\nindex 5fbbb0a706..8c3f4f1871 100644\n--- a/drivers/mtd/nand/mxs_nand.c\n+++ b/drivers/mtd/nand/mxs_nand.c\n@@ -1159,6 +1159,9 @@ int mxs_nand_init(struct mxs_nand_info *nand_info)\n \tnand_set_controller_data(nand, nand_info);\n \tnand->options |= NAND_NO_SUBPAGE_WRITE;\n \n+\tif (nand_info->dev)\n+\t\tnand->flash_node = dev_of_offset(nand_info->dev);\n+\n \tnand->cmd_ctrl\t\t= mxs_nand_cmd_ctrl;\n \n \tnand->dev_ready\t\t= mxs_nand_device_ready;\n@@ -1206,6 +1209,7 @@ err1:\n \treturn err;\n }\n \n+#ifndef CONFIG_NAND_MXS_DT\n void board_nand_init(void)\n {\n \tstruct mxs_nand_info *nand_info;\n@@ -1232,3 +1236,4 @@ void board_nand_init(void)\n \n \tmxs_nand_init(nand_info);\n }\n+#endif\ndiff --git a/drivers/mtd/nand/mxs_nand_dt.c b/drivers/mtd/nand/mxs_nand_dt.c\nnew file mode 100644\nindex 0000000000..c7355371ac\n--- /dev/null\n+++ b/drivers/mtd/nand/mxs_nand_dt.c\n@@ -0,0 +1,86 @@\n+/*\n+ * NXP GPMI NAND flash driver (DT initialization)\n+ *\n+ * Copyright (C) 2018 Toradex\n+ * Authors:\n+ * Stefan Agner \n+ *\n+ * Based on denali_dt.c\n+ *\n+ * SPDX-License-Identifier:\tGPL-2.0+\n+ */\n+\n+#include \n+#include \n+#include \n+#include \n+\n+#include \"mxs_nand.h\"\n+\n+struct mxs_nand_dt_data {\n+\tunsigned int max_ecc_strength_supported;\n+};\n+\n+static const struct mxs_nand_dt_data mxs_nand_imx7d_data = {\n+\t.max_ecc_strength_supported = 62,\n+};\n+\n+static const struct udevice_id mxs_nand_dt_ids[] = {\n+\t{\n+\t\t.compatible = \"fsl,imx7d-gpmi-nand\",\n+\t\t.data = (unsigned long)&mxs_nand_imx7d_data,\n+\t},\n+\t{ /* sentinel */ }\n+};\n+\n+static int mxs_nand_dt_probe(struct udevice *dev)\n+{\n+\tstruct mxs_nand_info *info = dev_get_priv(dev);\n+\tconst struct mxs_nand_dt_data *data;\n+\tstruct resource res;\n+\tint ret;\n+\n+\tdata = (void *)dev_get_driver_data(dev);\n+\tif (data)\n+\t\tinfo->max_ecc_strength_supported = data->max_ecc_strength_supported;\n+\n+\tinfo->dev = dev;\n+\n+\tret = dev_read_resource_byname(dev, \"gpmi-nand\", &res);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tinfo->gpmi_regs = devm_ioremap(dev, res.start, resource_size(&res));\n+\n+\n+\tret = dev_read_resource_byname(dev, \"bch\", &res);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tinfo->bch_regs = devm_ioremap(dev, res.start, resource_size(&res));\n+\n+\tinfo->use_minimum_ecc = dev_read_bool(dev, \"fsl,use-minimum-ecc\");\n+\n+\treturn mxs_nand_init(info);\n+}\n+\n+U_BOOT_DRIVER(mxs_nand_dt) = {\n+\t.name = \"mxs-nand-dt\",\n+\t.id = UCLASS_MTD,\n+\t.of_match = mxs_nand_dt_ids,\n+\t.probe = mxs_nand_dt_probe,\n+\t.priv_auto_alloc_size = sizeof(struct mxs_nand_info),\n+};\n+\n+void board_nand_init(void)\n+{\n+\tstruct udevice *dev;\n+\tint ret;\n+\n+\tret = uclass_get_device_by_driver(UCLASS_MTD,\n+\t\t\t\t\t DM_GET_DRIVER(mxs_nand_dt),\n+\t\t\t\t\t &dev);\n+\tif (ret && ret != -ENODEV)\n+\t\tpr_err(\"Failed to initialize MXS NAND controller. (error %d)\\n\",\n+\t\t ret);\n+}\n","prefixes":["U-Boot","v1","6/9"]}