From patchwork Wed Jul 1 01:33:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 11635197 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 8EEEC92A for ; Wed, 1 Jul 2020 01:33:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C99E20781 for ; Wed, 1 Jul 2020 01:33:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=beagleboard-org.20150623.gappssmtp.com header.i=@beagleboard-org.20150623.gappssmtp.com header.b="0JTT3bwG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725862AbgGABdf (ORCPT ); Tue, 30 Jun 2020 21:33:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725886AbgGABde (ORCPT ); Tue, 30 Jun 2020 21:33:34 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7740CC03E97A for ; Tue, 30 Jun 2020 18:33:34 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id h28so18118099edz.0 for ; Tue, 30 Jun 2020 18:33:34 -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:mime-version :content-transfer-encoding; bh=/VYml6MLvVnH67ofYRYqVd160Mf/rDTxD1O5uDA9s3c=; b=0JTT3bwG/3G71Kq+zgpc6slp9fDtHbqeAZXEqcX5hauhtzWEnqI/CV0G2PuXoTzq6Q qpb34SgQD7+KNt//LUpiB5uK7fPW72OfRraXvy21ADOypcUqUVSeyngLagnFGXEKE1Qs Y+evYWYMZrGSR7/jCCQOJbnlEikeyGCZrotPgjfh7vrI+eWtXRjZKXddpOuhYlChfJRr EAFyaKlTvigdR8bQn9FnT+eGHUx/dOf6DUy57YBHDl00N5RdS8FjW8bUJZENylPSPqzO h4VOBtgYi5kizz3gOnvSHbcpFA46ecZ6Fjr1uTYTSgpzNywTCueRBaU1VwcCn7a0CoHw /VDg== 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:mime-version :content-transfer-encoding; bh=/VYml6MLvVnH67ofYRYqVd160Mf/rDTxD1O5uDA9s3c=; b=qaYv1jxStPCT3Oxq6+uCv4nMUPcDu3sfDZTrRIvPoE6cslVje1mVJkDehHxYRUlfQJ vAxSk8foIHT2XHFp5CIh1JXCparnv433wEaiLjGTZRic/04hWUjKBsFHZ6Oe/eRvzSjj boDTP4egK6MA8cRU8biaKnreaPaaEPkHEFeHll3WsAurlj52uFVg/7QS+6s2mWKCxKGG 39j/gGEMQm4LOiwr7/8qOLtbx/fXIfPoy8uuU+DY6EYQAOdxW/yh8Pig5AGe22FOKT07 fK8dnnoi42ndizHCx8XvoL29Pq1C/O2Sbn4yU8uS0X92TUL8CA3vqHJ1NVm2dKVnxwT8 1OiQ== X-Gm-Message-State: AOAM530kaiyb3JXxHcqVxLQepLb7ArjczRE6CkgQDFg0RvHHlryhGp4t NBNZSEpQY69OvPF6MC+sGkjzKA== X-Google-Smtp-Source: ABdhPJxUV3RPX54vZQ0QT0VrM5ktf5G9tcfaBT5ASwITZJ8pLiOxiO7nQqq6vhAytpCs66H7qUKwAw== X-Received: by 2002:a50:e8c9:: with SMTP id l9mr19125444edn.272.1593567213062; Tue, 30 Jun 2020 18:33:33 -0700 (PDT) Received: from localhost.localdomain ([2001:16b8:5c28:7601:2d3c:7dcb:fbf0:3875]) by smtp.gmail.com with ESMTPSA id d23sm3348571eja.27.2020.06.30.18.33.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 18:33:31 -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 Cc: Drew Fustini Subject: [PATCH v4 0/2] pinctrl: single: support #pinctrl-cells = 2 Date: Wed, 1 Jul 2020 03:33:18 +0200 Message-Id: <20200701013320.130441-1-drew@beagleboard.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Currently, pinctrl-single only allows #pinctrl-cells = 1. This series will allow pinctrl-single to also support #pinctrl-cells = 2 If "pinctrl-single,pins" has 3 arguments (offset, conf, mux) then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register. To take advantage of #pinctrl-cells = 2, the AM33XX_PADCONF macro in omap.h is modified to keep pin conf and pin mux values separate. change log: - v4: squash patches 2 and 3 together so that git biesct will not result in a boot failure - v3: change order of patches to make sure the pinctrl-single.c patch does not break anything without the dts patches - v2: remove outer parentheses from AM33XX_PADCONF macro as it causes a compile error in dtc. I had added it per suggestion from checkpatch about having parentheses around complex values. Drew Fustini (2): pinctrl: single: parse #pinctrl-cells = 2 ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2 arch/arm/boot/dts/am33xx-l4.dtsi | 2 +- drivers/pinctrl/pinctrl-single.c | 11 +++++++++-- include/dt-bindings/pinctrl/omap.h | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) Acked-by: Tony Lindgren Acked-by: Haojian Zhuang