From owner-dev-commits-src-main@freebsd.org Fri Jan 15 19:33:48 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E21DA4F05F1; Fri, 15 Jan 2021 19:33:48 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DHWZM5TBGz3jGc; Fri, 15 Jan 2021 19:33:47 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1610739218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zFL3/vS0KP69HTtU3kwUcc44y7OEitL0+xtZgavRMB0=; b=IaHpp1wj/jo+kcxTk3TCN+NUKB4il/JQeD1sT2R8mbH1tYbWIHvtC+Gr4kmnA7199RNFyG 6prpryj68wrZNPqibfVKO1gTQJw26eMzoh498iKttdi08n0jl2sYBmzcHhFo+jWP4RbaE+ Pq6fL92CW6WQ7I5CpvnxXkPpjRFxPuw= Received: from skull.home.blih.net (lfbn-idf2-1-745-114.w86-247.abo.wanadoo.fr [86.247.192.114]) by mx.blih.net (OpenSMTPD) with ESMTPSA id c71a0d96 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 15 Jan 2021 19:33:38 +0000 (UTC) Date: Fri, 15 Jan 2021 20:33:38 +0100 From: Emmanuel Vadot To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 78abc9e2e6ed - main - Revert upstream commit 27c90e5e48d0 Message-Id: <20210115203338.d18bef00225008b820a4cd99@bidouilliste.com> In-Reply-To: <202101151910.10FJA88A078449@gitrepo.freebsd.org> References: <202101151910.10FJA88A078449@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DHWZM5TBGz3jGc X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=IaHpp1wj; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-3.50 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[212.83.155.74:from]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; FREEFALL_USER(0.00)[manu]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SH_EMAIL_DBL_DONT_QUERY_IPS(0.00)[0.0.3.32:email]; SPAMHAUS_ZRD(0.00)[212.83.155.74:from:127.0.2.255]; DBL_PROHIBIT(0.00)[0.0.3.32:email]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jan 2021 19:33:48 -0000 On Fri, 15 Jan 2021 19:10:08 GMT Emmanuel Vadot wrote: > The branch main has been updated by manu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=78abc9e2e6edcc286136896c1793d40899750012 > > commit 78abc9e2e6edcc286136896c1793d40899750012 > Author: Emmanuel Vadot > AuthorDate: 2021-01-15 18:02:37 +0000 > Commit: Emmanuel Vadot > CommitDate: 2021-01-15 19:07:08 +0000 > > Revert upstream commit 27c90e5e48d0 > > It changed the #pinctrl-cells value to be equal to 2 and the macro > that generates the values. > Based on the bindings docs a value of 2 is only acceptable if the node > used pinctrl-single,bits and not pinctrl-single,pins > > This allow booting further on the beaglebone black with 5.9 DTS > --- > sys/contrib/device-tree/include/dt-bindings/pinctrl/omap.h | 2 +- > sys/contrib/device-tree/src/arm/am33xx-l4.dtsi | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sys/contrib/device-tree/include/dt-bindings/pinctrl/omap.h b/sys/contrib/device-tree/include/dt-bindings/pinctrl/omap.h > index 2d2a8c737822..625718042413 100644 > --- a/sys/contrib/device-tree/include/dt-bindings/pinctrl/omap.h > +++ b/sys/contrib/device-tree/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, conf, mux) OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux) > +#define AM33XX_PADCONF(pa, dir, mux) OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux)) > > /* > * Macros to allow using the offset from the padconf physical address > diff --git a/sys/contrib/device-tree/src/arm/am33xx-l4.dtsi b/sys/contrib/device-tree/src/arm/am33xx-l4.dtsi > index b88d0caa4b2d..45de2ff6a777 100644 > --- a/sys/contrib/device-tree/src/arm/am33xx-l4.dtsi > +++ b/sys/contrib/device-tree/src/arm/am33xx-l4.dtsi > @@ -290,7 +290,7 @@ > am33xx_pinmux: pinmux@800 { > compatible = "pinctrl-single"; > reg = <0x800 0x238>; > - #pinctrl-cells = <2>; > + #pinctrl-cells = <1>; > pinctrl-single,register-width = <32>; > pinctrl-single,function-mask = <0x7f>; > }; The issue was reported upstream. https://lists.infradead.org/pipermail/linux-arm-kernel/2021-January/631852.html Also we don't have support for pinctrl-single,bits in the TI code so even if they did the right thing that would have break for us. -- Emmanuel Vadot