From patchwork Tue Mar 26 06:32:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 1065226 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T6UrKbwQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44T1s42mxjz9sNg for ; Tue, 26 Mar 2019 17:47:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730649AbfCZGrH (ORCPT ); Tue, 26 Mar 2019 02:47:07 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:41941 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731424AbfCZGcY (ORCPT ); Tue, 26 Mar 2019 02:32:24 -0400 Received: by mail-pl1-f193.google.com with SMTP id y5so1154943plk.8; Mon, 25 Mar 2019 23:32:24 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=n05gdPWRHIhq08sP8yadS4QZFNVpNhYfEvGLwxji304=; b=T6UrKbwQwBjelzKo7rb3pkZWlWmw9c0XJEcNC7/gN94XejFKO22wdHyNubGb+aIgtr IshD101Q2bOBPFbw2jssCPHg3SjFsz3WfARvs26Sf9swrlRk8qkkG8sKGnzTrQ5ROYBw q8eDHiFRrRxreX4CAERqu776eqfU6m1fqbjuwfpQgSSAUdVdzZbu7YveL1VY9Q4qx5Er 78H09UUGLWkHW6QWHK1N1ASqolmtR9DoICBQpHg4ohx4TQrA3CtlqufR5dUnHkx6viyB gmhKPZ9wqGXYkbxRvhgCXu2m35BxkNWN8gcSlO6hdBJ74yVRIb9DPan7YfWtm/N396xq Qo3g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=n05gdPWRHIhq08sP8yadS4QZFNVpNhYfEvGLwxji304=; b=SZQmBbBu1OPZdmvW3QWNI15szxcGne4xDs2R76PWbYvDk3lQsy3TpM5YL7Y6jj0gat PyGKEqktgrpnpWDn885Rcmav8JO+eaYgRFvsDoCkKSz7ovlETSyp4jyK4HLab9FaMwd7 7iyoeL20b3w2h+6UNqmcukZzI30VZDOv3GryQN0ZszP3ZXmBgqnISEnqokhIOwaRMhYZ jZvFby5n57bwedEtQXHFnAOLpZDQ6/me4AwvcLK8CHJbEtY0TZQvWCdS6KYQOcBp7Tl4 UiNmRyNJ5y9fxarZB52zW4OmQVQGmTPgvwopbW5ZZZwbErd0emJ5RnVaHuLY3N7RnmrX 380w== X-Gm-Message-State: APjAAAXh2yjwRmHfRiawUUgVjb82Ei/W6HpeFliYGM7yK0vHeSf2v2dS 3ROS2zF03B1fsjYr7uQhmAkcYH2T X-Google-Smtp-Source: APXvYqzoApkmLuhFJGAEmF8XZNHnm2birP7PbdXmPzJShszmEEZKW0fzcjzJEGmeFIp7S8AN0HS89A== X-Received: by 2002:a17:902:2e83:: with SMTP id r3mr11979261plb.153.1553581943385; Mon, 25 Mar 2019 23:32:23 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id m10sm20096573pgq.42.2019.03.25.23.32.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 23:32:22 -0700 (PDT) From: Andrey Smirnov To: linux-gpio@vger.kernel.org Cc: Andrey Smirnov , Linus Walleij , Bartosz Golaszewski , Chris Healy , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] gpio: of: Check for "spi-cs-high" in child instead of parent node Date: Mon, 25 Mar 2019 23:32:09 -0700 Message-Id: <20190326063209.6421-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326063209.6421-1-andrew.smirnov@gmail.com> References: <20190326063209.6421-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org "spi-cs-high" is going to be specified in child node of an SPI controller's representing attached SPI device, so change the code to look for it there, instead of checking parent node. Signed-off-by: Andrey Smirnov Cc: Linus Walleij Cc: Bartosz Golaszewski Cc: Chris Healy Cc: linux-gpio@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/gpio/gpiolib-of.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index ee7f08386a72..0220dd6d64ed 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -143,16 +143,16 @@ static void of_gpio_flags_quirks(struct device_node *np, * conflict and the "spi-cs-high" flag will * take precedence. */ - if (of_property_read_bool(np, "spi-cs-high")) { + if (of_property_read_bool(child, "spi-cs-high")) { if (*flags & OF_GPIO_ACTIVE_LOW) { pr_warn("%s GPIO handle specifies active low - ignored\n", - of_node_full_name(np)); + of_node_full_name(child)); *flags &= ~OF_GPIO_ACTIVE_LOW; } } else { if (!(*flags & OF_GPIO_ACTIVE_LOW)) pr_info("%s enforce active low on chipselect handle\n", - of_node_full_name(np)); + of_node_full_name(child)); *flags |= OF_GPIO_ACTIVE_LOW; } break;