From patchwork Fri Jul 19 20:33:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1962618 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=cFNu8wy1; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WQhG06HBjz1xrQ for ; Sat, 20 Jul 2024 06:33:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D72A388BC7; Fri, 19 Jul 2024 22:33:22 +0200 (CEST) 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="cFNu8wy1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9706E882FA; Fri, 19 Jul 2024 22:33:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) (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 51D8388BC4 for ; Fri, 19 Jul 2024 22:33:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2c968fa1d4fso272757a91.3 for ; Fri, 19 Jul 2024 13:33:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721421198; x=1722025998; darn=lists.denx.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6pfGgNFidDRmgjDdlA0Iv1gQZJ34ZY5c+xYMxSgOPuY=; b=cFNu8wy1fmdF9hzJIbkZ6poswYlTltWJNVDMyUhkQzSd3uNO9+kKlK2qmVHYeLt/m5 OlH1B3kupIGx4SqFGC3zmVytv16Ik4BrDYYVcO0xAix4vYmBRaGNBVv48vq0sjga2dGo Yw6gHdcOc52+urEDaOXIw1HUEtjBQ3+3q/6tePauQuWkujgTycE37ud0eauYFBSEQagP +0vb3ihIGW3nsNCcuRrzKRWPoFIskchquOWUBfGc2J+lgcBsB/71pvPoag9HGHQYA4jq 3sOFa8WpZVUGD5Wh8qOUht0Q2iq+fB8Nuu8Lx6bESfRyEaahupgiuc1Hz8UDll0F0Zz2 xTXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721421198; x=1722025998; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6pfGgNFidDRmgjDdlA0Iv1gQZJ34ZY5c+xYMxSgOPuY=; b=bWxF1AOV/xlz+opWA4A0lrJnayWRZRQTN2yeKZxy1K3ILrsbCmv/1EA1izBjM842qy WKwwRUSDGL9auycWtEMct7QY+Qij0BTghESQKNRe4vc6YBe7EmcIcEZIo5RJ0l3d5gLg oqje+PTzyCSBTtrCPKf0sKDj6T8GQn+FSr+YouG3upYW7UjhA5Iylb+Fj3nxWyOtXj/f jZNDrYzamPse+u3Z0Z9UUgyplq0T6P4VhvdXfCmVplvIkybm8Xeh2mO868rp0oFuYFbO SYUAgWO6Za5SUpklk9RSJKYvrdux8EXSLYA4utX5CetJPy0kLz7NYEMyqULQynFsMGBZ Nufg== X-Forwarded-Encrypted: i=1; AJvYcCXVABhcOEoE3XRo/1xB0t2MEWLFCBMmNg0uuyETflHUa5BIcbUxddevD7AKIyXqsrxjmiBdYesHGHwGvUMaUIcqjB7NAw== X-Gm-Message-State: AOJu0YzLa+a5yE0SK8g/Uv1kAl66XjHGGe+BY94JPWkxRTM4jPObrSBh Tz19qN10eB4mKcrSz9iI8eCwJu15vCIypQmvk5GOIizKBSNX5CNQ X-Google-Smtp-Source: AGHT+IG1pwNMeho5LKBd6MGLW+usG+rJbjWm1cEelGTcvSLSil/2BQq2wqbByHU66m+DSI/oEP5qnw== X-Received: by 2002:a17:90a:d806:b0:2c9:7a37:62ab with SMTP id 98e67ed59e1d1-2cd16058647mr762839a91.4.1721421197746; Fri, 19 Jul 2024 13:33:17 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:27e4:cf37:80d4:17f5]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ccf8092da9sm2138230a91.37.2024.07.19.13.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jul 2024 13:33:17 -0700 (PDT) From: Fabio Estevam To: breno.lima@nxp.com Cc: francesco.montefoschi@udoo.org, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v2 1/4] udoo_neo: Convert to watchdog driver model Date: Fri, 19 Jul 2024 17:33:08 -0300 Message-Id: <20240719203311.1695523-1-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean Commit 68dcbdd594d4 ("ARM: imx: Add weak default reset_cpu()") caused the 'reset' command in U-Boot to not cause a board reset. Fix it by switching to the watchdog driver model via sysreset, which is the preferred method for implementing the watchdog reset. With the watchdog driver model in place, it is no longer needed to have board code to initialize the watchdog, so remove its related board code. Signed-off-by: Fabio Estevam --- Changes since v1: - Remove board wdog board code. arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi | 12 ++++++++++++ board/udoo/neo/neo.c | 16 ---------------- configs/udoo_neo_defconfig | 3 +++ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi b/arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi index b5e1f2b9a16f..7f5a6424bac8 100644 --- a/arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi +++ b/arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi @@ -1,5 +1,13 @@ // SPDX-License-Identifier: GPL-2.0+ +/ { + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + bootph-pre-ram; + }; +}; + &soc { bootph-all; }; @@ -15,3 +23,7 @@ &uart1 { bootph-all; }; + +&wdog1 { + bootph-pre-ram; +}; diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index b435b721e53c..1a0aaecc3328 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -57,9 +57,6 @@ enum { #define ENET_RX_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_SPEED_MED | PAD_CTL_SRE_FAST) -#define WDOG_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm) - #define BOARD_DETECT_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_34ohm | PAD_CTL_HYS | PAD_CTL_SRE_FAST) @@ -113,10 +110,6 @@ static iomux_v3_cfg_t const phy_control_pads[] = { MUX_PAD_CTRL(ENET_CLK_PAD_CTRL), }; -static iomux_v3_cfg_t const wdog_b_pad = { - MX6_PAD_GPIO1_IO13__GPIO1_IO_13 | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - static iomux_v3_cfg_t const peri_3v3_pads[] = { MX6_PAD_QSPI1A_DATA0__GPIO4_IO_16 | MUX_PAD_CTRL(NO_PAD_CTRL), }; @@ -148,15 +141,6 @@ int board_init(void) /* Address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - /* - * Because kernel set WDOG_B mux before pad with the commone pinctrl - * framwork now and wdog reset will be triggered once set WDOG_B mux - * with default pad setting, we set pad setting here to workaround this. - * Since imx_iomux_v3_setup_pad also set mux before pad setting, we set - * as GPIO mux firstly here to workaround it. - */ - imx_iomux_v3_setup_pad(wdog_b_pad); - /* Enable PERI_3V3, which is used by SD2, ENET, LVDS, BT */ imx_iomux_v3_setup_multiple_pads(peri_3v3_pads, ARRAY_SIZE(peri_3v3_pads)); diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 4986b4c26260..9f9ad0ad5ec7 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -61,5 +61,8 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_ANATOP=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_IMX_WATCHDOG=y From patchwork Fri Jul 19 20:33:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1962619 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=YBKQwuXO; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WQhG83JZqz1xrQ for ; Sat, 20 Jul 2024 06:33:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 40A9788C12; Fri, 19 Jul 2024 22:33:25 +0200 (CEST) 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="YBKQwuXO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8E25788C0E; Fri, 19 Jul 2024 22:33:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) (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 65AF388204 for ; Fri, 19 Jul 2024 22:33:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-75b77be7611so268376a12.3 for ; Fri, 19 Jul 2024 13:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721421200; x=1722026000; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WPowDHH6iw1UznnucGaJReYJWKexVi8IuAP6OsuDOiM=; b=YBKQwuXO4H96IF9AUBrjSlaHS36gQ2K08eYn7kXY0vnlOxFEOY4AAqi7vomjOrVVf4 77xBZXvaI6BXsxQWwHe+VgmK9Csed1wNUCCixTxJ9A66M8HigAuZOlWu4Qfw2R0nri+O tv/UjmT1YLngBPg+MD9n2Krs9iYO3yD1kYQefmGqPfiP91L03+F6xgoPAKkG05eC4Q9s szFZLqxlyXFZHThDpY29Csxs4ddiyMPKFuavBnmc3+xJ8PU6yPGIee7cSirndN5pSSf6 es4mRkCjPAnBeidB2/G5+UZFYCx9sW5UIQ2emqMfFrKrAJybOUAhW3Zg6wXwgaP2nrt/ tdiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721421200; x=1722026000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WPowDHH6iw1UznnucGaJReYJWKexVi8IuAP6OsuDOiM=; b=hI6N0jYH3s9T0d8rz/9o4+TnsCGsaDoQ09wN0+de2ymVhBZMy9Z/IeJpUQvOd8tenj NT80jBeKOZ7j1eEYkjTr9QI+/I9p5gFNhRZ4xmYDfezXS45T5Wjjvzfio7jjtfibzudb ajNcF7oPRbcyRORoi0KPTkH4i61Ifw8h2RMxRSV8ad7fNSQkqBFszRBYbMQq7JEIV8/N thOTyvF/LyTkNtEIegr6dsE2NvUfDstMKlEHMm+Rs8Daqh5Zy5jEhvUDlZxe8acfS+RS rjyhBoilbL1BiaCZzlnaMQ7NiBWs++0VF6/q7dbsxQsElWAHcrcdZHmHzqMN2lVn5uk3 DncQ== X-Forwarded-Encrypted: i=1; AJvYcCWvS/THL9wMNIA0JlIXDLw7yOXgK2vxGOy3anYnLkypucKG5jejQsAqAdFMFy2TYVdHT6K1YDmYUAtF7GsSvcYRYy9EjA== X-Gm-Message-State: AOJu0YyI8JdWU7U3z4Q/VF+WrjVFuF5zZXcIseZcAStR68b0WGj3QGdT EP3EyvlpD6a4CD4vQR6UjrFcok1JdnLjbNCUI9bK+ppm61HcAYKK X-Google-Smtp-Source: AGHT+IEetMtQEDK4UUl5EPVxxCYe9EElNHg194Q4xVCRx7f9fJTOEWuPRGa0M/INlnHAGPzae+tnqQ== X-Received: by 2002:a17:90b:20b:b0:2cb:4382:99f1 with SMTP id 98e67ed59e1d1-2cd16191fcdmr739281a91.6.1721421199933; Fri, 19 Jul 2024 13:33:19 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:27e4:cf37:80d4:17f5]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ccf8092da9sm2138230a91.37.2024.07.19.13.33.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jul 2024 13:33:19 -0700 (PDT) From: Fabio Estevam To: breno.lima@nxp.com Cc: francesco.montefoschi@udoo.org, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v2 2/4] udoo_neo: Select LTO Date: Fri, 19 Jul 2024 17:33:09 -0300 Message-Id: <20240719203311.1695523-2-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240719203311.1695523-1-festevam@gmail.com> References: <20240719203311.1695523-1-festevam@gmail.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean u-boot.img has grown in such a way that it overwrites the environment region. Select CONFIG_LTO to help reducing the U-Boot binary size and add a build-time size check to avoid U-Boot to overlap the environment region. Signed-off-by: Fabio Estevam --- Changes since v1: - Newly introduced. configs/udoo_neo_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 9f9ad0ad5ec7..97e3b379835f 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -19,6 +19,9 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y # CONFIG_CMD_BMODE is not set +CONFIG_LTO=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=523264 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" CONFIG_SYS_PBSIZE=532 From patchwork Fri Jul 19 20:33:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1962620 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=YFkfOHkZ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WQhGN3Mshz1xrQ for ; Sat, 20 Jul 2024 06:33:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9B6E588C20; Fri, 19 Jul 2024 22:33:26 +0200 (CEST) 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="YFkfOHkZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D4AF788C1F; Fri, 19 Jul 2024 22:33:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (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 9A7B388204 for ; Fri, 19 Jul 2024 22:33:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2cb71213df9so252514a91.1 for ; Fri, 19 Jul 2024 13:33:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721421202; x=1722026002; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZmKV42ksGlLx77lO05gLq0meRRtD8AwNQ9JoVJxNgEg=; b=YFkfOHkZWQEznte3QN4DohtG7BO6ISdR6kiMGqCoNArkWGjzk6vqk+iayn0yM5fx9E sPqPvljIKXmFBhzxhgievsuGYf6ph7OdT3dRcdATrcaPX6uWegqkHO3JV299OKqZ4Lg8 ujnBI3937613h0qg7VsMgmo0amRl+ZyMGKvpkTFf9cb2rNcSDNwbaH/UySYVi6YdXmv/ x18++SsgdGM3gMyuZBDcNVnQRWjcYXBS+BnpAQdMfbT88Vvc5ky7fIEV5GzbCjFqB0yz ZnwrExvQCt2YE8nzkRpO6Md5WHYrMWC8JIO8/xteAbsqp+TEos6TM+A6Fwv9/C/b1IGV GDrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721421202; x=1722026002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZmKV42ksGlLx77lO05gLq0meRRtD8AwNQ9JoVJxNgEg=; b=FwoqDxBo6s8B3oraviFEBGRynG3wQ71uk0/djKmo89Xnu78XeB1U6Q9EzlrcmkrcOs 3WTRfLnW1IKp2nK1OwLAsPbnZFjmf8nAjvwmoF5Jmv9Zjs7GbvXh7obcEYVKZrwv7VU7 UcwLN5m5dIrJoCXX+hzd7mVpWGaNOaknriKQ5bWqgKl9SAqgKMT0CpjXcL2YfOz+MLdc 84pUzYIlyTvSEPBf8+lsgRUqhk0veNip6SJRjpvJcBtElwjdQypV5lXE2G5yBt+7qc3W RDTNyc/AUW61VqZdy276Mth310I1K/kCCnelQQn8g1iY8M3kSkmo0pdDbzsjvKxHWGvG LOkw== X-Forwarded-Encrypted: i=1; AJvYcCXn6GsuM07aUug3nKpWiZEjHy/RQNG2G2GIBdLevVC0/beeZkSbYqHu2ZnvCx/cmMu+BcFNN/Vcucbs15K0iu+jmV3sDA== X-Gm-Message-State: AOJu0Yy8PyXG0xEyZUcwHrCvyWSyrP86U5SRMFEsnydBgPP0/xTpq2oX WxcLu+fCN0cHYQAwvl8cYiLthAWHup3gI+kHBEuCwwLhT8u9/XSR X-Google-Smtp-Source: AGHT+IGnYXYKnL7AtG68rpJiPYRu29NrYB9fMypA8P69Ox9TiM8wR/Eek5NDwzuD0C+xOa+1yv4ZVg== X-Received: by 2002:a17:90a:ac06:b0:2cb:4382:9efe with SMTP id 98e67ed59e1d1-2cd1607bfe0mr735540a91.5.1721421202089; Fri, 19 Jul 2024 13:33:22 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:27e4:cf37:80d4:17f5]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ccf8092da9sm2138230a91.37.2024.07.19.13.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jul 2024 13:33:21 -0700 (PDT) From: Fabio Estevam To: breno.lima@nxp.com Cc: francesco.montefoschi@udoo.org, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v2 3/4] udoo-neo: Do not print devicetree model Date: Fri, 19 Jul 2024 17:33:10 -0300 Message-Id: <20240719203311.1695523-3-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240719203311.1695523-1-festevam@gmail.com> References: <20240719203311.1695523-1-festevam@gmail.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean The udoo_neo_defconfig target supports several board variants. All of these variants use the imx6sx-udoo-neo-basic devicetree in U-Boot. Currently, the devicetree model as well as the board variant name are shown: ... Model: UDOO Neo Basic Board: UDOO Neo FULL ... Printing the devicetree model that is used internally by U-Boot may confuse users. Unselect the CONFIG_DISPLAY_BOARDINFO option and move the board printing inside board_init() so that only the real board name that is detected in run-time is printed. Signed-off-by: Fabio Estevam --- Changes since v1: - Newly introduced. board/udoo/neo/neo.c | 43 +++++++++++++++++--------------------- configs/udoo_neo_defconfig | 1 + 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index 1a0aaecc3328..4cf214bf17c6 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -136,8 +136,25 @@ static int setup_fec(void) return enable_fec_anatop_clock(0, ENET_25MHZ); } +static char *board_string(int type) +{ + switch (type) { + case UDOO_NEO_TYPE_BASIC: + return "BASIC"; + case UDOO_NEO_TYPE_BASIC_KS: + return "BASICKS"; + case UDOO_NEO_TYPE_FULL: + return "FULL"; + case UDOO_NEO_TYPE_EXTENDED: + return "EXTENDED"; + } + return "UNDEFINED"; +} + int board_init(void) { + int *board_type = (int *)OCRAM_START; + /* Address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; @@ -149,6 +166,8 @@ int board_init(void) gpio_request(IMX_GPIO_NR(4, 16), "ncp692"); gpio_direction_output(IMX_GPIO_NR(4, 16) , 1); + printf("Board: UDOO Neo %s\n", board_string(*board_type)); + setup_fec(); return 0; @@ -179,30 +198,6 @@ int board_mmc_init(struct bd_info *bis) return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); } -static char *board_string(int type) -{ - switch (type) { - case UDOO_NEO_TYPE_BASIC: - return "BASIC"; - case UDOO_NEO_TYPE_BASIC_KS: - return "BASICKS"; - case UDOO_NEO_TYPE_FULL: - return "FULL"; - case UDOO_NEO_TYPE_EXTENDED: - return "EXTENDED"; - } - return "UNDEFINED"; -} - -/* Override the default implementation, DT model is not accurate */ -int checkboard(void) -{ - int *board_type = (int *)OCRAM_START; - - printf("Board: UDOO Neo %s\n", board_string(*board_type)); - return 0; -} - int board_late_init(void) { int *board_type = (int *)OCRAM_START; diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 97e3b379835f..826d5a115043 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -25,6 +25,7 @@ CONFIG_BOARD_SIZE_LIMIT=523264 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" CONFIG_SYS_PBSIZE=532 +# CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL_SYS_MALLOC=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_FS_EXT4=y From patchwork Fri Jul 19 20:33:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1962621 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=OmVN07UX; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WQhGX4Dp3z1xrQ for ; Sat, 20 Jul 2024 06:33:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EEA9B88BC4; Fri, 19 Jul 2024 22:33:29 +0200 (CEST) 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="OmVN07UX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AA77E88C30; Fri, 19 Jul 2024 22:33:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (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 F40E688204 for ; Fri, 19 Jul 2024 22:33:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2cb5a947b7dso251605a91.3 for ; Fri, 19 Jul 2024 13:33:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721421204; x=1722026004; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VWof1NJQXwyvCM04Kf+0i82roYq6GM2nIPoRIIecd7U=; b=OmVN07UXqUopS0eM4XWs3WdHMkXwLo7t0ABzNwpVhha95VpBmoanYEiQXlmIyFTvvc DZBNfuGeFwugrUluMgj8OYuf/Cry2V0iMwQK84FcR2uFgXUYlVIJA16tf/q9MeZBGu0q 7GGMrlfUAJSGYA4iVSRT77kxbcdJM3KXCmjVCyoDsue/DkCHCqybOfbUV2KQD3XNshQN bZcOZTE4lCi8324GYlDVSw5gIjB77sqwF3H5kg2vZNoPOfjDQH5AoLS3ybpbixSLYDdx edZ/YSz//Ycng32WNinqqc02D9B4FgU0yFe2dHkUmilqOs3hxL7B7DwZQAS2slsYTjdU i7Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721421204; x=1722026004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VWof1NJQXwyvCM04Kf+0i82roYq6GM2nIPoRIIecd7U=; b=QCoX0Vrm9qkZeixBUR9cDCoUvDltVL3LUkxaYdT0YwVMQBmu2PJMj7Ky1JoZYuOdlb E54Kp4AGA0nmUgHmOm/DHXLqL1TWaUNOxIURjFYKTLUltWO+U5cEToOeTzJQwx4sKH42 hUiRcfb3ZxFfAlsXJ/g75QaNnt+FO1c+tWy9NruOckvTmSaQtl4Lpp0HyWzKC7sUiju7 zmNpaRrXjmhuLkGMI7GsJAMAZjC3NGU8FZPFVC3ZxchIZ7eGiWLBYxN6ugEPPHhWmuv2 39bdDc8EU0m+yLsr6NaUFj00XaKvIM2Cm+BfoQKVNYFfPzIIsV7pgOEnD6z+j8hzh3aS vmHg== X-Forwarded-Encrypted: i=1; AJvYcCXAnI9k31JOI6ABjn0ANmeruZmWaxEjXaxE766UHXPyx2eGwG0cMFGDVWmjQ6MIQbGlu/Pt/bo9J7LeqZhtw4WITn4VGA== X-Gm-Message-State: AOJu0YzWtrBwpzdsjdvu8ulPPRPv6Yl5irrSJfMIR/uyTLXXUPL+lcqt 7ToC655z8wSaJ4ZFe4fq0mGAzwO1qBKKW0IwSCil5+EcaUOun8x1 X-Google-Smtp-Source: AGHT+IEGo3pmA/Da3EoUiQ0lqxRUuXp+K+x4KibE54zFUrhrv7+9MbHfK1M9LbMLaTPvwky9sekT4w== X-Received: by 2002:a17:90b:4b0e:b0:2cb:4382:9eff with SMTP id 98e67ed59e1d1-2cd1608dc4bmr732531a91.6.1721421204319; Fri, 19 Jul 2024 13:33:24 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:27e4:cf37:80d4:17f5]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ccf8092da9sm2138230a91.37.2024.07.19.13.33.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jul 2024 13:33:23 -0700 (PDT) From: Fabio Estevam To: breno.lima@nxp.com Cc: francesco.montefoschi@udoo.org, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v2 4/4] udoo-neo: Convert to OF_UPSTREAM Date: Fri, 19 Jul 2024 17:33:11 -0300 Message-Id: <20240719203311.1695523-4-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240719203311.1695523-1-festevam@gmail.com> References: <20240719203311.1695523-1-festevam@gmail.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean Instead of using the local imx6sx-udoo-neo devicetree copies from U-Boot, convert the imx6sx-udoo-neo boards to OF_UPSTREAM so that the upstream kernel devicetrees can be used instead. Tested on a imx6sx-udoo-neo-full board. Signed-off-by: Fabio Estevam --- Changes since v1: - Newly introduced. arch/arm/dts/Makefile | 5 +- arch/arm/dts/imx6sx-udoo-neo-basic.dts | 33 -- arch/arm/dts/imx6sx-udoo-neo-extended.dts | 26 -- arch/arm/dts/imx6sx-udoo-neo-full.dts | 41 -- arch/arm/dts/imx6sx-udoo-neo.dtsi | 482 ---------------------- arch/arm/mach-imx/mx6/Kconfig | 1 + configs/udoo_neo_defconfig | 2 +- 7 files changed, 3 insertions(+), 587 deletions(-) delete mode 100644 arch/arm/dts/imx6sx-udoo-neo-basic.dts delete mode 100644 arch/arm/dts/imx6sx-udoo-neo-extended.dts delete mode 100644 arch/arm/dts/imx6sx-udoo-neo-full.dts delete mode 100644 arch/arm/dts/imx6sx-udoo-neo.dtsi diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7265e5542574..a4d95c8306bb 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -840,10 +840,7 @@ dtb-$(CONFIG_MX6SLL) += imx6sll-evk.dtb dtb-$(CONFIG_MX6SX) += \ imx6sx-sabreauto.dtb \ imx6sx-sdb.dtb \ - imx6sx-softing-vining-2000.dtb \ - imx6sx-udoo-neo-basic.dtb \ - imx6sx-udoo-neo-extended.dtb \ - imx6sx-udoo-neo-full.dtb + imx6sx-softing-vining-2000.dtb dtb-$(CONFIG_MX6UL) += \ imx6ul-geam.dtb \ diff --git a/arch/arm/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/dts/imx6sx-udoo-neo-basic.dts deleted file mode 100644 index 205ea26484e3..000000000000 --- a/arch/arm/dts/imx6sx-udoo-neo-basic.dts +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - */ - -/dts-v1/; - -#include "imx6sx-udoo-neo.dtsi" - -/ { - model = "UDOO Neo Basic"; - compatible = "udoo,neobasic", "fsl,imx6sx"; - - memory@80000000 { - device_type = "memory"; - reg = <0x80000000 0x20000000>; - }; -}; - -&fec1 { - phy-handle = <ðphy1>; - status = "okay"; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - - ethphy1: ethernet-phy@0 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0>; - }; - }; -}; diff --git a/arch/arm/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/dts/imx6sx-udoo-neo-extended.dts deleted file mode 100644 index 5817b4985391..000000000000 --- a/arch/arm/dts/imx6sx-udoo-neo-extended.dts +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - */ - -/dts-v1/; - -#include "imx6sx-udoo-neo.dtsi" - -/ { - model = "UDOO Neo Extended"; - compatible = "udoo,neoextended", "fsl,imx6sx"; - - memory@80000000 { - device_type = "memory"; - reg = <0x80000000 0x40000000>; - }; -}; - -&i2c4 { /* Onboard Motion sensors */ - status = "okay"; -}; - -&uart3 { /* Bluetooth */ - status = "okay"; -}; diff --git a/arch/arm/dts/imx6sx-udoo-neo-full.dts b/arch/arm/dts/imx6sx-udoo-neo-full.dts deleted file mode 100644 index 96f4d89848a3..000000000000 --- a/arch/arm/dts/imx6sx-udoo-neo-full.dts +++ /dev/null @@ -1,41 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - */ - -/dts-v1/; - -#include "imx6sx-udoo-neo.dtsi" - -/ { - model = "UDOO Neo Full"; - compatible = "udoo,neofull", "fsl,imx6sx"; - - memory@80000000 { - device_type = "memory"; - reg = <0x80000000 0x40000000>; - }; -}; - -&fec1 { - phy-handle = <ðphy1>; - status = "okay"; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - - ethphy1: ethernet-phy@0 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0>; - }; - }; -}; - -&i2c4 { /* Onboard Motion sensors */ - status = "okay"; -}; - -&uart3 { /* Bluetooth */ - status = "okay"; -}; diff --git a/arch/arm/dts/imx6sx-udoo-neo.dtsi b/arch/arm/dts/imx6sx-udoo-neo.dtsi deleted file mode 100644 index c84ea1fac5e9..000000000000 --- a/arch/arm/dts/imx6sx-udoo-neo.dtsi +++ /dev/null @@ -1,482 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - */ - -#include "imx6sx.dtsi" - -/ { - compatible = "fsl,imx6sx"; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - leds { - compatible = "gpio-leds"; - - red { - label = "udoo-neo:red:mmc"; - gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>; - default-state = "off"; - linux,default-trigger = "mmc0"; - }; - - orange { - label = "udoo-neo:orange:user"; - gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; - default-state = "keep"; - }; - }; - - reg_sdio_pwr: regulator-sdio-pwr { - compatible = "regulator-fixed"; - gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>; - enable-active-high; - regulator-name = "SDIO_PWR"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - }; - - reg_usb_otg1_vbus: regulator-usb-otg1-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_otg1_reg>; - regulator-name = "usb_otg1_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - reg_usb_otg2_vbus: regulator-usb-otg2-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_otg2_reg>; - regulator-name = "usb_otg2_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio4 12 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - reg_wlan: regulator-wlan { - compatible = "regulator-fixed"; - regulator-name = "wlan-en-regulator"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; - enable-active-high; - }; -}; - -&fec1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_enet1>; - phy-mode = "rmii"; - phy-reset-duration = <10>; - phy-reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; -}; - -&i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c1>; - clock-frequency = <100000>; - status = "okay"; - - pmic: pmic@8 { - compatible = "fsl,pfuze3000"; - reg = <0x08>; - - regulators { - sw1a_reg: sw1a { - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1475000>; - regulator-boot-on; - regulator-always-on; - regulator-ramp-delay = <6250>; - }; - - sw1c_reg: sw1b { - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1475000>; - regulator-boot-on; - regulator-always-on; - regulator-ramp-delay = <6250>; - }; - - sw2_reg: sw2 { - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1850000>; - regulator-boot-on; - regulator-always-on; - }; - - sw3a_reg: sw3 { - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1650000>; - regulator-boot-on; - regulator-always-on; - }; - - swbst_reg: swbst { - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5150000>; - }; - - snvs_reg: vsnvs { - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <3000000>; - regulator-boot-on; - regulator-always-on; - }; - - vref_reg: vrefddr { - regulator-boot-on; - regulator-always-on; - }; - - vgen1_reg: vldo1 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - vgen2_reg: vldo2 { - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1550000>; - }; - - vgen3_reg: vccsd { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - vgen4_reg: v33 { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - vgen5_reg: vldo3 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - vgen6_reg: vldo4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - }; - }; -}; - -&i2c2 { /* Brick snap in sensors connector */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c2>; - clock-frequency = <100000>; - status = "okay"; -}; - -&i2c3 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c3>; - clock-frequency = <100000>; - status = "okay"; - - hdmi-transmitter@70 { - compatible = "nxp,tda998x"; - reg = <0x70>; - interrupts-extended = <&gpio3 27 IRQ_TYPE_LEVEL_LOW>; - - ports { - port { - hdmi: endpoint { - remote-endpoint = <&lcdc>; - }; - }; - }; - }; -}; - -&i2c4 { /* Onboard Motion sensors */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c4>; - clock-frequency = <100000>; - status = "disabled"; -}; - -&lcdif1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcd>; - status = "okay"; - - port { - lcdc: endpoint { - remote-endpoint = <&hdmi>; - }; - }; -}; - -&iomuxc { - pinctrl_bt_reg: btreggrp { - fsl,pins = - ; - }; - - pinctrl_enet1: enet1grp { - fsl,pins = - , - , - , - , - , - , - - , - , - , - , - , - , - - ; - }; - - pinctrl_i2c1: i2c1grp { - fsl,pins = - , - ; - }; - - pinctrl_i2c2: i2c2grp { - fsl,pins = - , - ; - }; - - pinctrl_i2c3: i2c3grp { - fsl,pins = - , - ; - }; - - pinctrl_i2c4: i2c4grp { - fsl,pins = - , - ; - }; - - pinctrl_lcd: lcdgrp { - fsl,pins = < - MX6SX_PAD_LCD1_DATA00__LCDIF1_DATA_0 0x4001b0b0 - MX6SX_PAD_LCD1_DATA01__LCDIF1_DATA_1 0x4001b0b0 - MX6SX_PAD_LCD1_DATA02__LCDIF1_DATA_2 0x4001b0b0 - MX6SX_PAD_LCD1_DATA03__LCDIF1_DATA_3 0x4001b0b0 - MX6SX_PAD_LCD1_DATA04__LCDIF1_DATA_4 0x4001b0b0 - MX6SX_PAD_LCD1_DATA05__LCDIF1_DATA_5 0x4001b0b0 - MX6SX_PAD_LCD1_DATA06__LCDIF1_DATA_6 0x4001b0b0 - MX6SX_PAD_LCD1_DATA07__LCDIF1_DATA_7 0x4001b0b0 - MX6SX_PAD_LCD1_DATA08__LCDIF1_DATA_8 0x4001b0b0 - MX6SX_PAD_LCD1_DATA09__LCDIF1_DATA_9 0x4001b0b0 - MX6SX_PAD_LCD1_DATA10__LCDIF1_DATA_10 0x4001b0b0 - MX6SX_PAD_LCD1_DATA11__LCDIF1_DATA_11 0x4001b0b0 - MX6SX_PAD_LCD1_DATA12__LCDIF1_DATA_12 0x4001b0b0 - MX6SX_PAD_LCD1_DATA13__LCDIF1_DATA_13 0x4001b0b0 - MX6SX_PAD_LCD1_DATA14__LCDIF1_DATA_14 0x4001b0b0 - MX6SX_PAD_LCD1_DATA15__LCDIF1_DATA_15 0x4001b0b0 - MX6SX_PAD_LCD1_DATA16__LCDIF1_DATA_16 0x4001b0b0 - MX6SX_PAD_LCD1_DATA17__LCDIF1_DATA_17 0x4001b0b0 - MX6SX_PAD_LCD1_DATA18__LCDIF1_DATA_18 0x4001b0b0 - MX6SX_PAD_LCD1_DATA19__LCDIF1_DATA_19 0x4001b0b0 - MX6SX_PAD_LCD1_DATA20__LCDIF1_DATA_20 0x4001b0b0 - MX6SX_PAD_LCD1_DATA21__LCDIF1_DATA_21 0x4001b0b0 - MX6SX_PAD_LCD1_DATA22__LCDIF1_DATA_22 0x4001b0b0 - MX6SX_PAD_LCD1_DATA23__LCDIF1_DATA_23 0x4001b0b0 - MX6SX_PAD_LCD1_CLK__LCDIF1_CLK 0x4001b0b0 - MX6SX_PAD_LCD1_ENABLE__LCDIF1_ENABLE 0x4001b0b0 - MX6SX_PAD_LCD1_VSYNC__LCDIF1_VSYNC 0x4001b0b0 - MX6SX_PAD_LCD1_HSYNC__LCDIF1_HSYNC 0x4001b0b0 - MX6SX_PAD_LCD1_RESET__GPIO3_IO_27 0x4001b0b0 - >; - }; - - pinctrl_uart1: uart1grp { - fsl,pins = - , - ; - }; - - pinctrl_uart2: uart2grp { - fsl,pins = - , - ; - }; - - pinctrl_uart3: uart3grp { - fsl,pins = - , - , - , - ; - }; - - pinctrl_uart5: uart5grp { - fsl,pins = - , - ; - }; - - pinctrl_uart6: uart6grp { - fsl,pins = - , - , - , - , - , - , - , - ; - }; - - pinctrl_otg1_reg: otg1grp { - fsl,pins = - ; - }; - - pinctrl_otg2_reg: otg2grp { - fsl,pins = - ; - }; - - pinctrl_usb_otg1: usbotg1grp { - fsl,pins = - , - ; - }; - - pinctrl_usb_otg2: usbot2ggrp { - fsl,pins = - ; - }; - - pinctrl_usdhc2: usdhc2grp { - fsl,pins = - , - , - , - , - , - , - ; /* CD */ - }; - - pinctrl_usdhc3: usdhc3grp { - fsl,pins = - , - , - , - , - , - , - , - , - ; - }; -}; - -&uart1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart1>; - status = "okay"; -}; - -/* Cortex-M4 serial */ -&uart2 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart2>; - status = "disabled"; -}; - -&uart3 { /* Bluetooth - only on Extended/Full versions */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart3>; - uart-has-rtscts; - status = "disabled"; - - bluetooth { - compatible = "ti,wl1831-st"; - enable-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_bt_reg>; - max-speed = <921600>; - }; -}; - -/* Arduino serial */ -&uart5 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart5>; - status = "disabled"; -}; - -&uart6 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart6>; - uart-has-rtscts; - status = "disabled"; -}; - -&usbotg1 { /* J2 micro USB port */ - vbus-supply = <®_usb_otg1_vbus>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usb_otg1>; - status = "okay"; -}; - -&usbotg2 { /* J3 host USB port */ - vbus-supply = <®_usb_otg2_vbus>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usb_otg2>; - dr_mode = "host"; - status = "okay"; -}; - -&usdhc2 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc2>; - vmmc-supply = <®_sdio_pwr>; - bus-width = <4>; - cd-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; - no-1-8-v; - keep-power-in-suspend; - wakeup-source; - status = "okay"; -}; - -&usdhc3 { /* Wi-Fi */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc3>; - non-removable; - vmmc-supply = <®_wlan>; - cap-power-off-card; - wakeup-source; - keep-power-in-suspend; - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - wlcore: wlcore@2 { - compatible = "ti,wl1831"; - reg = <2>; - interrupt-parent = <&gpio2>; - interrupts = <16 IRQ_TYPE_EDGE_RISING>; - ref-clock-frequency = <38400000>; - tcxo-clock-frequency = <26000000>; - }; -}; diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 7800553ae8d9..bee9d5f4877c 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -636,6 +636,7 @@ config TARGET_UDOO_NEO select DM_THERMAL select SUPPORT_SPL imply CMD_DM + imply OF_UPSTREAM config TARGET_SOFTING_VINING_2000 bool "Softing VIN|ING 2000" diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 826d5a115043..0c76b005557b 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -11,7 +11,7 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_MX6SX=y CONFIG_TARGET_UDOO_NEO=y CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx6sx-udoo-neo-basic" +CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6sx-udoo-neo-basic" CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y