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 14C7CC433F5 for ; Wed, 12 Jan 2022 08:58:50 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52ECE8313B; Wed, 12 Jan 2022 09:58:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Di2dnRr2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E978983107; Wed, 12 Jan 2022 09:58:46 +0100 (CET) Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1053F8313E for ; Wed, 12 Jan 2022 09:58:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=heiko.thiery@gmail.com Received: by mail-ed1-x52c.google.com with SMTP id u21so7067668edd.5 for ; Wed, 12 Jan 2022 00:58:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F2ch9awf2UEhG9wktDaiMoXSFDzLlLNy7WzJXDNll9M=; b=Di2dnRr2HIBd2XZTeVxpg8LCGAqMWAHK5zv5VlNckPHUMVN+Tb5UWi3t6ONXmq1wDI 6c02aNvbXLpfLKi86Ovdzoo+o62ujGZJz4011m+SM+es+cUTOEGbXJFKVyAnBMW4tNvo 5cV9cwtrBGAMKaF5DPx1Osdfdvn/GlUVvqob0y51LSZwD5zilPsKXZVooBH4vXDRIqBL SuTpwsEagjfme689Uaw7ZUpXvumcRK4aCaaQaxISbJBYo4mupJ+MYg5OgH9VnpWBnKXX ua//+Z1K+/hhV/ndzu1nksen4VriTplremMvFRMvjD5vXmUV3u5LbimPGq8xlFfJ2301 yahw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F2ch9awf2UEhG9wktDaiMoXSFDzLlLNy7WzJXDNll9M=; b=A1cEJQe5vFtnZ9I/Gx3k0t2nvSw9kjVQel/DjCyAhaelLXwNZH1Wmbjm8suQJu24EE fAQDUEM2hV4QVaAY5NGvxEqi0KvxgIMc+XleS/HvbeGDkOfGPUQM6tl0onxXX/hMyc6O gFovDPTEasP+URD8NnEbTnIbcC9BEkoHPKyMZurNPVAO2TiWaUJWN7UDXpq0Aw6VcCUZ cL6L1uhc5E1fb058Cfvsr0oL1d/eZfMbJ084mdYu/BseVWpxzVHlsSisXS8CAxlsZ+Gp 31AnvtAwjwvySxQUizujUrTYq4DrNu/1LhuYEy1vSroHuKb/NYNz2TbSw/ikdfcPblu0 JAsw== X-Gm-Message-State: AOAM531YSSm4N6fvhYpeNvF6y4RZ2E/YmWqSroWKLq/yO2WlJV+zWH5y /CDpVG+f0r+HAjsUPGDEQJ6OjTTgPJBzTA== X-Google-Smtp-Source: ABdhPJw/5YMJ2Foavqf5+Skn3GoYn5X5tUrQKTBT+iMWWlXcfQIKLsvFGlKBQS2VV/4OkVXQsdyQSA== X-Received: by 2002:a17:906:713:: with SMTP id y19mr7242173ejb.723.1641977923510; Wed, 12 Jan 2022 00:58:43 -0800 (PST) Received: from hthiery.fritz.box ([2a02:810b:5a40:2a43:e54:15ff:fe38:2651]) by smtp.gmail.com with ESMTPSA id p7sm5867822edu.84.2022.01.12.00.58.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 00:58:43 -0800 (PST) From: Heiko Thiery To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Adam Ford , Frieder Schrempf , Heiko Thiery Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board u-boot.dtsi Date: Wed, 12 Jan 2022 09:57:57 +0100 Message-Id: <20220112085755.7396-2-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220112085755.7396-1-heiko.thiery@gmail.com> References: <20220112085755.7396-1-heiko.thiery@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.2 at phobos.denx.de X-Virus-Status: Clean When using a board variant that selects the lvds specific dtb the *.u-boot.dtsi file will not be included. To have a lvds dtb specific u-boot.dtsi file move this part to a common board u-boot.dtsi file and include this in the board base u-boot.dtsi and create an additional one for the lvds variant. Signed-off-by: Heiko Thiery --- .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ 3 files changed, 135 insertions(+), 123 deletions(-) create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi new file mode 100644 index 0000000000..4bf75722bf --- /dev/null +++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +#include "imx8mm-kontron-n801x-u-boot.dtsi" diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi index 22d18e6f1c..4bf75722bf 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi @@ -3,126 +3,4 @@ * Copyright (C) 2019 Kontron Electronics GmbH */ -#include "imx8mm-u-boot.dtsi" - -/ { - aliases { - usb0 = &usbotg1; - usb1 = &usbotg2; - }; - - wdt-reboot { - compatible = "wdt-reboot"; - wdt = <&wdog1>; - u-boot,dm-spl; - }; - - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; -}; - -&fec1 { - phy-mode = "rgmii-rxid"; -}; - -&i2c1 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&i2c2 { - status = "okay"; - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&pinctrl_ecspi1 { - u-boot,dm-spl; -}; - -&pinctrl_i2c1 { - u-boot,dm-spl; -}; - -&pinctrl_pmic { - u-boot,dm-spl; - fsl,pins = < - MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 - /* Disable Pullup for SD_VSEL */ - MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 - >; -}; - -&pinctrl_uart3 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&pinctrl_usdhc1 { - u-boot,dm-spl; -}; - -&pinctrl_usdhc1_100mhz { - u-boot,dm-spl; -}; - -&pinctrl_usdhc1_200mhz { - u-boot,dm-spl; -}; - -&pinctrl_usdhc2 { - u-boot,dm-spl; -}; - -&pca9450 { - u-boot,dm-spl; -}; - -&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { - u-boot,dm-spl; -}; - -&ecspi1 { - u-boot,dm-spl; -}; - -&gpio1 { - u-boot,dm-spl; -}; - -&gpio2 { - u-boot,dm-spl; -}; - -&gpio3 { - u-boot,dm-spl; -}; - -&gpio4 { - u-boot,dm-spl; -}; - -&gpio5 { - u-boot,dm-spl; -}; - -&uart3 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&usdhc1 { - u-boot,dm-spl; -}; - -&usdhc2 { - u-boot,dm-spl; -}; - -&wdog1 { - u-boot,dm-spl; -}; +#include "imx8mm-kontron-n801x-u-boot.dtsi" diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi new file mode 100644 index 0000000000..22d18e6f1c --- /dev/null +++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi @@ -0,0 +1,128 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +#include "imx8mm-u-boot.dtsi" + +/ { + aliases { + usb0 = &usbotg1; + usb1 = &usbotg2; + }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + u-boot,dm-spl; + }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; +}; + +&fec1 { + phy-mode = "rgmii-rxid"; +}; + +&i2c1 { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&i2c2 { + status = "okay"; + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&pinctrl_ecspi1 { + u-boot,dm-spl; +}; + +&pinctrl_i2c1 { + u-boot,dm-spl; +}; + +&pinctrl_pmic { + u-boot,dm-spl; + fsl,pins = < + MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 + /* Disable Pullup for SD_VSEL */ + MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 + >; +}; + +&pinctrl_uart3 { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&pinctrl_usdhc1 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc1_100mhz { + u-boot,dm-spl; +}; + +&pinctrl_usdhc1_200mhz { + u-boot,dm-spl; +}; + +&pinctrl_usdhc2 { + u-boot,dm-spl; +}; + +&pca9450 { + u-boot,dm-spl; +}; + +&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { + u-boot,dm-spl; +}; + +&ecspi1 { + u-boot,dm-spl; +}; + +&gpio1 { + u-boot,dm-spl; +}; + +&gpio2 { + u-boot,dm-spl; +}; + +&gpio3 { + u-boot,dm-spl; +}; + +&gpio4 { + u-boot,dm-spl; +}; + +&gpio5 { + u-boot,dm-spl; +}; + +&uart3 { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&usdhc1 { + u-boot,dm-spl; +}; + +&usdhc2 { + u-boot,dm-spl; +}; + +&wdog1 { + u-boot,dm-spl; +}; -- 2.30.2