From patchwork Sun May 8 15:08:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 1628103 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Lh1d+4yd; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kx77V33cmz9tkB for ; Mon, 9 May 2022 01:11:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED6E3841FD; Sun, 8 May 2022 17:09:36 +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="Lh1d+4yd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C40E83E49; Sun, 8 May 2022 17:09:06 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 95EC683F60 for ; Sun, 8 May 2022 17:08:43 +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=jbx6244@gmail.com Received: by mail-ed1-x534.google.com with SMTP id d6so13613889ede.8 for ; Sun, 08 May 2022 08:08:43 -0700 (PDT) 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=nNUKmCWtqZ6fk4HfvEsmqfkN09TclgewwS17S5CaLio=; b=Lh1d+4ydJfbXp7vBFghN1FiL1HA9TCm7r69BRUhchgEuZp/b+eNtjQxZVSk5MllkYg 79N4J6S/DjYfoBmflXFChlg2dlRwJChxXRZmwt1oiXjbZuxde4mIS4E+ntJ62rQcGtJ4 etIZRDebGpbqRkeCLAcG8alHZCijvu6g+dSqEriUzp7FiX2gfAOTokiIsyH1NRNjEvvN vyzCmmSiNBxT0Qf1WDJEHQIjhWBIKPgD7RP2nx8mt02KDwqdolRkTt3lqBI0wKLVp43y juXBcD3B0rN9yHwphAMPU7gl60nxoSHBXZULipOxqwEXw2sR+OPeu655ziXEa3N/9ODY 2Z1A== 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=nNUKmCWtqZ6fk4HfvEsmqfkN09TclgewwS17S5CaLio=; b=edn5pj71XYi4Pgx2BrZaY8c9UlNgbNdZMKoXB1PIQi+DyDLz9Ga8BBAQPCmaFkN/EN k2jCDvnUa8+FQI5G6KRh1q0jBHCRHHFaNlSxcLEIgDrFW7JrEooz5TNTLWvslL6uz3rh DfF5+S81/EdBakJcAxBQ5IEcAp/Cen5+I/+LtPojr6gEsvgx1blsPeFC7deXeHNtelo9 tHuX5x9jRHVFeohzSm2Obq5yqmkGFzp5N2kO9SRMjQOuv6ognE3tqMNS5GQEnvXPK60V fykryhhdndxCU/c2Bu/nfFBuZlHvUEoubA2o2JZjxh8VzSDE4QZaunGy5jDXqUq4wN+u GmIg== X-Gm-Message-State: AOAM530HpeXj/Ozlu+Sch1k1o3ifuaUu2akZEwGKEA3ZL/T++NjvtmhY +aidB/SPom+MuWR0ufSJ29w= X-Google-Smtp-Source: ABdhPJzZ70Fv2S/GPH8oJriKSQMiXfMARvEvD/ynyMocEizIB6WZAqmy1YInX7dhp+jUqK2aam7n1g== X-Received: by 2002:a05:6402:1d48:b0:427:e039:9262 with SMTP id dz8-20020a0564021d4800b00427e0399262mr13391209edb.148.1652022522833; Sun, 08 May 2022 08:08:42 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id yl26-20020a17090693fa00b006f3ef214dc2sm4102721ejb.40.2022.05.08.08.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 08:08:42 -0700 (PDT) From: Johan Jonker To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, lukma@denx.de, marex@denx.de, u-boot@lists.denx.de Subject: [PATCH v1 15/17] rockchip: rk3066: config nand data pins in spl Date: Sun, 8 May 2022 17:08:23 +0200 Message-Id: <20220508150825.21711-16-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220508150825.21711-1-jbx6244@gmail.com> References: <20220508150825.21711-1-jbx6244@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.5 at phobos.denx.de X-Virus-Status: Clean From: Paweł Jarosz The rk3066 grf_soc_con0 allows interchangeable data pin configuration for emmc and nand. Use rockchip_nand_board_early_init function to config nand data pins in spl as bootrom leaves it in default state. Signed-off-by: Paweł Jarosz Signed-off-by: Johan Jonker --- arch/arm/mach-rockchip/rk3066/rk3066.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3066/rk3066.c b/arch/arm/mach-rockchip/rk3066/rk3066.c index 78c7d894..1d1b8687 100644 --- a/arch/arm/mach-rockchip/rk3066/rk3066.c +++ b/arch/arm/mach-rockchip/rk3066/rk3066.c @@ -28,12 +28,15 @@ void board_debug_uart_init(void) void spl_board_init(void) { + __maybe_unused struct rk3066_grf * const grf = (void *)GRF_BASE; + if (!IS_ENABLED(CONFIG_SPL_BUILD)) return; - if (IS_ENABLED(CONFIG_SPL_DM_MMC)) { - struct rk3066_grf * const grf = (void *)GRF_BASE; + if (IS_ENABLED(CONFIG_NAND_BOOT)) + rk_clrreg(&grf->soc_con0, EMMC_FLASH_SEL_MASK); + if (IS_ENABLED(CONFIG_SPL_DM_MMC)) { rk_clrsetreg(&grf->gpio3b_iomux, GPIO3B0_MASK | GPIO3B1_MASK | GPIO3B2_MASK | GPIO3B3_MASK | GPIO3B4_MASK | GPIO3B5_MASK |