From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jlqZm-0001xD-Um for barebox@lists.infradead.org; Thu, 18 Jun 2020 09:11:18 +0000 From: Ahmad Fatoum Date: Thu, 18 Jun 2020 11:10:52 +0200 Message-Id: <20200618091102.30150-6-a.fatoum@pengutronix.de> In-Reply-To: <20200618091102.30150-1-a.fatoum@pengutronix.de> References: <20200618091102.30150-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 05/15] ARM: at91: dts: extend, don't create anew, pinctrl node To: barebox@lists.infradead.org Cc: Ahmad Fatoum The pinctrl device is also on the APB in the base device tree. The barebox device tree wrongly creates a new one top-level under /. Move it to the correct location, so the upstream node is extended. Signed-off-by: Ahmad Fatoum --- arch/arm/dts/at91sam9263ek.dts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/at91sam9263ek.dts b/arch/arm/dts/at91sam9263ek.dts index 7fe283ced768..37f895d6ca73 100644 --- a/arch/arm/dts/at91sam9263ek.dts +++ b/arch/arm/dts/at91sam9263ek.dts @@ -24,15 +24,14 @@ wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>; }; }; - }; - }; - - pinctrl@fffff200 { - pinctrl_board_mmc1: mmc1-board { - atmel,pins = - ; /* PE19 gpio WP pin pull up */ + pinctrl@fffff200 { + pinctrl_board_mmc1: mmc1-board { + atmel,pins = + ; /* PE19 gpio WP pin pull up */ + }; + }; }; }; }; -- 2.27.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox