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 75AFAECAAD2 for ; Fri, 26 Aug 2022 09:50:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3643F848FE; Fri, 26 Aug 2022 11:49:51 +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 AD1C2848F4; Fri, 26 Aug 2022 11:49:18 +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 0ABB984929 for ; Fri, 26 Aug 2022 11:48:52 +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 0MhjbJ-1ooO7i37UB-00Mt7t; Fri, 26 Aug 2022 11:48:45 +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 09/16] imx6qp: synchronise device tree with linux Date: Fri, 26 Aug 2022 11:48:27 +0200 Message-Id: <20220826094834.693236-10-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:dFQE+YKC+FFkm5Z5mLmYmBm3uucScTZwSyehjgARxck0Gv1tXSk kgerwM5W8afY6q3cXn/07LvbtHhpMGbnu8wgEE2LktuUbjfVjzRyuU9/emr+djFIi0kPgCk JJbbDFkApZC8+CF4gO2XEctYwLFZnk0FX2JGPr1pnHz4bZeL66PGKnitZy053yPbaCa5lFO 5CYraZvvWiRybtHyjeCHg== X-UI-Out-Filterresults: notjunk:1;V03:K0:AZZaGCIWgPM=:g/qV9LP17ZeCZfWroUrAuF ad+eNi9pIg0q6RX3zwb0thzMgPYvw59ilJe16f+Hr6AdqhIrFsSsG8QtmRppW85DgFqyNqWK4 64/XkvxWP6IHSgt3YGRYSkXwxHjHQ0PbuYmq9jgNW9Gmvmtf5/ZHZTYvHLuuk9XFvnPD9u/ut N9ZLex6pYguPrSCr0nXwotXNPo/vhqY8awA4TcCyCxD8rYEWb55kXo+sG6A3LM9lQO0QPLSw+ 9gPcc0abxBKQ3M+d5XMMRWMdLOZfkXzaw3fvzu7RIhedccO4/libP+CgDZxgiOKR+QzsJlrKY 7vAdo5M4URz+cHcZZnCH0chBb+wV/ohDdCxcY4RBQfTC3NKBUsuFO4wxbrWbGIW2LJvYe2JUH cMsrnuC0VRbLBRewCDY9JbQ6YYHzAq1+Vl2a1kqPONm++G9s4TSF2oDHtnlFNQs4Gx55ev7ZT NwvCZQ22TTEeMLOiMJii+jJn2qadwVRdR+cv7iobDfQ1B9VeM6tQGADvpj/9RBHQxeX8ngoyK sC4Apn74QiJUJaaVoSRUM2apgkLYdUjcbaKLSzgScHJ2cjhSUWZ0MTimoPxfCQvn/f7jkG87v 964HM4ug9hOlO81OlOhAFGarOJ+wbfSFH1WE/vGdhRwGrVxfWXernsnA0XiWSlYlG0KXHTBwl yS/knVm51wzhzmp0LcH7gaTQ/ptOiV3OYjhTYedGPAW5fq8pvnDF0zJvR+cqGPwoUDFYyRb7V AMo5GCqA5aeOH4KW/n7DRvm4fkXYVBcqQUWGyKv4EetcV+baiuAeWQs1Z2M= 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/imx6qp-sabreauto.dts | 7 ++++++- arch/arm/dts/imx6qp-sabresd.dts | 10 +++++++++- arch/arm/dts/imx6qp.dtsi | 3 +-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/imx6qp-sabreauto.dts b/arch/arm/dts/imx6qp-sabreauto.dts index d4caeeb0af7..2bb3bfb18ec 100644 --- a/arch/arm/dts/imx6qp-sabreauto.dts +++ b/arch/arm/dts/imx6qp-sabreauto.dts @@ -47,7 +47,12 @@ }; &pcie { - status = "disabled"; + reset-gpio = <&max7310_c 5 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&sata { + status = "okay"; }; &vgen3_reg { diff --git a/arch/arm/dts/imx6qp-sabresd.dts b/arch/arm/dts/imx6qp-sabresd.dts index f1b9cb104fd..f69eec18d86 100644 --- a/arch/arm/dts/imx6qp-sabresd.dts +++ b/arch/arm/dts/imx6qp-sabresd.dts @@ -50,6 +50,14 @@ }; }; +&vgen3_reg { + regulator-always-on; +}; + &pcie { - status = "disabled"; + status = "okay"; +}; + +&sata { + status = "okay"; }; diff --git a/arch/arm/dts/imx6qp.dtsi b/arch/arm/dts/imx6qp.dtsi index 93b89dc1f53..05036551383 100644 --- a/arch/arm/dts/imx6qp.dtsi +++ b/arch/arm/dts/imx6qp.dtsi @@ -77,7 +77,6 @@ }; &fec { - /delete-property/interrupts-extended; interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>, <0 119 IRQ_TYPE_LEVEL_HIGH>; }; @@ -111,5 +110,5 @@ }; &pcie { - compatible = "fsl,imx6qp-pcie", "snps,dw-pcie"; + compatible = "fsl,imx6qp-pcie"; }; -- 2.35.1