{"id":806103,"url":"http://patchwork.ozlabs.org/api/1.2/patches/806103/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1503737883-14236-7-git-send-email-yamada.masahiro@socionext.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<1503737883-14236-7-git-send-email-yamada.masahiro@socionext.com>","list_archive_url":null,"date":"2017-08-26T08:58:03","name":"[U-Boot,6/6] ARM: uniphier: remove ad-hoc pin settings for NAND","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0ead5fc3264c8c47dfb744494e20842dd8245f79","submitter":{"id":65882,"url":"http://patchwork.ozlabs.org/api/1.2/people/65882/?format=json","name":"Masahiro Yamada","email":"yamada.masahiro@socionext.com"},"delegate":{"id":38701,"url":"http://patchwork.ozlabs.org/api/1.2/users/38701/?format=json","username":"masahir0y","first_name":"Masahiro","last_name":"Yamada","email":"yamada.m@jp.panasonic.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1503737883-14236-7-git-send-email-yamada.masahiro@socionext.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/806103/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806103/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\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=nifty.com header.i=@nifty.com\n\theader.b=\"tU7SlU6J\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xfX6730yrz9t3D\n\tfor ;\n\tSat, 26 Aug 2017 18:59:43 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 2685AC22093; Sat, 26 Aug 2017 08:58:55 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 35354C22079;\n\tSat, 26 Aug 2017 08:58:37 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 22DB2C22064; Sat, 26 Aug 2017 08:58:35 +0000 (UTC)","from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76])\n\tby lists.denx.de (Postfix) with ESMTPS id 0E6ABC2206A\n\tfor ; Sat, 26 Aug 2017 08:58:33 +0000 (UTC)","from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp\n\t[122.131.185.176]) (authenticated)\n\tby conuserg-09.nifty.com with ESMTP id v7Q8wANR031195;\n\tSat, 26 Aug 2017 17:58:13 +0900"],"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=T_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0","DKIM-Filter":"OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v7Q8wANR031195","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com;\n\ts=dec2015msa; t=1503737894;\n\tbh=QflOtGhSTNcYvJWWLvuybAYYcFLJprDDZt2w7WBQf0Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=tU7SlU6J58/JCk1cWE6SkxK8IobVgPR0PB11i8ox0WUTm/G0Zr1/af/dXL/wxcObg\n\tFej4MTE7jupShCqgdk96L3CUV01eYZxUz0yIQuI7DHdDQq+EZn4OgiC7reVih8HObj\n\tA1frq9IoeU1HXnAMmrHI2LpTRdDVlKCr6QPggHbHYK2/H1MXKDFlNsYknSlDKddK75\n\tqQtWwqIoOv+TYxNK+5mBdms35qdQgEilOnyA9pQafzivqIZBuZaJu5OYm9lZVlcbHQ\n\tDMKFwyh2+6SOula3ybiy7K3aBbqJMTUvm6oGg1vkXXGy461FslAk5bD2Mp4NLVqNbj\n\tcXGIGtbX4hbPw==","X-Nifty-SrcIP":"[122.131.185.176]","From":"Masahiro Yamada ","To":"u-boot@lists.denx.de","Date":"Sat, 26 Aug 2017 17:58:03 +0900","Message-Id":"<1503737883-14236-7-git-send-email-yamada.masahiro@socionext.com>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503737883-14236-1-git-send-email-yamada.masahiro@socionext.com>","References":"<1503737883-14236-1-git-send-email-yamada.masahiro@socionext.com>","Cc":"Albert Aribaud ","Subject":"[U-Boot] [PATCH 6/6] ARM: uniphier: remove ad-hoc pin settings for\n\tNAND","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":"This is now set up by the pinctrl driver when the NAND driver is\nprobed. Remove the legacy code.\n\nSigned-off-by: Masahiro Yamada \n---\n\n arch/arm/mach-uniphier/board_init.c | 27 ++++-----------------------\n 1 file changed, 4 insertions(+), 23 deletions(-)","diff":"diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c\nindex ed58d07f7e50..9c0bed0b8b26 100644\n--- a/arch/arm/mach-uniphier/board_init.c\n+++ b/arch/arm/mach-uniphier/board_init.c\n@@ -78,7 +78,6 @@ static void uniphier_ld20_misc_init(void)\n \n struct uniphier_initdata {\n \tunsigned int soc_id;\n-\tbool nand_2cs;\n \tvoid (*sbc_init)(void);\n \tvoid (*pll_init)(void);\n \tvoid (*clk_init)(void);\n@@ -89,7 +88,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {\n #if defined(CONFIG_ARCH_UNIPHIER_LD4)\n \t{\n \t\t.soc_id = UNIPHIER_LD4_ID,\n-\t\t.nand_2cs = true,\n \t\t.sbc_init = uniphier_ld4_sbc_init,\n \t\t.pll_init = uniphier_ld4_pll_init,\n \t\t.clk_init = uniphier_ld4_clk_init,\n@@ -98,7 +96,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {\n #if defined(CONFIG_ARCH_UNIPHIER_PRO4)\n \t{\n \t\t.soc_id = UNIPHIER_PRO4_ID,\n-\t\t.nand_2cs = false,\n \t\t.sbc_init = uniphier_sbc_init_savepin,\n \t\t.pll_init = uniphier_pro4_pll_init,\n \t\t.clk_init = uniphier_pro4_clk_init,\n@@ -107,7 +104,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {\n #if defined(CONFIG_ARCH_UNIPHIER_SLD8)\n \t{\n \t\t.soc_id = UNIPHIER_SLD8_ID,\n-\t\t.nand_2cs = true,\n \t\t.sbc_init = uniphier_ld4_sbc_init,\n \t\t.pll_init = uniphier_ld4_pll_init,\n \t\t.clk_init = uniphier_ld4_clk_init,\n@@ -116,7 +112,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {\n #if defined(CONFIG_ARCH_UNIPHIER_PRO5)\n \t{\n \t\t.soc_id = UNIPHIER_PRO5_ID,\n-\t\t.nand_2cs = true,\n \t\t.sbc_init = uniphier_sbc_init_savepin,\n \t\t.clk_init = uniphier_pro5_clk_init,\n \t},\n@@ -124,7 +119,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {\n #if defined(CONFIG_ARCH_UNIPHIER_PXS2)\n \t{\n \t\t.soc_id = UNIPHIER_PXS2_ID,\n-\t\t.nand_2cs = true,\n \t\t.sbc_init = uniphier_pxs2_sbc_init,\n \t\t.clk_init = uniphier_pxs2_clk_init,\n \t},\n@@ -132,7 +126,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {\n #if defined(CONFIG_ARCH_UNIPHIER_LD6B)\n \t{\n \t\t.soc_id = UNIPHIER_LD6B_ID,\n-\t\t.nand_2cs = true,\n \t\t.sbc_init = uniphier_pxs2_sbc_init,\n \t\t.clk_init = uniphier_pxs2_clk_init,\n \t},\n@@ -140,7 +133,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {\n #if defined(CONFIG_ARCH_UNIPHIER_LD11)\n \t{\n \t\t.soc_id = UNIPHIER_LD11_ID,\n-\t\t.nand_2cs = false,\n \t\t.sbc_init = uniphier_ld11_sbc_init,\n \t\t.pll_init = uniphier_ld11_pll_init,\n \t\t.clk_init = uniphier_ld11_clk_init,\n@@ -150,7 +142,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {\n #if defined(CONFIG_ARCH_UNIPHIER_LD20)\n \t{\n \t\t.soc_id = UNIPHIER_LD20_ID,\n-\t\t.nand_2cs = false,\n \t\t.sbc_init = uniphier_ld11_sbc_init,\n \t\t.pll_init = uniphier_ld20_pll_init,\n \t\t.clk_init = uniphier_ld20_clk_init,\n@@ -160,7 +151,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {\n #if defined(CONFIG_ARCH_UNIPHIER_PXS3)\n \t{\n \t\t.soc_id = UNIPHIER_PXS3_ID,\n-\t\t.nand_2cs = false,\n \t\t.sbc_init = uniphier_pxs2_sbc_init,\n \t\t.pll_init = uniphier_pxs3_pll_init,\n \t\t.clk_init = uniphier_pxs3_clk_init,\n@@ -188,33 +178,24 @@ int board_init(void)\n \n \tled_puts(\"U0\");\n \n-\tif (IS_ENABLED(CONFIG_NAND_DENALI)) {\n-\t\tret = uniphier_pin_init(initdata->nand_2cs ?\n-\t\t\t\t\t\"nand2cs_grp\" : \"nand_grp\");\n-\t\tif (ret)\n-\t\t\tpr_err(\"failed to init NAND pins\\n\");\n-\t}\n-\n-\tled_puts(\"U1\");\n-\n \tif (initdata->pll_init)\n \t\tinitdata->pll_init();\n \n-\tled_puts(\"U2\");\n+\tled_puts(\"U1\");\n \n \tif (initdata->clk_init)\n \t\tinitdata->clk_init();\n \n-\tled_puts(\"U3\");\n+\tled_puts(\"U2\");\n \n \tif (initdata->misc_init)\n \t\tinitdata->misc_init();\n \n-\tled_puts(\"U4\");\n+\tled_puts(\"U3\");\n \n \tuniphier_setup_xirq();\n \n-\tled_puts(\"U5\");\n+\tled_puts(\"U4\");\n \n \tsupport_card_late_init();\n \n","prefixes":["U-Boot","6/6"]}