From patchwork Wed Oct 28 09:58:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1389211 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dIf5tbAS; dkim-atps=neutral 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CLkZ168HWz9sVW for ; Wed, 28 Oct 2020 20:59:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 09BF5824EC; Wed, 28 Oct 2020 10:58:39 +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="dIf5tbAS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C2EB48246A; Wed, 28 Oct 2020 10:58:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (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 BF64F8246A for ; Wed, 28 Oct 2020 10:58:27 +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=igor.opaniuk@gmail.com Received: by mail-lj1-x242.google.com with SMTP id p15so5359661ljj.8 for ; Wed, 28 Oct 2020 02:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HOzFL19V+f262o5J0VUF2P2aP/PbCc2ehVwS3MHq9eg=; b=dIf5tbASJTnpls8K75uyksZX/LhHORn2R/tB/RVQkLqsUj2tOBES6WUKYiEsTXANei YdCK/2aNXdElNn6BHx+nv/JBjgmFMbZUmIxDlgeTmyvUJYGVeP03C3vSUHbjCoexES0C JXTaH1x6i8UdH55wQZFR9WzlZU7716abj+Zd2LRRiM/11qUi2N9lDDLzOTyrwsN7VuJt eQyWonG4UvSJtzJWcwZK0zKfACE+xQxQmW2CQNbwLwf5gh5tznOVtwDGyfmKmV5EUxph HKyp96mywGnODtvl/92ukzH72QCeDgPZmZytJ6sfYT27Fi4VpMJ7AMYYsAGGmld73NOv 1zSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HOzFL19V+f262o5J0VUF2P2aP/PbCc2ehVwS3MHq9eg=; b=qXQvHFa7H17Q0MU6/tvb1MbwzoHSvKFqZG01rObag76JBess4UVNQvd2/L30RnQglX b1aiJUVMz/yqz3QG1o8W7iwMTaBbfdnWV46SYOmDD4TxKgcaBNIV87uNgPm5ng0WwTUW 6INGdSIn40k3bqqvQTFa1rBZZZJO2oUM/Y2XY3zK1r7ZV1omQHvSs42YfThShXz+jUGO 3WOIXv8aKVJV0zT7Fs5a/CMMofULlSWveBCcns6phGTYutK9oNc2wT1S70uKo+8njFBu MB6AJfysc5zEARnescsAV3GLWFjY5jxFvkw8O71xlEihZH3W76n0YLfs/MpUepyun+wp E37Q== X-Gm-Message-State: AOAM5306dVIhp2iY6RxY/4pkmKD4uDij64Tz1zSZV8YF+55j42Ps6kdj W4osN15zOXJB6u1m0arALU+CzYTchZT6jw== X-Google-Smtp-Source: ABdhPJx7rRYYpHWTU25l3nYPrXUh37mprs0wMF7L4LQgCqqb7gdUk48+lTG88QZYnXwKhyjSFBabDw== X-Received: by 2002:a2e:96d2:: with SMTP id d18mr2783353ljj.407.1603879106796; Wed, 28 Oct 2020 02:58:26 -0700 (PDT) Received: from localhost ([109.108.76.111]) by smtp.gmail.com with ESMTPSA id m10sm475246lfo.237.2020.10.28.02.58.25 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Oct 2020 02:58:26 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Marcel Ziswiler , Peng Fan , Oleksandr Suvorov , Philippe Schenker , Max Krummenacher , Stefano Babic , Igor Opaniuk Subject: [PATCH v1 6/9] verdin-imx8mm: implement hardware version detection Date: Wed, 28 Oct 2020 11:58:13 +0200 Message-Id: <20201028095816.23906-6-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201028095816.23906-1-igor.opaniuk@gmail.com> References: <20201028095816.23906-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean From: Max Krummenacher And select the correct devicetree accordingly by setting the variant environment variable. Signed-off-by: Igor Opaniuk Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- board/toradex/verdin-imx8mm/verdin-imx8mm.c | 71 +++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c index 66950ed218..9c6f35e778 100644 --- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c +++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c @@ -8,12 +8,22 @@ #include #include #include +#include #include #include #include +#include "../common/tdx-cfg-block.h" + DECLARE_GLOBAL_DATA_PTR; +#define I2C_PMIC 0 + +enum pcb_rev_t { + PCB_VERSION_1_0, + PCB_VERSION_1_1 +}; + #if IS_ENABLED(CONFIG_FEC_MXC) static int setup_fec(void) { @@ -104,8 +114,69 @@ int board_mmc_get_env_dev(int devno) return devno; } +static enum pcb_rev_t get_pcb_revision(void) +{ + struct udevice *bus; + struct udevice *i2c_dev = NULL; + int ret; + u8 is_bd71837 = 0; + + ret = uclass_get_device_by_seq(UCLASS_I2C, I2C_PMIC, &bus); + if (!ret) + ret = dm_i2c_probe(bus, 0x4b, 0, &i2c_dev); + if (!ret) + ret = dm_i2c_read(i2c_dev, 0x0, &is_bd71837, 1); + + /* BD71837_REV, High Nibble is major version, fix 1010 */ + is_bd71837 = !ret && ((is_bd71837 & 0xf0) == 0xa0); + return is_bd71837 ? PCB_VERSION_1_0 : PCB_VERSION_1_1; +} + +static void select_dt_from_module_version(void) +{ + char variant[32]; + char *env_variant = env_get("variant"); + int is_wifi = 0; + + if (IS_ENABLED(CONFIG_TDX_CFG_BLOCK)) { + /* + * If we have a valid config block and it says we are a + * module with Wi-Fi/Bluetooth make sure we use the -wifi + * device tree. + */ + is_wifi = (tdx_hw_tag.prodid == VERDIN_IMX8MMQ_WIFI_BT_IT) || + (tdx_hw_tag.prodid == VERDIN_IMX8MMDL_WIFI_BT_IT); + } + + switch (get_pcb_revision()) { + case PCB_VERSION_1_0: + printf("Detected a V1.0 module\n"); + if (is_wifi) + strncpy(&variant[0], "wifi", sizeof(variant)); + else + strncpy(&variant[0], "nonwifi", sizeof(variant)); + break; + default: + if (is_wifi) + strncpy(&variant[0], "wifi-v1.1", sizeof(variant)); + else + strncpy(&variant[0], "nonwifi-v1.1", sizeof(variant)); + break; + } + + if (strcmp(variant, env_variant)) { + printf("Setting variant to %s\n", variant); + env_set("variant", variant); + + if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE)) + env_save(); + } +} + int board_late_init(void) { + select_dt_from_module_version(); + return 0; }