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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30D04EB64DA for ; Wed, 19 Jul 2023 06:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1vwj0/E6pZVyy9DMcqrG0L/zZdUll2yN6+mDyeduJhM=; b=TOZ71THtVAJLBS jfLXtST24YiytNeDNY5s5nDVkpKMGOZDKLHUh7A8fUQlsh00yMkmjghBmgPDNJID3e/TBmQk+aZJH DMVLookE4kS0rLavTvX43BluZkewy8vZ0kUHgfDFa4XFSAefQ4RJ61IUglWYlDQ4hKb3MctmkHY3x KnHExMIQHX80PpkXNtGM0EY+1n3SUiw6Rixk0lTmNNhJBQVcidqyGait1iT4WkyppaE89s7Gx73EU 5GQEa2jWB47xAwDNm2ze6g5M51qPv4pdafC/GDbi9rYDi7K1P5dnkYGTG1mQdIpRKhguqAA0TYGcE tRzxnx4hr0MJkcrz/zoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qM0NS-005ZWT-0C; Wed, 19 Jul 2023 06:09:34 +0000 Received: from desiato.infradead.org ([90.155.92.199]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qM0NQ-005ZVY-1Y for linux-arm-kernel@bombadil.infradead.org; Wed, 19 Jul 2023 06:09:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Transfer-Encoding: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Sender:Reply-To:Content-ID:Content-Description; bh=NApimPvpzazjMfL8G0bWqooM0foPQehWU2JFkfvxDNQ=; b=rKYu3v9Rr43yjcVA54uN44QD6R nxIWn5Cfth2bJRpXjGnf3e2ptkBmNGj0l5YeAhpENRPp/KFbfwZaDiPNghSgj1LBAsnNPMcg5HCXe evF/lwbDLT02OYsm0UDR4MvwDbSYlSQJjwyP44FXJOOlbvNM3mIhjTMp9Uk7S5oi7jyqYf5uki3L/ QI4m4ZN3le6ggV15z0ZtTR9TUM0wQoMIOs/2BfwK4cs17j7a8rJRWMbIBgOOqjTDpHhYe4gGaCrF0 0755KeaopJRpTLujVuzdxA98WuUUF1QyV7DXxZ05n+4OuDg/9QvNkePbUdqmIDKPTSvKtZgBD1odR 2XauOLkQ==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qLYF7-009TXz-0P for linux-arm-kernel@lists.infradead.org; Tue, 18 Jul 2023 00:07:07 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 416EB612DD; Tue, 18 Jul 2023 00:06:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EF84C433C8; Tue, 18 Jul 2023 00:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689638759; bh=O1AOwiwnk2jKiIOkxuq35LH9ZV7RU8Jn2yPw3u9KeAA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=C0cRHSiTVHIahqkOmENgpM2tl52iM//gk8BL6oVTKxeLogO7w9/YYxwFrDCcnFEzp jI6j5uNrHJD35i9P/c2WLPblo/HCmWk/dfaZjTRliAY1WRwstREs2dcqf67EFJM/UL Xxc5jGx2eAaN2zFiMF9/EHX4bheXD9w1Ja6tku9adn/WtekQ5HQ2PDLBDdVaGMXf7f /ZThxB8tjnay9PyAtotyPet8ywfLnPrneOQbsraW9l+1KylLYaE4+YlSlVVFTqChWM 1QUSGEkfpaM/mant1j4bZFsgL6yOpRJ7ofTZ7Pvkco71SK/GhBuaogmW8kSUINIm0M uEhV1Q5qZWrbQ== Date: Tue, 18 Jul 2023 08:05:49 +0800 From: Shawn Guo To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Cc: linux-arm-kernel@lists.infradead.org, Sascha Hauer , Fabio Estevam , NXP Linux Team , Pengutronix Kernel Team Subject: Re: [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration Message-ID: <20230718000549.GN9559@dragon> References: <20230615094100.1009523-1-u.kleine-koenig@pengutronix.de> <20230717010652.GM9559@dragon> <20230717070350.zy466pzqcfqpexas@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230717070350.zy466pzqcfqpexas@pengutronix.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230718_010705_777125_81F2008E X-CRM114-Status: GOOD ( 19.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jul 17, 2023 at 09:03:50AM +0200, Uwe Kleine-K=F6nig wrote: > Hello Shawn, > = > On Mon, Jul 17, 2023 at 09:06:52AM +0800, Shawn Guo wrote: > > On Thu, Jun 15, 2023 at 11:41:00AM +0200, Uwe Kleine-K=F6nig wrote: > > > Instead of using 0x80000000 explicitly specify the reset defaults for > > > the pad settings. This way the pad configuration is explicit and so > > > isn't affected by changes that might have been done in the bootloader. > > > = > > > Signed-off-by: Uwe Kleine-K=F6nig > > > --- > > > arch/arm/boot/dts/imx25-karo-tx25.dts | 50 +++++++++++++------------= -- > > > 1 file changed, 25 insertions(+), 25 deletions(-) > > = > > It doesn't apply any more. Could you rebase and resend? > = > when using git am -3 to apply, it works fine for me on top of > next-20230717 and v6.5-rc2. Ah, I completely forgot about 3-way merge parameter :) Applied, thanks! Shawn _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel