From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1E83C433DF for ; Thu, 18 Jun 2020 12:51:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7FFD720884 for ; Thu, 18 Jun 2020 12:51:50 +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="TRVf5p71" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729772AbgFRMvs (ORCPT ); Thu, 18 Jun 2020 08:51:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729918AbgFRMvo (ORCPT ); Thu, 18 Jun 2020 08:51:44 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 015F5C0613EE for ; Thu, 18 Jun 2020 05:51:44 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id b82so5087824wmb.1 for ; Thu, 18 Jun 2020 05:51:43 -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=kre93dd6hT4pYBC6xQN9FkazTNYBQtZr78iwLPfwCF4=; b=TRVf5p71/Ag4UNdwc/kW3lZlfblIowK80W+zyKByyru7UHXDqLeD7vCHyYGEpt4SE8 3feY5JsWedJKgdl+5OIez+/8F1tBVDJ/4VA824OzPcsTBPPvCrjYcFFz+5R42CWGMpFk mlGZ12sNiwhEH5GEti9o1QKOKAO3W7nFkr8QTy+Z1+eE7pHgMptcgUtDt7tXkhGRvw4n cx+fObyf5nAwwcDb3tVugVuQRdrGOCmLMqYP/S8rptL6ZYej0IPNQtAirgnNgm1sqRxL vxooeW/Khk5NA3xdrlKD4ZmJ/mz/QX4rgry57toQ8SIDlnksSH7oTPVxq5NIWkRvVkpJ 4NpA== 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=kre93dd6hT4pYBC6xQN9FkazTNYBQtZr78iwLPfwCF4=; b=btlv18/JaaZtUH7G4apC9Ij2C9+W9tV7r4b6yFaeTCdr60wdhTKz2ov/2X1QOjTAS9 Z+lmUPC+l6oWfm/MFFv5WQfAlTDn4O88VPH/d1ZLbrqp69uJuzZNMrcfW/6iMv0lADVu iXhy1HuTWc3HM8JAM2yBsdBi9X9AqqM1GgqQo//Lg5+srX/ZsJfRpGBLDfj2IpxJwPjA b3gU7F2wSsyWneNSwpc91tYhF6HD3RvBXS3gmpEDgOdtwfiEk4o8sbV+WLSOt8LZ6y+c KfMWlhdHHKPLqBOGiOWdmsDqF1SGzxmB+Bjq1t2WqGJhS6A4p8FSULOh74Le3O0abezB M6GA== X-Gm-Message-State: AOAM532nq6Lh1cCsDfPRkuW8GkuhkXaCdSosVPPrnZHw93voRDnmxNOu mUD3Sb/p0XiAjmujjhAY49uNew== X-Google-Smtp-Source: ABdhPJx5wChPkJh3wqqQH8t9n3fY00xH6TQW/iPEoWFdYFr16TgedzvEFOTdfZ9BL2dZZbmQXlZ/4w== X-Received: by 2002:a1c:44c3:: with SMTP id r186mr3831425wma.67.1592484702734; Thu, 18 Jun 2020 05:51:42 -0700 (PDT) Received: from localhost.localdomain (i59F66838.versanet.de. [89.246.104.56]) by smtp.gmail.com with ESMTPSA id v27sm3714151wrv.81.2020.06.18.05.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2020 05:51:41 -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, =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Jason Kridner , Robert Nelson Cc: Drew Fustini Subject: [PATCH 1/3] ARM: dts: change AM33XX_PADCONF macro separate conf and mux Date: Thu, 18 Jun 2020 14:50:55 +0200 Message-Id: <20200618125057.41252-2-drew@beagleboard.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618125057.41252-1-drew@beagleboard.org> References: <20200618125057.41252-1-drew@beagleboard.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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..a0974923bb1b 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 -- 2.25.1