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 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 2DB74ECAAA3 for ; Fri, 26 Aug 2022 09:49:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1EE0B84922; Fri, 26 Aug 2022 11:49:07 +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 6C497848F8; Fri, 26 Aug 2022 11:48:54 +0200 (CEST) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) (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 2A6AE848E8 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 0MIKxl-1oRF6U2mtD-004EDB; Fri, 26 Aug 2022 11:48:41 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Marcel Ziswiler , Fabio Estevam , Jagan Teki , Martyn Welch , "NXP i.MX U-Boot Team" , Parthiban Nallathambi , Stefano Babic Subject: [PATCH v1 03/16] imx6ul: synchronise device tree with linux Date: Fri, 26 Aug 2022 11:48:21 +0200 Message-Id: <20220826094834.693236-4-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:BqejKfwDfs8S0y/EVe6WaP+EB6Vcoa9PzEZNdCwuXsRPb5zFK81 B7dGmxAThFCt2gHdyC5ZRHCfVDPHiFW2hBYPDxfat4MlYPO6Sus7dUDG6T7vEWiwYpQsk03 ZHaJdwFB3/wc0RiGOuWLuqolisTwCwH8MyRlaUxhjN+9ZwkWYSwG528Wz9OnWpV3QVIzaAb m5tTIbgjzKPlMuIopMd1A== X-UI-Out-Filterresults: notjunk:1;V03:K0:idAWIk14cOw=:n2Z35wGbBTUxtRCtWMMA3l YTt0DuMmItI+AGmHaGjxzntaiERcSpYNYg4OiI94mphwm84rEh03EaQZtLWOqec4r1HX/MJts gZ+yDORAPDpxnXlE1oKDHHf8sniANNQGUMJRhiNmjkmesXOy6fcZ//1WDrbhItVOvPkdHRLgA PR5zFXcqfo6JpThOSiHYlAqainde6nrWQm2zchhBKpkt6uhnBhgp9XwzJBFBccejaiI656SGw +nJ1irUIZRl6PIyGH0cq4L7rysJTWNFZ0P7O4kxosekpKtaTTYXrp3R3xhfNcbzuiqYP3+Oov /tlDNme16NZosOXkpb+rNvXlhnZ03hZ1w5Rw/B3pT7ETIukh7nju+eUPw+0S98X/dy6UcAfKy d/mwnoIASn2BilGLeuV1bF/qw2BHTOa0mROVhFUu5DlHkPe7cFIuCSX3HKlw5IGvoJ60CHy+r HgtrVYU+xqVJJMH6/vRPYVvNpjekuLBJmg71gy5rcT/rp9POZOL0ISshqV58pIioG/SSZZwsx 2SXpb/zkUCEbY+jzopEaOqmCOA8uiFHGv4IIj1dWHzgP5G+MyJEcAMaoNrh5Qxttrl4j4xtHs YrhlvtlTA/R+EAeRCJ5ka4mAwBfsj42Xy2EYfBl7s7u7tFixAXiCDUI30N93kGekd1pmG1LXU SgapLyzBJbXe/eOqT2hyLh7Pl5UZ+hTDZvQwf3UUTYBuWOWZzyF2jvZEO0+F1GwEnSvVMTwIG 0Io1keFGKIJfGOB67lURLAV6Je2Ya1+EwO44RELUyey7pSS2SuN/foF0ueA= 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/imx6ul-14x14-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-phytec-segin.dtsi | 5 ---- arch/arm/dts/imx6ul.dtsi | 36 +++++++++++------------ 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi index 3bd6edb42e0..301838d2d04 100644 --- a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi @@ -8,7 +8,7 @@ display0 = &lcdif; }; -&{/soc} { +&soc { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/imx6ul-phytec-segin.dtsi b/arch/arm/dts/imx6ul-phytec-segin.dtsi index 0d4ba9494cf..38ea4dcfa22 100644 --- a/arch/arm/dts/imx6ul-phytec-segin.dtsi +++ b/arch/arm/dts/imx6ul-phytec-segin.dtsi @@ -83,11 +83,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_adc1>; vref-supply = <®_adc1_vref_3v3>; - /* - * driver can not separate a specific channel so we request 4 channels - * here - we need only the fourth channel - */ - num-channels = <4>; status = "disabled"; }; diff --git a/arch/arm/dts/imx6ul.dtsi b/arch/arm/dts/imx6ul.dtsi index afeec01f652..c95efd1d8c2 100644 --- a/arch/arm/dts/imx6ul.dtsi +++ b/arch/arm/dts/imx6ul.dtsi @@ -64,20 +64,18 @@ clock-frequency = <696000000>; clock-latency = <61036>; /* two CLK32 periods */ #cooling-cells = <2>; - operating-points = < + operating-points = /* kHz uV */ - 696000 1275000 - 528000 1175000 - 396000 1025000 - 198000 950000 - >; - fsl,soc-operating-points = < + <696000 1275000>, + <528000 1175000>, + <396000 1025000>, + <198000 950000>; + fsl,soc-operating-points = /* KHz uV */ - 696000 1275000 - 528000 1175000 - 396000 1175000 - 198000 1175000 - >; + <696000 1275000>, + <528000 1175000>, + <396000 1175000>, + <198000 1175000>; clocks = <&clks IMX6UL_CLK_ARM>, <&clks IMX6UL_CLK_PLL2_BUS>, <&clks IMX6UL_CLK_PLL2_PFD2>, @@ -139,7 +137,7 @@ interrupts = ; }; - soc { + soc: soc { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; @@ -149,6 +147,9 @@ ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x20000>; + ranges = <0 0x00900000 0x20000>; + #address-cells = <1>; + #size-cells = <1>; }; intc: interrupt-controller@a01000 { @@ -543,7 +544,7 @@ }; kpp: keypad@20b8000 { - compatible = "fsl,imx6ul-kpp", "fsl,imx6q-kpp", "fsl,imx21-kpp"; + compatible = "fsl,imx6ul-kpp", "fsl,imx21-kpp"; reg = <0x020b8000 0x4000>; interrupts = ; clocks = <&clks IMX6UL_CLK_KPP>; @@ -923,7 +924,6 @@ reg = <0x02198000 0x4000>; interrupts = ; clocks = <&clks IMX6UL_CLK_ADC1>; - num-channels = <2>; clock-names = "adc"; fsl,adck-max-frequency = <30000000>, <40000000>, <20000000>; @@ -998,7 +998,7 @@ }; csi: csi@21c4000 { - compatible = "fsl,imx6ul-csi", "fsl,imx7-csi"; + compatible = "fsl,imx6ul-csi"; reg = <0x021c4000 0x4000>; interrupts = ; clocks = <&clks IMX6UL_CLK_CSI>; @@ -1007,7 +1007,7 @@ }; lcdif: lcdif@21c8000 { - compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif"; + compatible = "fsl,imx6ul-lcdif", "fsl,imx6sx-lcdif"; reg = <0x021c8000 0x4000>; interrupts = ; clocks = <&clks IMX6UL_CLK_LCDIF_PIX>, @@ -1028,7 +1028,7 @@ qspi: spi@21e0000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx6ul-qspi", "fsl,imx6sx-qspi"; + compatible = "fsl,imx6ul-qspi"; reg = <0x021e0000 0x4000>, <0x60000000 0x10000000>; reg-names = "QuadSPI", "QuadSPI-memory"; interrupts = ; -- 2.35.1