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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33F66ECAAD2 for ; Fri, 26 Aug 2022 09:50:59 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A286C84951; Fri, 26 Aug 2022 11:49:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 1021184905; Fri, 26 Aug 2022 11:49:23 +0200 (CEST) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 12D3884919 for ; Fri, 26 Aug 2022 11:48:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marcel@ziswiler.com Received: from toolbox.int.toradex.com ([72.182.101.102]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lhxsi-1pEL7D1ivy-00nBQ4; Fri, 26 Aug 2022 11:48:49 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Marcel Ziswiler , Fabio Estevam , "NXP i.MX U-Boot Team" , Otavio Salvador , Stefano Babic Subject: [PATCH v1 14/16] imx23: synchronise device tree with linux Date: Fri, 26 Aug 2022 11:48:32 +0200 Message-Id: <20220826094834.693236-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220826094834.693236-1-marcel@ziswiler.com> References: <20220826094834.693236-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:csYzDbZykkUpt59L5diInehX3Vj8pV+SlHG9lyI5b+35i6nzj1t pHPqJkh0hkbAEPxhHeJc2bcim+yjz2vGqtLnTcpg9vs6Uxf14AG7jzFOgMKSUDIfIMbSbX7 ICrEETH9l0Td6m3CZookCzlJ97VUB9rP4p+n3xm88yW2hjo4nOY2p0PHoZcrrzegLoZzMxb ZBO/bxdlkOh5qrGWFV+Qw== X-UI-Out-Filterresults: notjunk:1;V03:K0:TdyxmoVtLhk=:L/pA8RPg/vxPAtP4uuHCWQ eqBKx8kmMIeTt+5Tp+rJY8wJj6Hqw8s17tnMVLmW6HoRe22jNJcFJEKlrkBxt0sRLJn09Zc8h gshbxig+6ULFF0mUV+WvLwxOv8VEhsQMIJR0Y2rwOZWDB5U99LKjae+NSVs1WiqqnJhyvTyS+ RtHnKrDn/XVjL3RoRQyMNB5HwjOkv85GE8tShVlZmvcUbjJSwv/DN4n3L+3RXI5/C8rQNZlow r8w62fQVEQgowMimhwR1Ut/vBj2yb4PaW9uLIEIptTsWA6ltgrKNHa3rULwlWsH3+gj81USFn Xd1RzR8c1TArq+ZRrpIUjZkBr36aL1p/1Y8OA1y8y6GRZ5jxImOd7013oQulWgQka4ETthm96 +pHCHCajQkIEnkC0KM4YbZhGuzKzqfGhNn1YZ/HClgo/ktcJhw6QA7MbIFUZ51vRY+KvTFPvY oMfpDVh2BS5K/MJB32jtJeE+830CqJsKetoeGJb9AqFwn91dlBQgso/9cYUpUu5CMH5UqpuTR v4DVukK1Hrg625KSTHmrZh7ClKpUtZJv+ODYHUHCqfTJXnJFopKOzGD0t2WND5a5OnUbwM7DA R4lisFlnLzyaIwUlHcogZ87jSAqbucb4JFRDlIE3CKgDFRdlDN3hNVlCUIwrAXf34GT1A81ED zi+TBHokzWoGfFf5+ITvXP51qmEY70DnjAgs1fc3nlH/9R16AtprYGQ1U9tyJQr03gKPjPsRi rcCind/rK2XkZH63gSvG2Qb0wvTDyNEKLfBr33usmAybsr3MEdLaEYbx/Ng= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Synchronise device tree with linux v6.0-rc1. Signed-off-by: Marcel Ziswiler --- arch/arm/dts/imx23-evk.dts | 1 - arch/arm/dts/imx23-pinfunc.h | 8 +------- arch/arm/dts/imx23-u-boot.dtsi | 7 +++---- arch/arm/dts/imx23.dtsi | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/arch/arm/dts/imx23-evk.dts b/arch/arm/dts/imx23-evk.dts index 8cbaf1c8117..3b609d987d8 100644 --- a/arch/arm/dts/imx23-evk.dts +++ b/arch/arm/dts/imx23-evk.dts @@ -79,7 +79,6 @@ MX23_PAD_LCD_RESET__GPIO_1_18 MX23_PAD_PWM3__GPIO_1_29 MX23_PAD_PWM4__GPIO_1_30 - MX23_PAD_SSP1_DETECT__SSP1_DETECT >; fsl,drive-strength = ; fsl,voltage = ; diff --git a/arch/arm/dts/imx23-pinfunc.h b/arch/arm/dts/imx23-pinfunc.h index 5c0f32ca3a9..468c079f3c2 100644 --- a/arch/arm/dts/imx23-pinfunc.h +++ b/arch/arm/dts/imx23-pinfunc.h @@ -1,14 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Header providing constants for i.MX23 pinctrl bindings. * * Copyright (C) 2013 Lothar Waßmann - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html */ #ifndef __DT_BINDINGS_MX23_PINCTRL_H__ diff --git a/arch/arm/dts/imx23-u-boot.dtsi b/arch/arm/dts/imx23-u-boot.dtsi index 5e87aca61b7..5de62bbb907 100644 --- a/arch/arm/dts/imx23-u-boot.dtsi +++ b/arch/arm/dts/imx23-u-boot.dtsi @@ -1,14 +1,13 @@ // SPDX-License-Identifier: GPL-2.0+ &gpio0 { - gpio-ranges = <&pinctrl 0 0 32>; + gpio-ranges = <&{/apb@80000000/apbh@80000000/pinctrl@80018000} 0 0 32>; }; &gpio1 { - gpio-ranges = <&pinctrl 0 32 31>; + gpio-ranges = <&{/apb@80000000/apbh@80000000/pinctrl@80018000} 0 32 31>; }; &gpio2 { - gpio-ranges = <&pinctrl 0 63 32>; + gpio-ranges = <&{/apb@80000000/apbh@80000000/pinctrl@80018000} 0 63 32>; }; - diff --git a/arch/arm/dts/imx23.dtsi b/arch/arm/dts/imx23.dtsi index 4cfec778492..7f4c602454a 100644 --- a/arch/arm/dts/imx23.dtsi +++ b/arch/arm/dts/imx23.dtsi @@ -105,7 +105,7 @@ status = "disabled"; }; - pinctrl: pinctrl@80018000 { + pinctrl@80018000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx23-pinctrl", "simple-bus"; -- 2.35.1