From patchwork Mon Oct 21 13:02:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick DELAUNAY X-Patchwork-Id: 1180575 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=st.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=st.com header.i=@st.com header.b="LhMjoCH1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46xcJC4srlz9s4Y for ; Tue, 22 Oct 2019 00:03:07 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CE12DC21E1E; Mon, 21 Oct 2019 13:03:00 +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 81D61C21C93; Mon, 21 Oct 2019 13:02:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9D273C21C93; Mon, 21 Oct 2019 13:02:56 +0000 (UTC) Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [62.209.51.94]) by lists.denx.de (Postfix) with ESMTPS id 49E72C21C29 for ; Mon, 21 Oct 2019 13:02:56 +0000 (UTC) Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x9LD0t5M025041; Mon, 21 Oct 2019 15:02:45 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=STMicroelectronics; bh=pHj6i7JwV+UMOcaxjaRkAfP2IuSM0tYtK1F1xntyadA=; b=LhMjoCH1mXfbM5c7B/+zmvt6rBsGH2d3UGwp+1dUcQGmhUH7UifaWWyzS5aQZQLlgPma Ww1ifzfl5Z7tVAl9bGk67OPAQSS3RVX0AJEBVvUoWxUr76+BxhwwTXDk+gNh05uf+zzU tq17GkIaePw8K2xmF7Pk+tX5ZZM6aZGZQqAJMohKcPTmoNpfrgXxY9v1nqrwObkakpTk AApOyz/4M5RZTVO0Rwgn33zf2rESikwwYWD1JtKAx0qkoRym78TPfmUfxoX2erayrg9I 2Tqd3LHwqpPYZlWlKmoYbEbsl1WVKWJwqL55k+hmd6TheHkIHtbSBGwd8ET/4xAsiQF8 GQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2vqr8w23r3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Oct 2019 15:02:45 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id A459510002A; Mon, 21 Oct 2019 15:02:43 +0200 (CEST) Received: from Webmail-eu.st.com (Safex1hubcas24.st.com [10.75.90.94]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 83D332FF5E0; Mon, 21 Oct 2019 15:02:43 +0200 (CEST) Received: from SAFEX1HUBCAS22.st.com (10.75.90.93) by Safex1hubcas24.st.com (10.75.90.94) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 21 Oct 2019 15:02:43 +0200 Received: from localhost (10.201.21.107) by Webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 21 Oct 2019 15:02:42 +0200 From: Patrick Delaunay To: Date: Mon, 21 Oct 2019 15:02:40 +0200 Message-ID: <20191021130240.31808-1-patrick.delaunay@st.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.201.21.107] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,1.0.8 definitions=2019-10-21_04:2019-10-21,2019-10-21 signatures=0 Cc: Christoph Muellner , U-Boot STM32 , Marek Vasut Subject: [U-Boot] [PATCH v2] dm: pinctrl: fix for introduce PINCONF_RECURSIVE option 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Correct the name of the define used CONFIG_IS_ENABLED which is not aligned with Kconfig name: CONFIG_$(SPL_)PINCONF_RECURSIVE. The recursive calls is conditional only for UCLASS_PINCONFIG "pinconfig" driver. It is always needed to call pinctrl_post_bind for UCLASS_PINCTRL "pinctrl", the test CONFIG_IS_ENABLED(PINCONF_RECURSIVE) need to be removed for this driver. This correct a regression introduced because the same patch is applied twice times in u-boot-dm branch: - commit e878b53a79d1 ("dm: pinctrl: introduce PINCONF_RECURSIVE option") - commit c20851b3d850 ("dm: pinctrl: introduce PINCONF_RECURSIVE option") Signed-off-by: Patrick Delaunay --- Hi, This patch solve regression on stm32mp157c-ev1 board (boot failed) on master branch since Merge tag 'dm-pull-15oct19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm The V1 patch was a partial solution, it solve the first issue detected on sandbox. Regards Patrick Changes in v2: - update a second error after tests: don't remove post bind ops for pinctrl driver. drivers/pinctrl/pinctrl-uclass.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 0b1eb7fab4..761ee29f41 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -157,7 +157,7 @@ static int pinconfig_post_bind(struct udevice *dev) UCLASS_DRIVER(pinconfig) = { .id = UCLASS_PINCONFIG, -#if CONFIG_IS_ENABLED(PINCONFIG_RECURSIVE) +#if CONFIG_IS_ENABLED(PINCONF_RECURSIVE) .post_bind = pinconfig_post_bind, #endif .name = "pinconfig", @@ -426,9 +426,7 @@ static int __maybe_unused pinctrl_post_bind(struct udevice *dev) UCLASS_DRIVER(pinctrl) = { .id = UCLASS_PINCTRL, -#if CONFIG_IS_ENABLED(PINCONF_RECURSIVE) .post_bind = pinctrl_post_bind, -#endif .flags = DM_UC_FLAG_SEQ_ALIAS, .name = "pinctrl", };