From patchwork Sat Mar 25 00:02:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Rowe X-Patchwork-Id: 1760981 X-Patchwork-Delegate: sr@denx.de 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=20210112 header.b=J2zFuReJ; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pjznd0sDVz1yXq for ; Sat, 25 Mar 2023 11:03:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CD28185D99; Sat, 25 Mar 2023 01:03:32 +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="J2zFuReJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F31E285D9B; Sat, 25 Mar 2023 01:03:28 +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.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=unavailable autolearn_force=no version=3.4.2 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (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 B5B3785D92 for ; Sat, 25 Mar 2023 01:03:24 +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=martin.p.rowe@gmail.com Received: by mail-pl1-x632.google.com with SMTP id w4so3293232plg.9 for ; Fri, 24 Mar 2023 17:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679702603; 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=6evMovrDYKgw67HUpVJljgevyBuI/jHa/+5MJ35nDqU=; b=J2zFuReJS77t/dACjYv8yIFK2kH0m4Mr+AsHJ5iSSJuMKD8SOf4BJfeLZ2N5Z04qha N/B5Zs35JU5IxixlWkKuv1TDfM2Ff7UerIFing6tVnl12rlwNh7zcuL39mMEI9BBFLmS L/brWiAbuyEIC3IGLcCvVvd0XDhLF6FO1p7Ic2mwi6QtYn5eUBRWQZIfsBEkumJtxt7I JB4tL6JeS1Smd+4SvQGrk448ClhuCyZewe2quUxzcky9/RsomL976ozB6CWEp539gw3e 1aJ1FXhSQS6EfTHh1XpG/ikj5aHU3BeC/U6wtF1lloo2TarkBhGalPgtwPwVoaBzjFF3 piNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679702603; 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=6evMovrDYKgw67HUpVJljgevyBuI/jHa/+5MJ35nDqU=; b=ri7B/3NWim6kmiq3IGfvkb41NZ2aJ160hWu8hWll4l/D2wUaeahslPn8ESS4BYFjsl gxgbvUTgW/72mwmznIv9PGA6Z5VWVgCFrmJyupVJQ1Rpe/ic/X3LwsK2mrpzTbaxd9Jp nf63OTtyoZXA+XNpvkXEGEJTTXtD8j6XB7bF59GdQp3586waQtf3K7M+f54OfK3jU+IY Nzr7yMne9C2e0BjcuVeas4sQMcW0MfEc6tDz8UtVloWqg8agdKEbYPGwsqNI1DolLB/q nlZIHjQjFujPUrPlw4Rh/SfYBU1pmdEz1WIFDuMPu0agYr/0W44+EE2Sn2IgEgcWShM7 2xqA== X-Gm-Message-State: AAQBX9efAFXsh6DbIZZkABpK48XanZlpC5VY4gGFciJbsvgaCYejFJx0 1Iq8he+tEUvBT5+tgqDKMlg= X-Google-Smtp-Source: AKy350ZYcWDgFqB+XnHCJj6jzJpXaJNOdk1Y6Mn9m9tSLGOp/JVCxXRwidY7WavCtxhCU15L97xnUw== X-Received: by 2002:a17:90b:3851:b0:23d:4e9d:2eb0 with SMTP id nl17-20020a17090b385100b0023d4e9d2eb0mr4439621pjb.36.1679702602752; Fri, 24 Mar 2023 17:03:22 -0700 (PDT) Received: from hawking.mbtj.net (60-240-212-34.tpgi.com.au. [60.240.212.34]) by smtp.gmail.com with ESMTPSA id u12-20020a17090ae00c00b002311c4596f6sm399020pjy.54.2023.03.24.17.03.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 17:03:22 -0700 (PDT) From: Martin Rowe To: pali@kernel.org, sr@denx.de Cc: josua@solid-run.com, jon@solid-run.com, mibodhi@gmail.com, u-boot@lists.denx.de, Martin Rowe Subject: [PATCH v2 1/3] arm: mvebu: clearfog: Fix MMC detection Date: Sat, 25 Mar 2023 10:02:43 +1000 Message-Id: <20230325000245.8467-2-martin.p.rowe@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230325000245.8467-1-martin.p.rowe@gmail.com> References: <20230325000245.8467-1-martin.p.rowe@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 A388 Clearfog MMC is either SD Card or eMMC with different behaviour for both. Setting the device to non-removable in the u-boot.dtsi allows both to correctly detect the device. Signed-off-by: Martin Rowe Reviewed-by: Stefan Roese --- arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi index fb27a3b96f..906d8f2e67 100644 --- a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi +++ b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi @@ -10,6 +10,7 @@ &sdhci { bootph-pre-ram; + non-removable; /* assume that the card is always present, required for eMMC variant */ }; &gpio0 { From patchwork Sat Mar 25 00:02:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Rowe X-Patchwork-Id: 1760982 X-Patchwork-Delegate: sr@denx.de 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=20210112 header.b=J+INSQWJ; 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 4Pjznl23hzz1yXq for ; Sat, 25 Mar 2023 11:03:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 644BF85D92; Sat, 25 Mar 2023 01:03:41 +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="J+INSQWJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE7E585DA2; Sat, 25 Mar 2023 01:03:32 +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.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 21E5985D92 for ; Sat, 25 Mar 2023 01:03:29 +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=martin.p.rowe@gmail.com Received: by mail-pj1-x1034.google.com with SMTP id f6-20020a17090ac28600b0023b9bf9eb63so3130187pjt.5 for ; Fri, 24 Mar 2023 17:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679702607; 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=DZGUWW8s8eX0D8jNaQaoWqJ8EiA1VlxW86AJRkgP8tM=; b=J+INSQWJsIxWsFkTfljbJYvARwMNN9zAh5CxJetBFzduFIgtztsnL7oNeNMPhm9PaG D+Zjpj7qqP3cDVsV6/eJftwyZ5USNNKylLOuKJa/+5MVsc/qhkHSAbZoGv6HaQJnH7Jz EA+B1k/uR7Kr1aa77qOlVRhgfo3m55IKwhj9AC4rWHzMVwzqjEEjFVIq5lTDO5tQLN9s tWDO8HdObYkKHSWF5AatxSYUaGIPYlco/taw7UvPkhuTtai010HZb8vKZ0LE0viurvW7 gzUz+KSWEwkRtIQrPht7WeZtGeJ86ANmjHFzwfPGiBSvUg28tG3VEymfyZ8aYqxtzSKz PXkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679702607; 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=DZGUWW8s8eX0D8jNaQaoWqJ8EiA1VlxW86AJRkgP8tM=; b=oTO+uD4epXG8a/yIy6sbbYaRe5WEdcGWOc/ARui0l1ZCwSoUfNcNwZqfsWC3DYIHxI Ir6YXu2ssBa/aB53gdnNM2b/lMqZq1yRp1RiYXXaFaN1su+mBUXdXK+16+GSXMS5dFvx MUiXOEN1mqipwltf8vmK6QqpKyRrZ2faYor52RLQQi0iCr1y+nDuaIopMF28IGjVUEHJ 8DoK4+EzSdtkTNBVLtpK5WfupMf6MjJo4aYr2UuCV4g4rDs1/m3jvY8FxtG1EmR+HNHe 9ktVTRepkOl+9aHjKp0v9Tzds60SRCKXMbWQoCm86o1F/olyaRi2saT/GB8yX5EGhWQ2 avBQ== X-Gm-Message-State: AAQBX9eEVwiH5o3SxIke44AMlqca4VH3ka4MNpP7LnYJjLJR3lKi4qEJ kle10FsmaVIDl8JhiTS6+UA= X-Google-Smtp-Source: AKy350ZmYZYER9FdSu5I0EkCTukldqIcZpqF7aTP6DKnm2mSvwFuhwXO7qegxBp8d3bO5OyRlfzoVg== X-Received: by 2002:a17:90b:3ecb:b0:23b:3641:cf16 with SMTP id rm11-20020a17090b3ecb00b0023b3641cf16mr4375345pjb.11.1679702607035; Fri, 24 Mar 2023 17:03:27 -0700 (PDT) Received: from hawking.mbtj.net (60-240-212-34.tpgi.com.au. [60.240.212.34]) by smtp.gmail.com with ESMTPSA id u12-20020a17090ae00c00b002311c4596f6sm399020pjy.54.2023.03.24.17.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 17:03:26 -0700 (PDT) From: Martin Rowe To: pali@kernel.org, sr@denx.de Cc: josua@solid-run.com, jon@solid-run.com, mibodhi@gmail.com, u-boot@lists.denx.de, Martin Rowe Subject: [PATCH v2 2/3] arm: mvebu: clearfog: Add defconfig for SPI booting Date: Sat, 25 Mar 2023 10:02:44 +1000 Message-Id: <20230325000245.8467-3-martin.p.rowe@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230325000245.8467-1-martin.p.rowe@gmail.com> References: <20230325000245.8467-1-martin.p.rowe@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 This new clearfog_spi_defconfig file is a copy of existing clearfog_defconfig file modified to instruct build system to generate final kwbimage for SPI booting and to store the environment in SPI. Signed-off-by: Martin Rowe Reviewed-by: Stefan Roese --- configs/{clearfog_defconfig => clearfog_spi_defconfig} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) copy configs/{clearfog_defconfig => clearfog_spi_defconfig} (98%) diff --git a/configs/clearfog_defconfig b/configs/clearfog_spi_defconfig similarity index 98% copy from configs/clearfog_defconfig copy to configs/clearfog_spi_defconfig index 8cd35f9f1a..9dcf16fe92 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_spi_defconfig @@ -9,7 +9,7 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xff0000 CONFIG_TARGET_CLEARFOG=y -CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y +CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog" CONFIG_SPL_TEXT_BASE=0x40000030 CONFIG_SPL_SERIAL=y From patchwork Sat Mar 25 00:02:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Rowe X-Patchwork-Id: 1760983 X-Patchwork-Delegate: sr@denx.de 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=20210112 header.b=GtusmIGj; 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 4Pjzny5Xxvz1yXq for ; Sat, 25 Mar 2023 11:04:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 576B485D9D; Sat, 25 Mar 2023 01:03:54 +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="GtusmIGj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E7B3385DAD; Sat, 25 Mar 2023 01:03:50 +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.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=unavailable autolearn_force=no version=3.4.2 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) (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 12A7985D94 for ; Sat, 25 Mar 2023 01:03:33 +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=martin.p.rowe@gmail.com Received: by mail-pj1-x102b.google.com with SMTP id r7-20020a17090b050700b002404be7920aso2561561pjz.5 for ; Fri, 24 Mar 2023 17:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679702611; 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=bFlqKNTbwVpNO+VQJz9NYk/WWoryizPJFeQpcZjHcak=; b=GtusmIGjILDIPw+o7pT8EZtMo15ijiPWLIQ6SzwS1b0iJmUXcaWjQcAjktTc151FKF 8aYFC4wvF7yj7fbL0pPmwSnDQaR4kLcTcDzbZxantvrOtWF60SDbCum4s04+p5up3l4D kc4dhOgU4XVh5iP2TYhyU6MLgpZjNaynLxGfxbOvajGhuWqVMIG1uek62GbLKoYn0Gbk 6mu9ppbw8ElNjO11tJp+fb1y4nuHKf7zp2/q9YHPrxXyoZRs02zxUBRzdMwUORa2wNnL ZGAMhFYlUbeDdAUei53OTjA+ncZZQj7u/XbplCir6B5Glhu6OWUYu2UlZSOa92Mhk74s hDOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679702611; 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=bFlqKNTbwVpNO+VQJz9NYk/WWoryizPJFeQpcZjHcak=; b=XPUq99bOxnwLCmPINTP38gK8wD/HtxwLe+PbQo97iYp7p3TrAt89YMvcIsPQo9Uqzi cisY3VEkbCF0pinKKODgHlsPjYNv7pMoerPMhQ6gbFqe58T9957sxtNbfhe6kVuBQuvf /BXAb6U9XmbHtf90ZHKuA86DEiDaIAQnVHA7431Z8dDqWT8A3pBjI9A/Tv6LJ9KkacfY rWl5oMcfhci0Jiy6l81EKG5n82hehUVtsSKRp1nioVhCKydQd0LkNXc0aXWP/7qfpqc8 sUR2GQSnTnjc8M1opSTnPqnv8kXPFwlK3gfF69EhNsccNrRpsEL6IYuegffQcdUZolUm hPrQ== X-Gm-Message-State: AAQBX9fEEsKLbtllY06JQ/Pv9GKvjNsqstF1Pa0WxvjjyhhNWkURQCre Rp07aPprvV1JfiByJiO94n4= X-Google-Smtp-Source: AKy350YbiY9SkOyFNm2UU2MVGc0Aqcm1Gg3bBzkeWrty4kKRKOG5z/iUPePTQ0DmQQ3ZqpTdK1MBPw== X-Received: by 2002:a17:90b:4d0d:b0:23a:f6e6:8ea5 with SMTP id mw13-20020a17090b4d0d00b0023af6e68ea5mr3635328pjb.24.1679702611090; Fri, 24 Mar 2023 17:03:31 -0700 (PDT) Received: from hawking.mbtj.net (60-240-212-34.tpgi.com.au. [60.240.212.34]) by smtp.gmail.com with ESMTPSA id u12-20020a17090ae00c00b002311c4596f6sm399020pjy.54.2023.03.24.17.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 17:03:30 -0700 (PDT) From: Martin Rowe To: pali@kernel.org, sr@denx.de Cc: josua@solid-run.com, jon@solid-run.com, mibodhi@gmail.com, u-boot@lists.denx.de, Martin Rowe Subject: [PATCH v2 3/3] arm: mvebu: clearfog: Detect MMC vs SDHC and fixup fdt Date: Sat, 25 Mar 2023 10:02:45 +1000 Message-Id: <20230325000245.8467-4-martin.p.rowe@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230325000245.8467-1-martin.p.rowe@gmail.com> References: <20230325000245.8467-1-martin.p.rowe@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 [upstream of vendor commit 19a96f7c40a8fc1d0a6546ac2418d966e5840a99] The Clearfog devices have only one SDHC device. This is either eMMC if it is populated on the SOM or SDHC if not. The Linux device tree assumes the SDHC case. Detect if the device is an eMMC and fixup the device-tree so it will be detected by Linux. Ported from vendor repo at https://github.com/SolidRun/u-boot Signed-off-by: Martin Rowe Reviewed-by: Stefan Roese --- arch/arm/mach-mvebu/Kconfig | 1 + board/solidrun/clearfog/clearfog.c | 32 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index fb3cff43f7..773635d691 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -107,6 +107,7 @@ config TARGET_CLEARFOG bool "Support ClearFog" select 88F6820 select BOARD_LATE_INIT + select OF_BOARD_SETUP config TARGET_HELIOS4 bool "Support Helios4" diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c index 03adb591d8..0087fea7db 100644 --- a/board/solidrun/clearfog/clearfog.c +++ b/board/solidrun/clearfog/clearfog.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -261,3 +262,34 @@ int board_late_init(void) return 0; } + +static bool has_emmc(void) +{ + struct mmc *mmc; + mmc = find_mmc_device(0); + if (!mmc) + return 0; + return (!mmc_init(mmc) && IS_MMC(mmc)) ? true : false; +} + +/* + * The Clearfog devices have only one SDHC device. This is either eMMC + * if it is populated on the SOM or SDHC if not. The Linux device tree + * assumes the SDHC case. Detect if the device is an eMMC and fixup the + * device-tree, so that it will be detected by Linux. + */ +int ft_board_setup(void *blob, struct bd_info *bd) +{ + __maybe_unused int node; + + if (has_emmc()) { + node = fdt_node_offset_by_compatible(blob, -1, "marvell,armada-380-sdhci"); + if (node < 0) + return 0; /* Unexpected eMMC device; patching not supported */ + + puts("Patching FDT so that eMMC is detected by OS\n"); + return fdt_setprop_empty(blob, node, "non-removable"); + } + + return 0; +}