From patchwork Sun Jul 9 22:47:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1805460 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=85.214.62.61; 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=J/mGdc+v; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qzj3Y4Smdz20bm for ; Mon, 10 Jul 2023 08:48:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AC7A5865D3; Mon, 10 Jul 2023 00:48:10 +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="J/mGdc+v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4494985F0A; Mon, 10 Jul 2023 00:48:09 +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-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) (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 CB2CD865B0 for ; Mon, 10 Jul 2023 00:48:06 +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=judge.packham@gmail.com Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-66869feb7d1so1916668b3a.3 for ; Sun, 09 Jul 2023 15:48:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688942885; x=1691534885; 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=ixJp6081cyay/BVj50dpu37RP8VQKQ2foHgoSRMCv8E=; b=J/mGdc+v3hexAC1Txx0WlmWbnAUd8cu8Mr2GOed5P/Pzm1u8RF/mz41A6UWX2y1HXC VxK4BAvOp1+xnxYiy9LKhsf5fu1ZjZh0YX0GnmtZ03OjFBRuKk99qLxxeP64Dio+OWsp 48QdlVHGDBQrCkunja90ZK7cGmvB2QZfqbDAqmSOnGlRqso6yQfpyYkj3tVbt5LoZKA2 y9DSgPntshruMqzb/9nDoeX4WMqSpKE4m5FsmYTGUlAXIbGaFdnzisZ8MoVUrNYqs/iG 5W488puMrGm54Phjf9w6CvxrJoswjbW8TwX42ziM1cnG5qNoEXumt9U281bIlCsZ2O/F U5Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688942885; x=1691534885; 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=ixJp6081cyay/BVj50dpu37RP8VQKQ2foHgoSRMCv8E=; b=DfijLAb4EMCV2EMo896ZkgCl/8qQr6OPzrWrFVmPlFoHYGxK3NPxVin2flDgZs0S7D ztUPCqDhfUiBRJsl3TWZVzCMhQLm+iVrs6952H8ndttRA1Nmfb7VgZmVEa2AzVL/imWn wFVtB0kVLdqMB3XkEi/UHyb6YBHsUEBFczI0tmJ7SYq4KhT9czFiWCOMHvS38UhfYWls AFzj9h4NWm9ZrhMuuriOW+Bp31od3Bre8u6e+Polsdwj4tToHhAP1e0uTpaSEDMAus4X blPn8OyFxi1l4u1ORqNnFO5stvfL3PvIQxiJeb79Jn9y31ZMB21Pu/nD3Pe51K/5oGnq FZyg== X-Gm-Message-State: ABy/qLYEaSifHAFLhquBhBnBjBAUdFFAWucVCnAJovztR+15qKklyiPo 5fuOsiV+zYjcdOGnwmsGKTY= X-Google-Smtp-Source: APBJJlERNa1byAYwin0VqcwzxTO9jZ/Q+lbFbFvlaWQmhM8Xbqyk7HOHnzGM4Ch08LR5W7b81vjAFA== X-Received: by 2002:a05:6a20:12d1:b0:10c:c9ac:14c6 with SMTP id v17-20020a056a2012d100b0010cc9ac14c6mr11001766pzg.39.1688942885213; Sun, 09 Jul 2023 15:48:05 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:53f7:af35:6d87:351d]) by smtp.gmail.com with ESMTPSA id y25-20020aa78559000000b0063f1a1e3003sm5871817pfn.166.2023.07.09.15.48.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jul 2023 15:48:04 -0700 (PDT) From: Chris Packham To: sr@denx.de, dario.binacchi@amarulasolutions.com, michael@amarulasolutions.com Cc: chris.packham@alliedtelesis.co.nz, u-boot@lists.denx.de, Chris Packham Subject: [PATCH v2 4/6] mtd: nand: pxa3xx: Enable devbus/nand arbiter on Armada 8K Date: Mon, 10 Jul 2023 10:47:35 +1200 Message-ID: <20230709224737.338525-5-judge.packham@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230709224737.338525-1-judge.packham@gmail.com> References: <20230709224737.338525-1-judge.packham@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 CN9130 SoC (an ARMADA 8K type) has both a NAND Flash Controller and a generic local bus controller (Device Bus Controller) that share common pins. With a board design that incorporates both a NAND flash and uses the Device Bus (in our case for an SRAM) accessing the Device Bus device fails unless the NfArbiterEn bit is set. Setting the bit enables arbitration between the Device Bus and the NAND flash. Since there is no obvious downside in enabling this for designs that don't require arbitration, we always enable it. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- drivers/mtd/nand/raw/pxa3xx_nand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c index 9dee580ab9c2..d502e967f92c 100644 --- a/drivers/mtd/nand/raw/pxa3xx_nand.c +++ b/drivers/mtd/nand/raw/pxa3xx_nand.c @@ -125,6 +125,7 @@ DECLARE_GLOBAL_DATA_PTR; /* System control register and bit to enable NAND on some SoCs */ #define GENCONF_SOC_DEVICE_MUX 0x208 #define GENCONF_SOC_DEVICE_MUX_NFC_EN BIT(0) +#define GENCONF_SOC_DEVICE_MUX_NFC_DEVBUS_ARB_EN BIT(27) /* * This should be large enough to read 'ONFI' and 'JEDEC'. @@ -1739,7 +1740,7 @@ static int alloc_nand_resource(struct udevice *dev, struct pxa3xx_nand_info *inf return PTR_ERR(sysctrl_base); regmap_read(sysctrl_base, GENCONF_SOC_DEVICE_MUX, ®); - reg |= GENCONF_SOC_DEVICE_MUX_NFC_EN; + reg |= GENCONF_SOC_DEVICE_MUX_NFC_EN | GENCONF_SOC_DEVICE_MUX_NFC_DEVBUS_ARB_EN; regmap_write(sysctrl_base, GENCONF_SOC_DEVICE_MUX, reg); }