From patchwork Mon Jun 22 17:29:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 11618531 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 E8D8F90 for ; Mon, 22 Jun 2020 17:34:19 +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 C250720656 for ; Mon, 22 Jun 2020 17:34:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LENDEYZ7"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="nKw0jnup"; 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="IvuoGUIW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C250720656 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=hcQn+Z4fJ2Bp8geLvjzN9OD8r7zB0S7cY3rmS+NdYmQ=; b=LENDEYZ7YIbSXcC3KyNFsUDK5 ThJUUTj94b9AHkjGegyFQzS4xo7OqoaWRqXWC2HmdAnozlB/mekE4H7iQNBvvujJBx63cISPwoHk6 dNM/rSuZd9leGrbNVxmXjSz6GoFZXxxnoiQd80Xv0OYg0e348Of5ti+Y9A/C8s3hQoW7Gu2eKf95I 21ZiOi9Pe8tC9lJ3r1Dvo1FB1vzwduyPqksgDNQ1Eaxo125JDTQZUt4faagdbQW4Wi8QWZVN2b+YP Iq3Gq29bwmxrRWqdcmAUwVF4LNHBmJl8W/183Dqwpc5mwAhuwwD782VRA3hEvwtqfoq6tHbD3qKfk Rh1kgjXaQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnQJ1-0004QV-QG; Mon, 22 Jun 2020 17:32:27 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnQJ0-0004Q7-6M for linux-arm-kernel@merlin.infradead.org; Mon, 22 Jun 2020 17:32:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Bp2iCF0V+pxEB1qX+I4xhpc7NppyeLuUVo+dt6mFcSk=; b=nKw0jnupD77dYme3Mw1lpXPAxy chFoImlNeiNMGTX/AHO+ZOPNT4HiOjr9Kv706eLx2dBW/TNzkWZqeMK59XnwnFfiA2rUtnxvd2AMr oLxFpwPoOfJhVugjxVX3IOIywEkvwoIR7xC+AoZ/zQhrciBmmJzM5MeAM4mcQ+bTqsD1ML+ZkjNNa dSp3fRGpClUOtJn/vv/Vs93ejNhq1UX7Zpe2ptGpWRG6b3EKfrvXfsTjwkU5VoBOf3kKFWu1OI7bU xiFe7uHerRSaHHasSqA5Nq1zNqmfvSnAUVWt3QisaRdQVA9RL6mTSpXrxKq/o/5qGBg6Y0GFjL7pe NWjcXDJQ==; Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnQIx-0002GI-8Y for linux-arm-kernel@lists.infradead.org; Mon, 22 Jun 2020 17:32:25 +0000 Received: by mail-ej1-x642.google.com with SMTP id rk21so2460410ejb.2 for ; Mon, 22 Jun 2020 10:32:23 -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=Bp2iCF0V+pxEB1qX+I4xhpc7NppyeLuUVo+dt6mFcSk=; b=IvuoGUIWcCIQo6CK77cG7w8/8i6yMRGu3jqAVtDneEVMOskWKPt1H5oEvI8WqMhZNy q3SZWQbxGmZX1YAnVnJLK3IZb+MNj06WDzV3WIOWGXbePqjg6Gr32LVdAm+ea4xL1J1R 3uHLkLBW/4wYUdbOWNMEPxv0aCuTQsY3P2oXIKSxqAuZexLhJMJjaysulNWtJ9oTIJfK 72vrHtPOxvoSYRgMDiorDeWTFthyA+/CQfOVWG7szw4j5gleM7rbHk0lDC2nfCgr24FK SVj5JBtkX2fLH2Ifz7i/LUeoqZubDhCzule77jMfzb6forrMTIIRz/JN/qtFMGyKwyrj QMzw== 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=Bp2iCF0V+pxEB1qX+I4xhpc7NppyeLuUVo+dt6mFcSk=; b=HVb3xc8YVtjZrxSojoGTRTgXkeHz6a7Wt2HEppCmCA8XusZY7j+3Ek7CS54kxXRdYv ItkhhfKqW51aBeRaDWjZbz93JFaVIBlEUf6yyDHs4ulFdj8syigPQPHtZAmAaWFgfNgx U5ftP5mF/rP5REecVXmf2EZ/n4CBFQVx/pqYpM77Lz0L7FoWfGhF/KnbOnTIpKFHuoqi v6c9ezikdutFgv1d77T0dHwI1R72BQdhwIIzRUhSAVOlq4ZMhxuRYDbZnpMoVImVidT6 EnliOD9qtY8H1B4BZrSSgiIH9opKuUWEwIrrdJn+6eFMj68YaaZcErhV7i/eAUG6HL+C iz0A== X-Gm-Message-State: AOAM5317ExQFkMqzvx5Mlfy/Q3yiVmCEBvm57oVQmrXkrakIH1Y6+bhA tW4164HHoDhn5KUAz/CkTejU4Q== X-Google-Smtp-Source: ABdhPJy021kLIGLXUWAQwFLlIxfxylwPiPKp9FWG0opDvmlw8+MPskGqjPkQP4pPHMC+fjUtjPUFfA== X-Received: by 2002:a17:906:454b:: with SMTP id s11mr17460979ejq.546.1592847138559; Mon, 22 Jun 2020 10:32:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2020 10:32:17 -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 2/3] ARM: dts: change AM33XX_PADCONF macro separate conf and mux Date: Mon, 22 Jun 2020 19:29:50 +0200 Message-Id: <20200622172951.524306-3-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200622_183223_559549_4C8B3D3E X-CRM114-Status: GOOD ( 13.46 ) X-Spam-Score: -1.1 (-) X-Spam-Report: SpamAssassin version 3.4.4 on casper.infradead.org summary: Content analysis details: (-1.1 points, 5.0 required) 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:642 listed in] [list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.8 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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 AM33XX_PADCONF macro is modified to keep pin conf and pin mux separate. This requires #pinctrl-cells = 2 in am33xx-l4.dtsi pinctrl-single.c but also be changed to support "pinctrl-single,pins" with 3 arguments (offset, conf, mux) Signed-off-by: Drew Fustini --- include/dt-bindings/pinctrl/omap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h index 625718042413..2d2a8c737822 100644 --- a/include/dt-bindings/pinctrl/omap.h +++ b/include/dt-bindings/pinctrl/omap.h @@ -65,7 +65,7 @@ #define DM814X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) #define DM816X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) #define AM33XX_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) -#define AM33XX_PADCONF(pa, dir, mux) OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux)) +#define AM33XX_PADCONF(pa, conf, mux) OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux) /* * Macros to allow using the offset from the padconf physical address