From patchwork Mon Jun 22 17:29:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 11618527 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AB3AE90 for ; Mon, 22 Jun 2020 17:34:04 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 840CB20656 for ; Mon, 22 Jun 2020 17:34:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LFcY4UNa"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=beagleboard-org.20150623.gappssmtp.com header.i=@beagleboard-org.20150623.gappssmtp.com header.b="S1nZPtuC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 840CB20656 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=beagleboard.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pujZl4GMbz5sxcgX7NL3P+81BynQ3tGMhzxCDTt9nfw=; b=LFcY4UNaBuevkiCw/IVToZeaC QSyH4AZaxlmj6CBLR//xQruu1WuwdA1Cf7pyELTNBYE3hJEKjP1CBYHmuf5P08stm+X59xFlkmLIn pRCNBeRPT2xlKqS8eKSvTApz/3miQCcoXkhjRGqp/qzkAvH8mDMEFnrsKpI/df8msDbCE4M7BVZ11 TS47qjueYHQ3Ma+0X+P7YOPlHGWFy9dU8D6njn8HedZt/YxB9ySblCi0NOetKnRC0ErwsOZ4VEznH kK+7zjpASNLS7xB+IX2BcJiYTeFA/6c5/3ZGWOpON9BL1yoJsan2X4R8D5h4eXim4oWrVAXQzqu1y BgthvmK8g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnQIs-0004Oq-M4; Mon, 22 Jun 2020 17:32:18 +0000 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnQIn-0004Nk-U3 for linux-arm-kernel@lists.infradead.org; Mon, 22 Jun 2020 17:32:14 +0000 Received: by mail-ed1-x542.google.com with SMTP id h28so2079580edz.0 for ; Mon, 22 Jun 2020 10:32:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=beagleboard-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ovMidJWukcafnyUoSegnCUeUmM9YyWMYRmZkPwlZahM=; b=S1nZPtuCdm9ch5pQNWiGH0hwwTOBb4GAKeUf+HVXrp4fLD6NUbUuL94SbjOI/LSS72 SLNwG0UwdqqXjt2F0prL0dbz+CAh/m9BMSqbcY8gilzAsxJZPdXM0F/urV0hyXeybDkL RhONouhDGUBW1IMPo9Mh0nnQCnmVrs4ki9G9ZDrM0tzF9L0IgeqlFVeBl6hGOe89GYZC FPY3Hi8tOBAASdiHPFbx2ohJrv7c+1Y8WlJBxgF0WK4NF0ZE8tRaayrg3oCbaRKiz/Hi G8Z3m2Qj/LZjTZDHt92amMenX3Z4xHL3JGnDuOoBSIMDDbD/g3LDAXEid83jDqzzdEit 24ig== 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=ovMidJWukcafnyUoSegnCUeUmM9YyWMYRmZkPwlZahM=; b=JI3qSxyxrZTlbAmAXLU0UzO/nyVtTXrA2zzkgR1qPLIGgIpM7NqdoM/90YVlkSgEiD gEXlOV4n22U+Qlvd+GNHLxOcWodfG6s3cmlYZVuTh7C3c6jIhk5LDYcneETcNxmnvEbX dAcd4K9Lsg3wiahbPh0UKupEXtoyDBr8qoqQ9YotBZpbP4+Ts7+9TCyiV/uYijYHvHyB J5yrhOfyOeJXsxY19rL1J5h46FWAy08rPSLy6jPnjW7gco3Pht4hmbKTL6ewZBVOy6ac Y1VDBBt7SCaWsbkJifN0kIt5k8LNoX/lTnGx5bPyJTKDN5rJwH0Lv1jszHxfyoPQ3JnN NxmA== X-Gm-Message-State: AOAM530yCXs5ub+H1LL/6lliFdVaWHyvDFg+eBuTmVBxsNoCqxDXyZf/ EPHgIDsAdUJHAM+8osogpnwUKA== X-Google-Smtp-Source: ABdhPJwe6Gd4k/+os6hh1s7VvLRlLAAlNwHWabRdlzNF1D1Cg3UJFff7cvs543eV0RNNYMW2oKsqUA== X-Received: by 2002:aa7:da8c:: with SMTP id q12mr18327099eds.385.1592847132701; Mon, 22 Jun 2020 10:32:12 -0700 (PDT) Received: from localhost.localdomain (i59F66838.versanet.de. [89.246.104.56]) by smtp.gmail.com with ESMTPSA id z1sm4747386ejb.41.2020.06.22.10.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2020 10:32:11 -0700 (PDT) From: Drew Fustini To: Tony Lindgren , Rob Herring , linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij , Haojian Zhuang , devicetree@vger.kernel.org, bcousson@baylibre.com, Jason Kridner , Robert Nelson Subject: [PATCH v3 1/3] pinctrl: single: parse #pinctrl-cells = 2 Date: Mon, 22 Jun 2020 19:29:49 +0200 Message-Id: <20200622172951.524306-2-drew@beagleboard.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200622172951.524306-1-drew@beagleboard.org> References: <20200622172951.524306-1-drew@beagleboard.org> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: 0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:542 listed in] [list.dnswl.org] 0.7 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Drew Fustini Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If "pinctrl-single,pins" has 3 arguments (offset, conf, mux) then pcs_parse_one_pinctrl_entry() does an OR operation on to get the value to store in the register. Signed-off-by: Drew Fustini --- drivers/pinctrl/pinctrl-single.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index a9d511982780..17b32cafe5f0 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1017,10 +1017,17 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs, break; } - /* Index plus one value cell */ offset = pinctrl_spec.args[0]; vals[found].reg = pcs->base + offset; - vals[found].val = pinctrl_spec.args[1]; + + switch (pinctrl_spec.args_count) { + case 2: + vals[found].val = pinctrl_spec.args[1]; + break; + case 3: + vals[found].val = (pinctrl_spec.args[1] | pinctrl_spec.args[2]); + break; + } dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x\n", pinctrl_spec.np, offset, pinctrl_spec.args[1]);