From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BC708F55 for ; Sun, 16 Jul 2023 20:39:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6C83C433C7; Sun, 16 Jul 2023 20:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689539953; bh=56f1In5tbzygGHl5qDvchEX5W2hG6dnIKV1N39LOWoI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QRtmE/kuxSrr0emrjpoap64jeUNEFDfKsOOzDwwLC4GUB92g/5hY98gOA0cPDWxPd gHEaCI75aO18pRQYak1uZicUyzI+/fBeY0zIKed3HlZCxasLyBrMH6CwsrJzCOBM51 fYSLbqui+M3j0dMqQWBIg29vyQcJ42swGC0KF3yU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andreas Kemnade , "H. Nikolaus Schaller" , Tony Lindgren , Sasha Levin Subject: [PATCH 6.1 190/591] ARM: dts: gta04: Move model property out of pinctrl node Date: Sun, 16 Jul 2023 21:45:29 +0200 Message-ID: <20230716194928.791988106@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230716194923.861634455@linuxfoundation.org> References: <20230716194923.861634455@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Tony Lindgren [ Upstream commit 4ffec92e70ac5097b9f67ec154065305b16a3b46 ] The model property should be at the top level, let's move it out of the pinctrl node. Fixes: d2eaf949d2c3 ("ARM: dts: omap3-gta04a5one: define GTA04A5 variant with OneNAND") Cc: Andreas Kemnade Cc: H. Nikolaus Schaller Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/omap3-gta04a5one.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/omap3-gta04a5one.dts b/arch/arm/boot/dts/omap3-gta04a5one.dts index 9db9fe67cd63b..95df45cc70c09 100644 --- a/arch/arm/boot/dts/omap3-gta04a5one.dts +++ b/arch/arm/boot/dts/omap3-gta04a5one.dts @@ -5,9 +5,11 @@ #include "omap3-gta04a5.dts" -&omap3_pmx_core { +/ { model = "Goldelico GTA04A5/Letux 2804 with OneNAND"; +}; +&omap3_pmx_core { gpmc_pins: pinmux_gpmc_pins { pinctrl-single,pins = < -- 2.39.2