From patchwork Tue Jun 7 01:36:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 69460 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1743307qgf; Mon, 6 Jun 2016 18:36:05 -0700 (PDT) X-Received: by 10.98.69.202 with SMTP id n71mr29129188pfi.82.1465263365161; Mon, 06 Jun 2016 18:36:05 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id se4si6648125pac.61.2016.06.06.18.36.04; Mon, 06 Jun 2016 18:36:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751039AbcFGBgE (ORCPT + 4 others); Mon, 6 Jun 2016 21:36:04 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:48366 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750788AbcFGBgD (ORCPT ); Mon, 6 Jun 2016 21:36:03 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id u571YkL2008589; Tue, 7 Jun 2016 10:34:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com u571YkL2008589 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1465263287; bh=uxJ6QTPW6OJy/9ZxyuODDBGgTFI5pB+JxVDG1Ye8h2U=; h=From:To:Cc:Subject:Date:From; b=a5B/X6h605PfKYYoR6P+Y66m08YX2Fba/MWE9NiKuC/jCKQaCctdYSqDdWEgTHOL+ Vzrf0XrX2ZcsNIMULb3t7Z9Ci+6D49zgUFhiEuT0e5IRZYzNJnLksDUp0NyM0anaFV aB2v+OhbbjnVzUtrnVLvQ00OZhhGV0h9htpW0Z+cevyrV7VqSrOlNR5ieULBp7omsM DzWAYBrMuJ2OCmemvKwXVVkafFrpwoYIFXzT6BJ82LgmjdJbdvww47E6v4Xa4cQ1go 4JlZP4ie+aO7UOyDItN9HP+EUMrvKAUZScO7xqekUjY0BqD2vcFNOkeEGVU6/hgNjr Jrxpd5s7VQmkw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-gpio@vger.kernel.org Cc: Masahiro Yamada , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] pinctrl: uniphier: fix NAND pin-mux settings for PH1-LD11/LD20 Date: Tue, 7 Jun 2016 10:36:05 +0900 Message-Id: <1465263365-13966-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org My mistake in the initial support patches. Signed-off-by: Masahiro Yamada --- drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c index 418ccd6..150942f 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c @@ -484,7 +484,7 @@ static const unsigned i2c4_pins[] = {61, 62}; static const int i2c4_muxvals[] = {1, 1}; static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; -static const int nand_muxvals[] = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}; +static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17}; static const int sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3}; /* No SDVOLC */ static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13, diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index 2cb26b7..7311453 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c @@ -565,7 +565,7 @@ static const unsigned i2c4_pins[] = {61, 62}; static const int i2c4_muxvals[] = {1, 1}; static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; -static const int nand_muxvals[] = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}; +static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17}; static const int sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3}; /* No SDVOLC */ static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13,