{"id":814374,"url":"http://patchwork.ozlabs.org/api/1.2/patches/814374/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170915191359.28712-3-marek.vasut+renesas@gmail.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":"<20170915191359.28712-3-marek.vasut+renesas@gmail.com>","list_archive_url":null,"date":"2017-09-15T19:13:57","name":"[U-Boot,3/5] ARM: rmobile: Switch to DM PFC pinmux and GPIO driver","commit_ref":"793afcde6c645b37b72a922673fbf9d4ee619436","pull_url":null,"state":"accepted","archived":false,"hash":"f43019671481870aa779272d5b67c9a1324c3c64","submitter":{"id":1124,"url":"http://patchwork.ozlabs.org/api/1.2/people/1124/?format=json","name":"Marek Vasut","email":"marek.vasut@gmail.com"},"delegate":{"id":1750,"url":"http://patchwork.ozlabs.org/api/1.2/users/1750/?format=json","username":"iwamatsu","first_name":"Nobuhiro","last_name":"Iwamatsu","email":"iwamatsu@nigauri.org"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170915191359.28712-3-marek.vasut+renesas@gmail.com/mbox/","series":[{"id":3365,"url":"http://patchwork.ozlabs.org/api/1.2/series/3365/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=3365","date":"2017-09-15T19:13:58","name":"[U-Boot,1/5] pinctrl: rmobile: Add Renesas RCar pincontrol driver","version":1,"mbox":"http://patchwork.ozlabs.org/series/3365/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814374/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814374/checks/","tags":{},"related":[],"headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","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=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"LjTRjcmJ\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xv4sw3T8rz9sNc\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 16 Sep 2017 05:17:39 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 288C5C21F57; Fri, 15 Sep 2017 19:15:51 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 18732C21F06;\n\tFri, 15 Sep 2017 19:15:28 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 1F9FAC21E4A; Fri, 15 Sep 2017 19:14:07 +0000 (UTC)","from mail-wr0-f196.google.com (mail-wr0-f196.google.com\n\t[209.85.128.196])\n\tby lists.denx.de (Postfix) with ESMTPS id C1B0DC21EF1\n\tfor <u-boot@lists.denx.de>; Fri, 15 Sep 2017 19:14:06 +0000 (UTC)","by mail-wr0-f196.google.com with SMTP id p37so1772007wrb.5\n\tfor <u-boot@lists.denx.de>; Fri, 15 Sep 2017 12:14:06 -0700 (PDT)","from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz.\n\t[86.49.107.50]) by smtp.gmail.com with ESMTPSA id\n\ta39sm1710995wrc.48.2017.09.15.12.14.04\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 15 Sep 2017 12:14:04 -0700 (PDT)"],"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=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=GRVOuyJ4OxkB/wmVqffBrHZGsOFoV2vH2/OsmYsRT/c=;\n\tb=LjTRjcmJI288r0VNZWC44oPaJsQQHZwxDjRM3hlcT2g4o4dDrxvS7LT41zhE2qEOjt\n\tQrrpmG3SlbyHlwlTUH5WlM4SnjEfQ5P3DsUWuUD6ixMcqN/nq66j3D7egnh3YsHYcss/\n\tGKBpuw5q/jUXDtoQW/xmMauYMEtfyL6igj8l6T2FhBInp0pNmLGhyhTrgA8lEHsE0x/P\n\tcey86C5bqtrmWNfu4sOVo29lGSKkcUEBE5RENY26okd9L6Iz5xzRD7f4xgc0vQYIHYji\n\ts0FFC4O91KyA3RqudIvMXf1kNkSXsVDzFARhosC3FEHKxABOhxbWa5q/9U/iziKtWQfC\n\tbXqg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=GRVOuyJ4OxkB/wmVqffBrHZGsOFoV2vH2/OsmYsRT/c=;\n\tb=ifTnh92uEm1H3OY55+YQHX/nGcq/1p31Ait8ntM0y8d5TKGOAhUrrQufMmrtNQD4J4\n\td/5JItuiebXmVJ55NMW1ZiZAVNF8j+5dS+EK51UgHkL3lr6kVnKv9CV30UhwMaQofzgK\n\tgFfnvvHYPsD0e0Dy9UVBtpTgmJ3mhEPxoTd8XDoJYpKgi7uXBadhyuZM2XfD9Cvh3yct\n\tbZbFmJlc9Nq0JJupJARI3IARCBEuo65Wmv0WY50I890vdsjsJYZ59Vt+tc9hn6kcsqwH\n\tdRqKqtr22sAQ/waXPjQOxAPlaRw2RQna2lxL25qWuxb+6WCFHBrjBCDEy2CT4bYTOq91\n\taVMQ==","X-Gm-Message-State":"AHPjjUgP3HvY+LRUWXmwDX7CP/Lq1VtuzZq4X0nl9AwaCRVyy+tszYMB\n\tOuBJkeaNfZGlkmMCBS4=","X-Google-Smtp-Source":"ADKCNb7l+rQM0tdNISMam6hym4VUWYvRwI1FIQqcC32H7f4U3pvzNGIVDSpPGqw3vAVLZQwQUf25dg==","X-Received":"by 10.223.175.116 with SMTP id\n\tz107mr22044798wrc.210.1505502846218; \n\tFri, 15 Sep 2017 12:14:06 -0700 (PDT)","From":"Marek Vasut <marek.vasut@gmail.com>","X-Google-Original-From":"Marek Vasut <marek.vasut+renesas@gmail.com>","To":"u-boot@lists.denx.de","Date":"Fri, 15 Sep 2017 21:13:57 +0200","Message-Id":"<20170915191359.28712-3-marek.vasut+renesas@gmail.com>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170915191359.28712-1-marek.vasut+renesas@gmail.com>","References":"<20170915191359.28712-1-marek.vasut+renesas@gmail.com>","Cc":"Marek Vasut <marek.vasut+renesas@gmail.com>","Subject":"[U-Boot] [PATCH 3/5] ARM: rmobile: Switch to DM PFC pinmux and GPIO\n\tdriver","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<http://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>","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\" <u-boot-bounces@lists.denx.de>"},"content":"Enable the PFC pinmux and GPIO drivers and disable the SH GPIO combo\ndriver. This allows the drivers to obtain pinmux and GPIO configuration\nfrom DT rather than hard-coding it in board files.\n\nSigned-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>\nCc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>\n---\n board/renesas/salvator-x/salvator-x.c | 2 ++\n board/renesas/ulcb/ulcb.c             | 2 ++\n configs/r8a7795_salvator-x_defconfig  | 4 ++++\n configs/r8a7795_ulcb_defconfig        | 4 ++++\n configs/r8a7796_salvator-x_defconfig  | 4 ++++\n configs/r8a7796_ulcb_defconfig        | 4 ++++\n include/configs/rcar-gen3-common.h    | 2 --\n 7 files changed, 20 insertions(+), 2 deletions(-)","diff":"diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c\nindex 78fc22a0e8..9d9de58370 100644\n--- a/board/renesas/salvator-x/salvator-x.c\n+++ b/board/renesas/salvator-x/salvator-x.c\n@@ -82,12 +82,14 @@ int board_init(void)\n \t/* adress of boot parameters */\n \tgd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;\n \n+#ifdef CONFIG_SH_GPIO_PFC\n \t/* Init PFC controller */\n #if defined(CONFIG_R8A7795)\n \tr8a7795_pinmux_init();\n #elif defined(CONFIG_R8A7796)\n \tr8a7796_pinmux_init();\n #endif\n+#endif\n \n #if defined(CONFIG_R8A7795)\n \t/* GSX: force power and clock supply */\ndiff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c\nindex 9b96645d11..3ee6990b57 100644\n--- a/board/renesas/ulcb/ulcb.c\n+++ b/board/renesas/ulcb/ulcb.c\n@@ -81,12 +81,14 @@ int board_init(void)\n \t/* adress of boot parameters */\n \tgd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;\n \n+#ifdef CONFIG_SH_GPIO_PFC\n \t/* Init PFC controller */\n #if defined(CONFIG_R8A7795)\n \tr8a7795_pinmux_init();\n #elif defined(CONFIG_R8A7796)\n \tr8a7796_pinmux_init();\n #endif\n+#endif\n \n \t/* USB1 pull-up */\n \tsetbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);\ndiff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig\nindex 72aada3078..d8f5d35fb2 100644\n--- a/configs/r8a7795_salvator-x_defconfig\n+++ b/configs/r8a7795_salvator-x_defconfig\n@@ -29,12 +29,16 @@ CONFIG_OF_CONTROL=y\n CONFIG_ENV_IS_IN_MMC=y\n CONFIG_CLK=y\n CONFIG_CLK_RENESAS=y\n+CONFIG_DM_GPIO=y\n+CONFIG_RCAR_GPIO=y\n CONFIG_DM_MMC=y\n CONFIG_MMC_UNIPHIER=y\n CONFIG_PHY_MICREL=y\n CONFIG_PHY_MICREL_KSZ90X1=y\n CONFIG_DM_ETH=y\n CONFIG_RENESAS_RAVB=y\n+CONFIG_PINCTRL=y\n+CONFIG_PINCTRL_PFC=y\n CONFIG_DM_REGULATOR=y\n CONFIG_DM_REGULATOR_FIXED=y\n CONFIG_DM_REGULATOR_GPIO=y\ndiff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig\nindex aaad75a74d..1aa2e69ac6 100644\n--- a/configs/r8a7795_ulcb_defconfig\n+++ b/configs/r8a7795_ulcb_defconfig\n@@ -28,10 +28,14 @@ CONFIG_OF_CONTROL=y\n CONFIG_ENV_IS_IN_MMC=y\n CONFIG_CLK=y\n CONFIG_CLK_RENESAS=y\n+CONFIG_DM_GPIO=y\n+CONFIG_RCAR_GPIO=y\n CONFIG_DM_MMC=y\n CONFIG_MMC_UNIPHIER=y\n CONFIG_DM_ETH=y\n CONFIG_RENESAS_RAVB=y\n+CONFIG_PINCTRL=y\n+CONFIG_PINCTRL_PFC=y\n CONFIG_DM_REGULATOR=y\n CONFIG_DM_REGULATOR_FIXED=y\n CONFIG_DM_REGULATOR_GPIO=y\ndiff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig\nindex cd10ecb3db..e0085d215b 100644\n--- a/configs/r8a7796_salvator-x_defconfig\n+++ b/configs/r8a7796_salvator-x_defconfig\n@@ -30,12 +30,16 @@ CONFIG_OF_CONTROL=y\n CONFIG_ENV_IS_IN_MMC=y\n CONFIG_CLK=y\n CONFIG_CLK_RENESAS=y\n+CONFIG_DM_GPIO=y\n+CONFIG_RCAR_GPIO=y\n CONFIG_DM_MMC=y\n CONFIG_MMC_UNIPHIER=y\n CONFIG_PHY_MICREL=y\n CONFIG_PHY_MICREL_KSZ90X1=y\n CONFIG_DM_ETH=y\n CONFIG_RENESAS_RAVB=y\n+CONFIG_PINCTRL=y\n+CONFIG_PINCTRL_PFC=y\n CONFIG_DM_REGULATOR=y\n CONFIG_DM_REGULATOR_FIXED=y\n CONFIG_DM_REGULATOR_GPIO=y\ndiff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig\nindex 107fa46b80..cbeda77bfd 100644\n--- a/configs/r8a7796_ulcb_defconfig\n+++ b/configs/r8a7796_ulcb_defconfig\n@@ -29,10 +29,14 @@ CONFIG_OF_CONTROL=y\n CONFIG_ENV_IS_IN_MMC=y\n CONFIG_CLK=y\n CONFIG_CLK_RENESAS=y\n+CONFIG_DM_GPIO=y\n+CONFIG_RCAR_GPIO=y\n CONFIG_DM_MMC=y\n CONFIG_MMC_UNIPHIER=y\n CONFIG_DM_ETH=y\n CONFIG_RENESAS_RAVB=y\n+CONFIG_PINCTRL=y\n+CONFIG_PINCTRL_PFC=y\n CONFIG_DM_REGULATOR=y\n CONFIG_DM_REGULATOR_FIXED=y\n CONFIG_DM_REGULATOR_GPIO=y\ndiff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h\nindex 6ed08e5bfc..6deed0dcd7 100644\n--- a/include/configs/rcar-gen3-common.h\n+++ b/include/configs/rcar-gen3-common.h\n@@ -31,8 +31,6 @@\n \n #define CONFIG_ARCH_CPU_INIT\n \n-#define CONFIG_SH_GPIO_PFC\n-\n /* console */\n #define CONFIG_SYS_CBSIZE\t\t2048\n #define CONFIG_SYS_BARGSIZE\t\tCONFIG_SYS_CBSIZE\n","prefixes":["U-Boot","3/5"]}