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 9A2F3ECAAD2 for ; Fri, 26 Aug 2022 09:49:35 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BD09A84924; Fri, 26 Aug 2022 11:49:11 +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 0BFAE848F8; Fri, 26 Aug 2022 11:48:56 +0200 (CEST) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) (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 DE2AD848EC for ; Fri, 26 Aug 2022 11:48:49 +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 0Lan9S-1p7DU21DMe-00kPSo; Fri, 26 Aug 2022 11:48:42 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Marcel Ziswiler , Fabio Estevam , "NXP i.MX U-Boot Team" , Stefano Babic Subject: [PATCH v1 04/16] imx6ull: synchronise device tree with linux Date: Fri, 26 Aug 2022 11:48:22 +0200 Message-Id: <20220826094834.693236-5-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-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:CB5v460tEN8L2vc5cPDKUzQ6/6qy3RFwHjcyhqk2wmYnJDLqnb8 DBH2oL4pUFyzMXQtGNC36QAdHEdWdckPIIa7k0F1vAPmBIYxtLQOg/RIvt4Y4C5I59kmJv+ WbW5J+uS/qCYx1eP7z6zw+pmWsXTK3PgbwVmyanEaoYEtvgCySLoi5FdgpMqrAWna4Do+ai TdCkHfkLgKWRbpGa44YlQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:FNN2zMvkVoM=:AulM79cTijMBeQlv5MA5sA Mp/XRLkF5E57NRYCrP5YvzyZlwwzXkO/NL6XrsMkfXyRLgjIDz7913UeQyP2DwNutsnHwGP5s HixI3tV+/r3AVilVu42FUMHP3keFIOPjJE93d+SSstT9gaMohTvpd9ljaiNTezUxc7hf7iPLM kvRw4PeLnXo2Cmz6T6rQPq3s85zj1reaYu8HL1pFOsUwJgWJ3kQkD56FfJY1vNwbhrfuVBh1j mdlCnIB0I2jqFrWeNkzyGBHkU3AObojl2UxdvSE06xrQsrp4aFJppIMZk3GljBsZHq0qtZuU0 JUOfM1LEq/8b+157HAOapXn7NwgNJ5kHhozTkHtpsndZDeXicb94U4+CVQBSv5j7ATDxFPCTx wFWSHZZN1upOfcLrS7/oWEH2l1X9M0bZdzXsqaBrmK6waOcPJ0A3mGNqTqmDwB6tfm/OlJW0R T/erfBRxjZpnziQtROvsuWL5XxuXTDow3t7AVSEuZ/4ZwDhQ/V30jF/0f6Oi03OIIKXppEK6y i51Mvgp4omh75Z2WMkuSTcxxKqZ3SwE3zmnTNL0IyzpW4zaDtLdlTH423gYeQxYM7PAPmErvr Udv+cNHGKA7ZSRKcVDObF+NjFk8sL+DP1z5u19s8JQElovvTshQ6dbaQzptuSEFBINJ/ioT5N zvLr0tV3twSHCVtKtjLpbriuLioGU77WOxhQnD6v1w/Q/NekJr6IZxYONNwJwqMZafHgzUS3a y7GalrOWqbJZzeCRsqYa9uMD/Kdrh/t6SaVwv5/egqOEBekpCKnZhRCnyXE= 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/imx6ull-colibri.dtsi | 10 +++++++--- arch/arm/dts/imx6ull.dtsi | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi index 15621e03fa4..577a424b0e1 100644 --- a/arch/arm/dts/imx6ull-colibri.dtsi +++ b/arch/arm/dts/imx6ull-colibri.dtsi @@ -94,7 +94,6 @@ }; &adc1 { - num-channels = <10>; vref-supply = <®_module_3v3_avdd>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_adc1>; @@ -166,7 +165,7 @@ atmel_mxt_ts: touchscreen@4a { compatible = "atmel,maxtouch"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_atmel_conn>; + pinctrl-0 = <&pinctrl_atmel_conn &pinctrl_atmel_snvs_conn>; reg = <0x4a>; interrupt-parent = <&gpio5>; interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 / INT */ @@ -331,7 +330,6 @@ pinctrl_atmel_conn: atmelconngrp { fsl,pins = < MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */ - MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */ >; }; @@ -684,6 +682,12 @@ }; &iomuxc_snvs { + pinctrl_atmel_snvs_conn: atmelsnvsconngrp { + fsl,pins = < + MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */ + >; + }; + pinctrl_snvs_gpio1: snvsgpio1grp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */ diff --git a/arch/arm/dts/imx6ull.dtsi b/arch/arm/dts/imx6ull.dtsi index 9bf67490ac4..2bccd45e9fc 100644 --- a/arch/arm/dts/imx6ull.dtsi +++ b/arch/arm/dts/imx6ull.dtsi @@ -50,7 +50,7 @@ }; / { - soc { + soc: soc { aips3: bus@2200000 { compatible = "fsl,aips-bus", "simple-bus"; #address-cells = <1>; -- 2.35.1