{"id":808382,"url":"http://patchwork.ozlabs.org/api/1.2/patches/808382/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-arc/patch/1504202767-17361-1-git-send-email-vgupta@synopsys.com/","project":{"id":48,"url":"http://patchwork.ozlabs.org/api/1.2/projects/48/?format=json","name":"Linux ARC development","link_name":"linux-arc","list_id":"linux-snps-arc.lists.infradead.org","list_email":"linux-snps-arc@lists.infradead.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504202767-17361-1-git-send-email-vgupta@synopsys.com>","list_archive_url":null,"date":"2017-08-31T18:06:07","name":"ARC: reset: remove the misleading v1 suffix all over","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"93961a870b65965eed1f0f7416e1247cb2cfd187","submitter":{"id":26707,"url":"http://patchwork.ozlabs.org/api/1.2/people/26707/?format=json","name":"Vineet Gupta","email":"Vineet.Gupta1@synopsys.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-arc/patch/1504202767-17361-1-git-send-email-vgupta@synopsys.com/mbox/","series":[{"id":889,"url":"http://patchwork.ozlabs.org/api/1.2/series/889/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-arc/list/?series=889","date":"2017-08-31T18:06:07","name":"ARC: reset: remove the misleading v1 suffix all over","version":1,"mbox":"http://patchwork.ozlabs.org/series/889/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808382/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808382/checks/","tags":{},"related":[],"headers":{"Return-Path":"<linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=<UNKNOWN>)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"axwy6e2s\"; \n\tdkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjr1b1VL4z9s7c\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri,  1 Sep 2017 04:07:15 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dnTs1-00011J-PH; Thu, 31 Aug 2017 18:07:13 +0000","from us01smtprelay-2.synopsys.com ([198.182.47.9]\n\thelo=smtprelay.synopsys.com)\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dnTrw-0000xL-P5 for linux-snps-arc@lists.infradead.org;\n\tThu, 31 Aug 2017 18:07:12 +0000","from mailhost.synopsys.com (mailhost3.synopsys.com [10.12.238.238])\n\tby smtprelay.synopsys.com (Postfix) with ESMTP id E630C24E0DF2;\n\tThu, 31 Aug 2017 11:06:46 -0700 (PDT)","from mailhost.synopsys.com (localhost [127.0.0.1])\n\tby mailhost.synopsys.com (Postfix) with ESMTP id CA507B18;\n\tThu, 31 Aug 2017 11:06:46 -0700 (PDT)","from us01wehtc1.internal.synopsys.com\n\t(us01wehtc1-vip.internal.synopsys.com [10.12.239.236])\n\tby mailhost.synopsys.com (Postfix) with ESMTP id B7824AA3;\n\tThu, 31 Aug 2017 11:06:41 -0700 (PDT)","from IN01WEHTCB.internal.synopsys.com (10.144.199.106) by\n\tus01wehtc1.internal.synopsys.com (10.12.239.235) with Microsoft SMTP\n\tServer (TLS) id 14.3.266.1; Thu, 31 Aug 2017 11:06:24 -0700","from IN01WEHTCA.internal.synopsys.com (10.144.199.104) by\n\tIN01WEHTCB.internal.synopsys.com (10.144.199.105) with Microsoft SMTP\n\tServer (TLS) id 14.3.266.1; Thu, 31 Aug 2017 23:36:23 +0530","from vineetg-Latitude-E7450.internal.synopsys.com (10.10.161.108)\n\tby IN01WEHTCA.internal.synopsys.com (10.144.199.243) with Microsoft\n\tSMTP Server (TLS) id 14.3.266.1; Thu, 31 Aug 2017 23:36:22 +0530"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To\n\t:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:\n\tResent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:\n\tList-Owner; bh=osNBIviS0rpdBD31rHcD069+lw8Axrjte8g5cSp3bhE=;\n\tb=axwy6e2sqwsRLk\n\tw0y+tK2ie82kuNrfuEP/3us1hIf2gttMWFc10s5TRSHgx5W7ZQfKr56aFVLOXwFWzu1DRjD6M8FuV\n\tTxpvMd0vK9vjTk48lxIXYG1jk6XsgV7/y0x/dGd1ZOi/Yq7A3gJEug0VKCpqFhpOFbWl/UU7RpGSc\n\ty3BYQUla2kTU4SAMY97hvwcSRjOUuoxVtw1Wst3o8yUfHkNR7xzDmhHoK4DlE4sb8Ux5i2PHs/lBY\n\tilXSO+5eZgLhqwpiI+ONA8grjqPiFJVI9fOLfJbN1XSdlvys/Ue+lMSrlZcvC3cVZ2Cn9s5MZbueQ\n\tlJmvDP7go4Fb54ksQ8zQ==;","From":"Vineet Gupta <Vineet.Gupta1@synopsys.com>","To":"<linux-kernel@vger.kernel.org>","Subject":"[PATCH] ARC: reset: remove the misleading v1 suffix all over","Date":"Thu, 31 Aug 2017 11:06:07 -0700","Message-ID":"<1504202767-17361-1-git-send-email-vgupta@synopsys.com>","X-Mailer":"git-send-email 2.7.4","MIME-Version":"1.0","X-Originating-IP":"[10.10.161.108]","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170831_110709_041368_776AEDC2 ","X-CRM114-Status":"GOOD (  15.69  )","X-Spam-Score":"-1.9 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details:   (-1.9 points)\n\tpts rule name              description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/,\n\tno trust [198.182.47.9 listed in list.dnswl.org]\n\t-0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay\n\tdomain\n\t-1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]","X-BeenThere":"linux-snps-arc@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"Linux on Synopsys ARC Processors\n\t<linux-snps-arc.lists.infradead.org>","List-Unsubscribe":"<http://lists.infradead.org/mailman/options/linux-snps-arc>, \n\t<mailto:linux-snps-arc-request@lists.infradead.org?subject=unsubscribe>","List-Archive":"<http://lists.infradead.org/pipermail/linux-snps-arc/>","List-Post":"<mailto:linux-snps-arc@lists.infradead.org>","List-Help":"<mailto:linux-snps-arc-request@lists.infradead.org?subject=help>","List-Subscribe":"<http://lists.infradead.org/mailman/listinfo/linux-snps-arc>, \n\t<mailto:linux-snps-arc-request@lists.infradead.org?subject=subscribe>","Cc":"Vineet  Gupta <Vineet.Gupta1@synopsys.com>,\n\tlinux-snps-arc@lists.infradead.org, Alexey.Brodkin@synopsys.com,\n\tPhilipp Zabel <p.zabel@pengutronix.de>","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-snps-arc\" <linux-snps-arc-bounces@lists.infradead.org>","Errors-To":"linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"There is no plan yet to do a v2 board. And even if we were to do it only\nsome IPs would actually change, so it be best to add suffixes at that\npoint, not now !\n\nCc: Philipp Zabel <p.zabel@pengutronix.de>\nSigned-off-by: Vineet Gupta <vgupta@synopsys.com>\n---\nP.S. Philip, if you and Eugeniy are OK, can this be please squashed with\nhis original patch since it has not yet been merged etc.\n\nThx,\n\nSigned-off-by: Vineet Gupta <vgupta@synopsys.com>\n---\n MAINTAINERS                                     |  5 ++-\n drivers/reset/Kconfig                           |  6 ++--\n drivers/reset/Makefile                          |  2 +-\n drivers/reset/{reset-hsdk-v1.c => reset-hsdk.c} | 44 ++++++++++++-------------\n include/dt-bindings/reset/snps,hsdk-reset.h     | 17 ++++++++++\n include/dt-bindings/reset/snps,hsdk-v1-reset.h  | 17 ----------\n 6 files changed, 45 insertions(+), 46 deletions(-)\n rename drivers/reset/{reset-hsdk-v1.c => reset-hsdk.c} (72%)\n create mode 100644 include/dt-bindings/reset/snps,hsdk-reset.h\n delete mode 100644 include/dt-bindings/reset/snps,hsdk-v1-reset.h","diff":"diff --git a/MAINTAINERS b/MAINTAINERS\nindex 9f0d68686bce..2c9f2825e70a 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -12891,9 +12891,8 @@ F:\tdrivers/mmc/host/dw_mmc*\n SYNOPSYS HSDK RESET CONTROLLER DRIVER\n M:\tEugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>\n S:\tSupported\n-F:\tdrivers/reset/reset-hsdk-v1.c\n-F:\tinclude/dt-bindings/reset/snps,hsdk-v1-reset.h\n-F:\tDocumentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt\n+F:\tdrivers/reset/reset-hsdk.c\n+F:\tinclude/dt-bindings/reset/snps,hsdk-reset.h\n \n SYSTEM CONFIGURATION (SYSCON)\n M:\tLee Jones <lee.jones@linaro.org>\ndiff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig\nindex 52d5251660b9..1aaa434e4ab9 100644\n--- a/drivers/reset/Kconfig\n+++ b/drivers/reset/Kconfig\n@@ -34,11 +34,11 @@ config RESET_BERLIN\n \thelp\n \t  This enables the reset controller driver for Marvell Berlin SoCs.\n \n-config RESET_HSDK_V1\n-\tbool \"HSDK v1 Reset Driver\"\n+config RESET_SNPS_HSDK\n+\tbool \"Synopsys HSDK Reset Driver\"\n \tdefault n\n \thelp\n-\t  This enables the reset controller driver for HSDK v1.\n+\t  This enables the reset controller driver for HSDK board.\n \n config RESET_IMX7\n \tbool \"i.MX7 Reset Driver\" if COMPILE_TEST\ndiff --git a/drivers/reset/Makefile b/drivers/reset/Makefile\nindex b62783f50fe5..52832958c74f 100644\n--- a/drivers/reset/Makefile\n+++ b/drivers/reset/Makefile\n@@ -5,7 +5,7 @@ obj-$(CONFIG_ARCH_TEGRA) += tegra/\n obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o\n obj-$(CONFIG_RESET_ATH79) += reset-ath79.o\n obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o\n-obj-$(CONFIG_RESET_HSDK_V1) += reset-hsdk-v1.o\n+obj-$(CONFIG_RESET_SNPS_HSDK) += reset-hsdk.o\n obj-$(CONFIG_RESET_IMX7) += reset-imx7.o\n obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o\n obj-$(CONFIG_RESET_MESON) += reset-meson.o\ndiff --git a/drivers/reset/reset-hsdk-v1.c b/drivers/reset/reset-hsdk.c\nsimilarity index 72%\nrename from drivers/reset/reset-hsdk-v1.c\nrename to drivers/reset/reset-hsdk.c\nindex bca13e4bf622..8bce391c6943 100644\n--- a/drivers/reset/reset-hsdk-v1.c\n+++ b/drivers/reset/reset-hsdk.c\n@@ -1,7 +1,7 @@\n /*\n  * Copyright (C) 2017 Synopsys.\n  *\n- * Synopsys HSDKv1 SDP reset driver.\n+ * Synopsys HSDK Development platform reset driver.\n  *\n  * This file is licensed under the terms of the GNU General Public\n  * License version 2. This program is licensed \"as is\" without any\n@@ -18,9 +18,9 @@\n #include <linux/slab.h>\n #include <linux/types.h>\n \n-#define to_hsdkv1_rst(p)\tcontainer_of((p), struct hsdkv1_rst, rcdev)\n+#define to_hsdk_rst(p)\tcontainer_of((p), struct hsdk_rst, rcdev)\n \n-struct hsdkv1_rst {\n+struct hsdk_rst {\n \tvoid __iomem\t\t\t*regs_ctl;\n \tvoid __iomem\t\t\t*regs_rst;\n \tspinlock_t\t\t\tlock;\n@@ -49,12 +49,12 @@ static const u32 rst_map[] = {\n #define CGU_IP_SW_RESET_RESET\t\tBIT(0)\n #define SW_RESET_TIMEOUT\t\t10000\n \n-static void hsdkv1_reset_config(struct hsdkv1_rst *rst, unsigned long id)\n+static void hsdk_reset_config(struct hsdk_rst *rst, unsigned long id)\n {\n \twritel(rst_map[id], rst->regs_ctl + CGU_SYS_RST_CTRL);\n }\n \n-static int hsdkv1_reset_do(struct hsdkv1_rst *rst)\n+static int hsdk_reset_do(struct hsdk_rst *rst)\n {\n \tu32 reg;\n \n@@ -69,28 +69,28 @@ static int hsdkv1_reset_do(struct hsdkv1_rst *rst)\n \t\t!(reg & CGU_IP_SW_RESET_RESET), 5, SW_RESET_TIMEOUT);\n }\n \n-static int hsdkv1_reset_reset(struct reset_controller_dev *rcdev,\n+static int hsdk_reset_reset(struct reset_controller_dev *rcdev,\n \t\t\t      unsigned long id)\n {\n-\tstruct hsdkv1_rst *rst = to_hsdkv1_rst(rcdev);\n+\tstruct hsdk_rst *rst = to_hsdk_rst(rcdev);\n \tunsigned long flags;\n \tint ret;\n \n \tspin_lock_irqsave(&rst->lock, flags);\n-\thsdkv1_reset_config(rst, id);\n-\tret = hsdkv1_reset_do(rst);\n+\thsdk_reset_config(rst, id);\n+\tret = hsdk_reset_do(rst);\n \tspin_unlock_irqrestore(&rst->lock, flags);\n \n \treturn ret;\n }\n \n-static const struct reset_control_ops hsdkv1_reset_ops = {\n-\t.reset\t= hsdkv1_reset_reset,\n+static const struct reset_control_ops hsdk_reset_ops = {\n+\t.reset\t= hsdk_reset_reset,\n };\n \n-static int hsdkv1_reset_probe(struct platform_device *pdev)\n+static int hsdk_reset_probe(struct platform_device *pdev)\n {\n-\tstruct hsdkv1_rst *rst;\n+\tstruct hsdk_rst *rst;\n \tstruct resource *mem;\n \n \trst = devm_kzalloc(&pdev->dev, sizeof(*rst), GFP_KERNEL);\n@@ -110,7 +110,7 @@ static int hsdkv1_reset_probe(struct platform_device *pdev)\n \tspin_lock_init(&rst->lock);\n \n \trst->rcdev.owner = THIS_MODULE;\n-\trst->rcdev.ops = &hsdkv1_reset_ops;\n+\trst->rcdev.ops = &hsdk_reset_ops;\n \trst->rcdev.of_node = pdev->dev.of_node;\n \trst->rcdev.nr_resets = HSDK_MAX_RESETS;\n \trst->rcdev.of_reset_n_cells = 1;\n@@ -118,20 +118,20 @@ static int hsdkv1_reset_probe(struct platform_device *pdev)\n \treturn reset_controller_register(&rst->rcdev);\n }\n \n-static const struct of_device_id hsdkv1_reset_dt_match[] = {\n-\t{ .compatible = \"snps,hsdk-v1.0-reset\" },\n+static const struct of_device_id hsdk_reset_dt_match[] = {\n+\t{ .compatible = \"snps,hsdk-reset\" },\n \t{ },\n };\n \n-static struct platform_driver hsdkv1_reset_driver = {\n-\t.probe\t= hsdkv1_reset_probe,\n+static struct platform_driver hsdk_reset_driver = {\n+\t.probe\t= hsdk_reset_probe,\n \t.driver\t= {\n-\t\t.name = \"hsdk-v1.0-reset\",\n-\t\t.of_match_table = hsdkv1_reset_dt_match,\n+\t\t.name = \"hsdk-reset\",\n+\t\t.of_match_table = hsdk_reset_dt_match,\n \t},\n };\n-builtin_platform_driver(hsdkv1_reset_driver);\n+builtin_platform_driver(hsdk_reset_driver);\n \n MODULE_AUTHOR(\"Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>\");\n-MODULE_DESCRIPTION(\"Synopsys HSDKv1 SDP reset driver\");\n+MODULE_DESCRIPTION(\"Synopsys HSDK SDP reset driver\");\n MODULE_LICENSE(\"GPL v2\");\ndiff --git a/include/dt-bindings/reset/snps,hsdk-reset.h b/include/dt-bindings/reset/snps,hsdk-reset.h\nnew file mode 100644\nindex 000000000000..e1a643e4bc91\n--- /dev/null\n+++ b/include/dt-bindings/reset/snps,hsdk-reset.h\n@@ -0,0 +1,17 @@\n+/**\n+ * This header provides index for the HSDK reset controller.\n+ */\n+#ifndef _DT_BINDINGS_RESET_CONTROLLER_SNPS_HSDK\n+#define _DT_BINDINGS_RESET_CONTROLLER_SNPS_HSDK\n+\n+#define HSDK_APB_RESET\t0\n+#define HSDK_AXI_RESET\t1\n+#define HSDK_ETH_RESET\t2\n+#define HSDK_USB_RESET\t3\n+#define HSDK_SDIO_RESET\t4\n+#define HSDK_HDMI_RESET\t5\n+#define HSDK_GFX_RESET\t6\n+#define HSDK_DMAC_RESET\t7\n+#define HSDK_EBI_RESET\t8\n+\n+#endif /*_DT_BINDINGS_RESET_CONTROLLER_SNPS_HSDK*/\ndiff --git a/include/dt-bindings/reset/snps,hsdk-v1-reset.h b/include/dt-bindings/reset/snps,hsdk-v1-reset.h\ndeleted file mode 100644\nindex d898c89b7123..000000000000\n--- a/include/dt-bindings/reset/snps,hsdk-v1-reset.h\n+++ /dev/null\n@@ -1,17 +0,0 @@\n-/**\n- * This header provides index for the HSDK v1 reset controller.\n- */\n-#ifndef _DT_BINDINGS_RESET_CONTROLLER_HSDK_V1\n-#define _DT_BINDINGS_RESET_CONTROLLER_HSDK_V1\n-\n-#define HSDK_V1_APB_RESET\t0\n-#define HSDK_V1_AXI_RESET\t1\n-#define HSDK_V1_ETH_RESET\t2\n-#define HSDK_V1_USB_RESET\t3\n-#define HSDK_V1_SDIO_RESET\t4\n-#define HSDK_V1_HDMI_RESET\t5\n-#define HSDK_V1_GFX_RESET\t6\n-#define HSDK_V1_DMAC_RESET\t7\n-#define HSDK_V1_EBI_RESET\t8\n-\n-#endif /*_DT_BINDINGS_RESET_CONTROLLER_HSDK_V1*/\n","prefixes":[]}