From patchwork Wed Jun 6 21:40:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 926052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aBhTqFyd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 411MY93hVZz9s2t for ; Thu, 7 Jun 2018 07:40:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752074AbeFFVko (ORCPT ); Wed, 6 Jun 2018 17:40:44 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:33949 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006AbeFFVkn (ORCPT ); Wed, 6 Jun 2018 17:40:43 -0400 Received: by mail-qt0-f193.google.com with SMTP id d3-v6so8062526qto.1 for ; Wed, 06 Jun 2018 14:40:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=daueT9qNDhP1UE2pSJ/jnv7JVdYJEzCPzFqmT5rEAvY=; b=aBhTqFydXEfqdQmMVR8qUYl07Xyp3OU7NfgEybLSorHLIOLsWHNolDlFy+Apf9/Obz TRZGFDOcxjV4shYkrgtXtEpQbwPaLqDS7uOd3BQ4NxI6Bsaf3Y4cRPBZZ0GgUwevf6kC AMjYVBXjaLuWRYmMYCG1kWM1mgUSISIx5NTjmfwnvdk5WrL0qrqcjfHkXbh5xo7sBbRf II1BvGBtyToX/xzU7JfUhExhaH9BORA+Z4vp5YPXAC3TucdK7J4USrqYWFg4kFhjk+C5 Hje0sYdVofkMaxXnzs1SMwtC0ImAe/RStD5Crl1MysSukDjmi5LoserpvY+K+V6DsBLe oaOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=daueT9qNDhP1UE2pSJ/jnv7JVdYJEzCPzFqmT5rEAvY=; b=TqDRN5NPRZCWITVUZTFnB5qc+zBbckg9SWj7vxA3HksDjUeEzMUIOa+/+BBH+0GUf2 oWitepwwB0LBcITDrgm7UTQjCa1ymBneksfgs9BzMciTBM3XuKcwMgsiY3dbP36scCEk bu1nPfhytb/+95Ng/HvITR6IftzYKIZoGhZW665gnZviAlBCDaocrSYd9O0GGPLq4AI+ ryRUagWSjvpIf1v9jjSdNQGhDNm+0nPgXaxHcXpDCeZXMLl8lnhe8/5shcfAsiB3nuAd NlJr/V9aGFa7gztF04WSAMEZ4Q51w3n5RXT+iwR078XU26/ahk/+lK7E0zeK7e2a1G4+ SVCg== X-Gm-Message-State: APt69E2vBVihyPFMDdK/VAW5OiNsR5fOrhKNG/TwQnF9H9eP+aZvfqBv YQWaoogU5SxdX5sJWOYDjig= X-Google-Smtp-Source: ADUXVKK8xTP0yvY+o+LAcI1lsf1hFMw6IJBVV35LYZeLcj9XUUUf/NYCLefsscv0KF1mNaQg6TXflw== X-Received: by 2002:aed:38ca:: with SMTP id k68-v6mr4531551qte.385.1528321242853; Wed, 06 Jun 2018 14:40:42 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:482:b34:5548:7abc:2ac1:82cb]) by smtp.gmail.com with ESMTPSA id p51-v6sm7992890qtc.43.2018.06.06.14.40.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jun 2018 14:40:42 -0700 (PDT) From: Fabio Estevam To: linus.walleij@linaro.org Cc: rf@opensource.cirrus.com, linux-gpio@vger.kernel.org, slongerbeam@gmail.com, shawnguo@kernel.org, kernel@pengutronix.de, linux-imx@nxp.com, Fabio Estevam Subject: [PATCH] Revert "pinctrl: devicetree: Fix dt_to_map_one_config handling of hogs" Date: Wed, 6 Jun 2018 18:40:22 -0300 Message-Id: <1528321222-10193-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Fabio Estevam This reverts commit b89405b6102fcc3746f43697b826028caa94c823. commit b89405b6102f ("pinctrl: devicetree: Fix dt_to_map_one_config handling of hogs") causes all the pinctrl hog pins to be ignored leaving them with the IOMUX settings untouched. This causes several regressions on i.MX such as: - OV5640 camera driver can not be probed anymore on imx6qdl-sabresd because the camera clock pin is in a pinctrl_hog group and since its pinctrl initialization is skipped, the camera clock is kept in GPIO functionality instead of CLK_CKO function. - Audio stopped working on imx6qdl-wandboard and imx53-qsb for the same reason. Reported-by: Steve Longerbeam Signed-off-by: Fabio Estevam --- drivers/pinctrl/devicetree.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c index b601039..1ff6c3573 100644 --- a/drivers/pinctrl/devicetree.c +++ b/drivers/pinctrl/devicetree.c @@ -122,10 +122,8 @@ static int dt_to_map_one_config(struct pinctrl *p, /* OK let's just assume this will appear later then */ return -EPROBE_DEFER; } - /* If we're creating a hog we can use the passed pctldev */ - if (pctldev && (np_pctldev == p->dev->of_node)) - break; - pctldev = get_pinctrl_dev_from_of_node(np_pctldev); + if (!pctldev) + pctldev = get_pinctrl_dev_from_of_node(np_pctldev); if (pctldev) break; /* Do not defer probing of hogs (circular loop) */