From patchwork Sat Aug 26 08:58:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 111045 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp2175327qge; Sat, 26 Aug 2017 01:59:17 -0700 (PDT) X-Received: by 10.80.148.77 with SMTP id q13mr1079378eda.296.1503737957847; Sat, 26 Aug 2017 01:59:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503737957; cv=none; d=google.com; s=arc-20160816; b=WCHkJYY0qWYneiCbgpr3AhKsCwixosbww4AS+z9CnnOd36NcVyWoE2FFU8kjSOVTnC RNoOltZ+cEuDVE2irfVh581+7o50nEYYUvadreWu7pLgA4pwrJGh+JeKe5jpyB1GyWHV 9K06wsVZghtZ75OzHfdgBdUQ0UZXGv8SMphXuZ1qhnLwkfae0B56UgNMAo0sZ0dESoTK dwTTY7Et33fqb2qdq5UgWMSs5nw+ReguJj06Y+yjBJatRvWs3QhVst5Pn3fIEaXfd0Az bICsgoBC25PA5ORem254YWLMq4V8oBg7cakpyW+Pr7cPbrl2hPGVPK8FbPr/qMYKMrRs +xnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=p9NlGtH/SymWsDm66gxWl1hFZ8f0Mo+lg4ZsUBDfK50=; b=y1qdbdP/D2w9fD+CG088y0n49H2nlHw3KRRkaguGTxodaSWgdYR+XyD7WDkQlRUEj1 rj6J723x0bMZERggQius9Tml+WCU+K/Cz32ib0J+qX+R3P95uY03bcxZXBYdbVUG/g9+ NkM2GAmXD6yLqWkgiVIIwBWb6p57oEUhyNxT7S/EXrI3DZUm1BKeRkO5R26SjxQT6kBT 0anjvUbqAE3EU9jReM6i6fSKAz6QwLcZVuUAbE61sTtkETsu/6OD5ehZWshfG3zBwq9J a37+sjTmb7WR3lFcOo+ea+Dha5ZnYHdsZ7nY12l0a1W1TVaSfZqfv/M35dpH5VlRMvGk 2J0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=tU7SlU6J; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id e13si4553923edd.17.2017.08.26.01.59.17; Sat, 26 Aug 2017 01:59:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=tU7SlU6J; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 555E5C22073; Sat, 26 Aug 2017 08:58:55 +0000 (UTC) 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 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 35354C22079; Sat, 26 Aug 2017 08:58:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 22DB2C22064; Sat, 26 Aug 2017 08:58:35 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id 0E6ABC2206A for ; Sat, 26 Aug 2017 08:58:33 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-09.nifty.com with ESMTP id v7Q8wANR031195; Sat, 26 Aug 2017 17:58:13 +0900 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; s=dec2015msa; t=1503737894; bh=QflOtGhSTNcYvJWWLvuybAYYcFLJprDDZt2w7WBQf0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tU7SlU6J58/JCk1cWE6SkxK8IobVgPR0PB11i8ox0WUTm/G0Zr1/af/dXL/wxcObg Fej4MTE7jupShCqgdk96L3CUV01eYZxUz0yIQuI7DHdDQq+EZn4OgiC7reVih8HObj A1frq9IoeU1HXnAMmrHI2LpTRdDVlKCr6QPggHbHYK2/H1MXKDFlNsYknSlDKddK75 qQtWwqIoOv+TYxNK+5mBdms35qdQgEilOnyA9pQafzivqIZBuZaJu5OYm9lZVlcbHQ DMKFwyh2+6SOula3ybiy7K3aBbqJMTUvm6oGg1vkXXGy461FslAk5bD2Mp4NLVqNbj cXGIGtbX4hbPw== 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 NAND X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This is now set up by the pinctrl driver when the NAND driver is probed. Remove the legacy code. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/board_init.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index ed58d07f7e50..9c0bed0b8b26 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -78,7 +78,6 @@ static void uniphier_ld20_misc_init(void) struct uniphier_initdata { unsigned int soc_id; - bool nand_2cs; void (*sbc_init)(void); void (*pll_init)(void); void (*clk_init)(void); @@ -89,7 +88,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { #if defined(CONFIG_ARCH_UNIPHIER_LD4) { .soc_id = UNIPHIER_LD4_ID, - .nand_2cs = true, .sbc_init = uniphier_ld4_sbc_init, .pll_init = uniphier_ld4_pll_init, .clk_init = uniphier_ld4_clk_init, @@ -98,7 +96,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { #if defined(CONFIG_ARCH_UNIPHIER_PRO4) { .soc_id = UNIPHIER_PRO4_ID, - .nand_2cs = false, .sbc_init = uniphier_sbc_init_savepin, .pll_init = uniphier_pro4_pll_init, .clk_init = uniphier_pro4_clk_init, @@ -107,7 +104,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { #if defined(CONFIG_ARCH_UNIPHIER_SLD8) { .soc_id = UNIPHIER_SLD8_ID, - .nand_2cs = true, .sbc_init = uniphier_ld4_sbc_init, .pll_init = uniphier_ld4_pll_init, .clk_init = uniphier_ld4_clk_init, @@ -116,7 +112,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { #if defined(CONFIG_ARCH_UNIPHIER_PRO5) { .soc_id = UNIPHIER_PRO5_ID, - .nand_2cs = true, .sbc_init = uniphier_sbc_init_savepin, .clk_init = uniphier_pro5_clk_init, }, @@ -124,7 +119,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { #if defined(CONFIG_ARCH_UNIPHIER_PXS2) { .soc_id = UNIPHIER_PXS2_ID, - .nand_2cs = true, .sbc_init = uniphier_pxs2_sbc_init, .clk_init = uniphier_pxs2_clk_init, }, @@ -132,7 +126,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { #if defined(CONFIG_ARCH_UNIPHIER_LD6B) { .soc_id = UNIPHIER_LD6B_ID, - .nand_2cs = true, .sbc_init = uniphier_pxs2_sbc_init, .clk_init = uniphier_pxs2_clk_init, }, @@ -140,7 +133,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { #if defined(CONFIG_ARCH_UNIPHIER_LD11) { .soc_id = UNIPHIER_LD11_ID, - .nand_2cs = false, .sbc_init = uniphier_ld11_sbc_init, .pll_init = uniphier_ld11_pll_init, .clk_init = uniphier_ld11_clk_init, @@ -150,7 +142,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { #if defined(CONFIG_ARCH_UNIPHIER_LD20) { .soc_id = UNIPHIER_LD20_ID, - .nand_2cs = false, .sbc_init = uniphier_ld11_sbc_init, .pll_init = uniphier_ld20_pll_init, .clk_init = uniphier_ld20_clk_init, @@ -160,7 +151,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { #if defined(CONFIG_ARCH_UNIPHIER_PXS3) { .soc_id = UNIPHIER_PXS3_ID, - .nand_2cs = false, .sbc_init = uniphier_pxs2_sbc_init, .pll_init = uniphier_pxs3_pll_init, .clk_init = uniphier_pxs3_clk_init, @@ -188,33 +178,24 @@ int board_init(void) led_puts("U0"); - if (IS_ENABLED(CONFIG_NAND_DENALI)) { - ret = uniphier_pin_init(initdata->nand_2cs ? - "nand2cs_grp" : "nand_grp"); - if (ret) - pr_err("failed to init NAND pins\n"); - } - - led_puts("U1"); - if (initdata->pll_init) initdata->pll_init(); - led_puts("U2"); + led_puts("U1"); if (initdata->clk_init) initdata->clk_init(); - led_puts("U3"); + led_puts("U2"); if (initdata->misc_init) initdata->misc_init(); - led_puts("U4"); + led_puts("U3"); uniphier_setup_xirq(); - led_puts("U5"); + led_puts("U4"); support_card_late_init();