From patchwork Tue Jul 18 09:07:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1809070 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=20221208 header.b=Jf+/YrPp; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R4tQl053Bz20Cs for ; Tue, 18 Jul 2023 19:08:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 894AB866F4; Tue, 18 Jul 2023 11:07:50 +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="Jf+/YrPp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E8376866B9; Tue, 18 Jul 2023 11:07:43 +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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) (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 76AEF866B9 for ; Tue, 18 Jul 2023 11:07:41 +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=andrejs.cainikovs@gmail.com Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b74310566cso84372971fa.2 for ; Tue, 18 Jul 2023 02:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689671260; x=1692263260; 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=vx90AwE0e3egS9Q3RGfLSSn4Kjo7O/NHGDV5xrpFK6k=; b=Jf+/YrPpJ46jSH4CeJeyHJ3dAjTnAyEUKVqTrY9d3f8b8YpkfY/1dm2zhwfV7fq0X3 O5qudujREw8PXAPaeXp6q6b05gYyCo++nfVkxAwyZO71uzb+Ko+rzHCX16EmQWCgWdNR LKN2tyJrmzjFIfqMvkBw2oiXRo7pXh8kTql46IzqAilHDzwgyMZ1tKcxM2FcmbnOTPSn oCHB3jjAfN312mV6dWOG1hclY7mVgD5OVsmlEdQKbcQjwIB+R6n4/vOK+Mv6otInf4VH y1DOWy8IGS6eBMJ5vCGVUj1UHoPA3mTe9VgvtzgNF6NXbvVRC67tQtvlGWLb1QFHaDJg QOjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689671260; x=1692263260; 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=vx90AwE0e3egS9Q3RGfLSSn4Kjo7O/NHGDV5xrpFK6k=; b=l6pLw3aNVKhKOcuLUs2Bq/xLc+cyfXF3eHmJb+fyfHJcYErXvFq4FlDhEeBhcGONkW e0Q4YkWVT/G6h9XBDbI10wO9NQS14emFWvKH170G0TV1EZe6UMD/9FBxHuReapozgbK8 EmuCR3cvRp/flkNtoQwCezvZNZlslr/W3mepjF4VWPz5X3vKGTqvL0uAzkDkDEL9jzp6 ytwYooVCOzLXOz8loHVpjA/Hu3cdAWEB2w6rz5OrbewLaU+jycVXMiOTMQqmljsgt5eo l4VyPuCpJwFeEvK7ppoPN05RgkegnZrhCuphqKr0tlcR+UfVUfng5WkzfmsHNhjR7UVv HyHQ== X-Gm-Message-State: ABy/qLbEJzYPWLdTigfHAqUuaE6LOFLEI5hYGyHyqBObfP4duefEefJo jjQeQQZvc9bf4/6jlpdYhS1uffJeQwE= X-Google-Smtp-Source: APBJJlHhUfWG0Cxi70vzQMs8Pg5ZXa0jieihEnAYB4qe3EJXf9C/AC2NW+B/cwomgX1f/f2EPxIIlw== X-Received: by 2002:a2e:9113:0:b0:2b6:d576:a25b with SMTP id m19-20020a2e9113000000b002b6d576a25bmr10021109ljg.28.1689671260139; Tue, 18 Jul 2023 02:07:40 -0700 (PDT) Received: from andrejs-nb.int.toradex.com (46-126-163-79.dynamic.hispeed.ch. [46.126.163.79]) by smtp.gmail.com with ESMTPSA id n23-20020a7bc5d7000000b003fc06169abdsm1662620wmk.2.2023.07.18.02.07.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 02:07:39 -0700 (PDT) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: u-boot@lists.denx.de Cc: Andrejs Cainikovs , Max Krummenacher Subject: [PATCH v1 3/3] toradex: tdx-cfg-block: rework display adapter name handling Date: Tue, 18 Jul 2023 11:07:34 +0200 Message-Id: <20230718090734.20357-4-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230718090734.20357-1-andrejs.cainikovs@toradex.com> References: <20230718090734.20357-1-andrejs.cainikovs@toradex.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 From: Max Krummenacher Rework the rather big array of zero length strings with 4 entries of actual display adapter names to a array of structs which ties a pid4 to its correspondent human readable string. Provide an accessor to get the string for a given PID4. Signed-off-by: Max Krummenacher Signed-off-by: Andrejs Cainikovs --- board/toradex/common/tdx-cfg-block.c | 22 ++++++++++++++++++---- board/toradex/common/tdx-cfg-block.h | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index accc48be8ff..ec23aa6bbed 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -154,10 +154,11 @@ const struct pid4list toradex_carrier_boards[] = { {YAVIA, "Yavia"}, }; -const char * const toradex_display_adapters[] = { - [0] = "UNKNOWN DISPLAY ADAPTER", - [157] = "Verdin DSI to HDMI Adapter", - [159] = "Verdin DSI to LVDS Adapter", +const struct pid4list toradex_display_adapters[] = { + /* the code assumes unknown at index 0 */ + {0, "UNKNOWN DISPLAY ADAPTER"}, + {VERDIN_DSI_TO_HDMI_ADAPTER, "Verdin DSI to HDMI Adapter"}, + {VERDIN_DSI_TO_LVDS_ADAPTER, "Verdin DSI to LVDS Adapter"}, }; const u32 toradex_ouis[] = { @@ -178,6 +179,19 @@ const char * const get_toradex_carrier_boards(int pid4) return toradex_carrier_boards[index].name; } +const char * const get_toradex_display_adapters(int pid4) +{ + int i, index = 0; + + for (i = 1; i < ARRAY_SIZE(toradex_display_adapters); i++) { + if (pid4 == toradex_display_adapters[i].pid4) { + index = i; + break; + } + } + return toradex_display_adapters[index].name; +} + static u32 get_serial_from_mac(struct toradex_eth_addr *eth_addr) { int i; diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index 6bf587c2347..83a96ed3639 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -118,7 +118,7 @@ extern u32 tdx_car_serial; int read_tdx_cfg_block(void); int read_tdx_cfg_block_carrier(void); const char * const get_toradex_carrier_boards(int pid4); - +const char * const get_toradex_display_adapters(int pid4); int try_migrate_tdx_cfg_block_carrier(void); void get_mac_from_serial(u32 tdx_serial, struct toradex_eth_addr *eth_addr);