From patchwork Fri Jun 19 09:06:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 11613527 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 6BC7D13B1 for ; Fri, 19 Jun 2020 09:07:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 52567208DB for ; Fri, 19 Jun 2020 09:07:06 +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="hbsAZmXN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731027AbgFSJHE (ORCPT ); Fri, 19 Jun 2020 05:07:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731813AbgFSJGy (ORCPT ); Fri, 19 Jun 2020 05:06:54 -0400 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 767A8C0613EF for ; Fri, 19 Jun 2020 02:06:53 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id q19so9409216eja.7 for ; Fri, 19 Jun 2020 02:06:53 -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=EF3uQr3RQED1YKYkNKEVE2Xoq5JyRRd7hiTR6pRsTG4=; b=hbsAZmXNE2TaOrADyfhZ4LncxAlKOcWNbKLbDeF2rsahruJQCNzLprdZsGdbsUDjbq qrzTvHV7mlFcoGs5wRL1DmgYNtpfTYJn4yUmv3wLcxZn6ifXoTmBYaKDalxxjprE4H75 OFcrYnlQQb3DyBgekcLt/QElT7wo5S4Fx2JoOrZuAHEe640Rad0m9k1WfJvRz++zkTS7 c4Xc2hdrnjqNTUCgQk4kqi9gGZAT/y0MHgN+y3t734xefMs29v8NjuC/JpsypOd6R2t4 Si6ZesNDYvk6F49qAjkeO/QV73MqqosehLo+mhVjGQDVaAiRozB3VWBJFDg8zbopksMe ClXw== 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=EF3uQr3RQED1YKYkNKEVE2Xoq5JyRRd7hiTR6pRsTG4=; b=eaHZmQBFwe08MshLRY8RfRbsyABNVk4w3oAfQVmPHQq/Ls+nTKHxpJWktdZh4vmJKj ylDJ2dsjwd+PIjYEeWo59vY9+k1ZLSLLZcgb4n51exR2IUHfhFzWHiYAZQFRERXbuD1s mGzi62ObyRCNNa2PIo5Bs9cqLUfk8yw3Ij/v339XjeV90c8H8JJqK7tKKkaotROvpQP9 LB4xcOBGk3IVL/cRyIBYK6xzOyMfX5qfmdUh5dxfDeZmQhAeIfzbCeGDbw5jY8935FT9 KRShwZtOZ0UU/s6+GRKoV+vEW0cYaX3/K/nCyhsAvuRBbzEWAIMCawxHmDSG8VaRP8UD Ci4w== X-Gm-Message-State: AOAM531zVJu8hlC9CT//p/o0ax1J/9e5HICH39mjY/yW2D3JfPBh+W4+ zirARbKzLz0HfO3p/V/E0rex+g== X-Google-Smtp-Source: ABdhPJwcHprUUq00PuchIFIQbAmYwvW8uI0PLiIJTeBXZedE5iHqZtnO5Gza2w34X9TiFWfp14Ftgg== X-Received: by 2002:a17:906:2615:: with SMTP id h21mr2624881ejc.84.1592557612232; Fri, 19 Jun 2020 02:06:52 -0700 (PDT) Received: from localhost.localdomain ([2001:16b8:5c68:7901:5c06:6064:338b:4004]) by smtp.gmail.com with ESMTPSA id dm1sm4653650ejc.99.2020.06.19.02.06.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 02:06:51 -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_Cousson?= , Jason Kridner , Robert Nelson Cc: Drew Fustini Subject: [PATCH v2 2/3] ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2 Date: Fri, 19 Jun 2020 11:06:07 +0200 Message-Id: <20200619090608.94948-3-drew@beagleboard.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619090608.94948-1-drew@beagleboard.org> References: <20200619090608.94948-1-drew@beagleboard.org> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This requires AM33XX_PADCONF macro in omap.h to be modified to keep pin conf and pin mux values separate. pinctrl-single.c must also be changed to support "pinctrl-single,pins" with 3 arguments (offset, conf, mux). Signed-off-by: Drew Fustini --- arch/arm/boot/dts/am33xx-l4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi index 340ea331e54d..f9b99cfa93b6 100644 --- a/arch/arm/boot/dts/am33xx-l4.dtsi +++ b/arch/arm/boot/dts/am33xx-l4.dtsi @@ -290,7 +290,7 @@ scm: scm@0 { am33xx_pinmux: pinmux@800 { compatible = "pinctrl-single"; reg = <0x800 0x238>; - #pinctrl-cells = <1>; + #pinctrl-cells = <2>; pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0x7f>; };