From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F753C49EA7 for ; Fri, 25 Jun 2021 13:06:27 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A17B96161E for ; Fri, 25 Jun 2021 13:06:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A17B96161E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 51FAB82C29; Fri, 25 Jun 2021 15:06:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=cerno.tech 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=cerno.tech header.i=@cerno.tech header.b="NefyNhP+"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="nowb5cOn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8834A82C0F; Fri, 25 Jun 2021 15:05:59 +0200 (CEST) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1DA5A82C09 for ; Fri, 25 Jun 2021 15:05:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=cerno.tech Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=maxime@cerno.tech Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 56B705C013B; Fri, 25 Jun 2021 09:05:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 25 Jun 2021 09:05:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=34L8RfdOBZqFn RJ3UXJJvjZ+CxpNP7y/2C+kzRcEUe0=; b=NefyNhP+vtXoC3mtKBc2aff8YSZ+u 4oi/FeA2yRKJrhTDCS6KDUVW+OKl6V/PZgz4movy97HKd3NRBwvH0gq8M2NC5lA0 XrsymHUUH66MZEK5i3C9i5+dWuZxUy7880xiVBOgQyK45tN8HX6U5OMjLPWxMErX LkYFbURBbFu8dkpO8V2TC9qXtmtLdZw/AsO9TtFAb4BeKtdygjZRuYioSvuQjzhZ vq9iFb4kfQkrUELE5KFuejOJUwGp/gSAZehsQFteReKCVg0m56a/nKseZMIZPVJi Wv/+BEEC7MAcBtWNAUFCuMiJo3ATkQYssOmrQcUtdBXlXVHTyCUymhOOA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=34L8RfdOBZqFnRJ3UXJJvjZ+CxpNP7y/2C+kzRcEUe0=; b=nowb5cOn fa04khsiXFAxqzIHD2pgz+MpXbIItOHom7xcNu1ePWJaiiWi9yJmeFdkHPwfQjYp 4xJSUVNNtnQQHRWv1DODswK1RzN1kFcUgNTeuF7416BOOyHmSyjamyUS0ixwWrNI EJXDpcUFzw62mMAqg0dG22gXeaPI5c/tRdh1VIRN+7LR0nD9BplrRl+7oSH2oMK9 xw8EQsiATuXRZhiohX1K8QK9nNC09ZfQDD9gJIqcudY91E2iuWMs4HQ88g6h2w1V GdlQ55/ql7knV70x5/0g4n1J3zYAjKPnaR23CgqKia+QKRtu6ucE/quwiiT6Em8W SL02gR38t5UdYA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfeegjedgheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmh grgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 25 Jun 2021 09:05:52 -0400 (EDT) From: Maxime Ripard To: u-boot@lists.denx.de, Andre Przywara Cc: Peng Fan , Li Jun , Marek Vasut , Tom Rini , Miquel Raynal , Jagan Teki , Maxime Ripard Subject: [PATCH 01/12] Revert "sunxi: spl: remove DMA related settings of the NAND controller" Date: Fri, 25 Jun 2021 15:05:36 +0200 Message-Id: <20210625130547.2177920-2-maxime@cerno.tech> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625130547.2177920-1-maxime@cerno.tech> References: <20210625130547.2177920-1-maxime@cerno.tech> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.103.2 at phobos.denx.de X-Virus-Status: Clean This reverts commit 136e32593335e031558a573158b6180fc80b551f. --- board/sunxi/board.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 21651a1bfca4..80c222114f9a 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -395,6 +395,11 @@ static void nand_clock_setup(void) #if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I || \ defined CONFIG_MACH_SUN9I || defined CONFIG_MACH_SUN50I setbits_le32(&ccm->ahb_reset0_cfg, (1 << AHB_GATE_OFFSET_NAND0)); +#endif +#ifdef CONFIG_MACH_SUN9I + setbits_le32(&ccm->ahb_gate1, (1 << AHB_GATE_OFFSET_DMA)); +#else + setbits_le32(&ccm->ahb_gate0, (1 << AHB_GATE_OFFSET_DMA)); #endif setbits_le32(&ccm->nand0_clk_cfg, CCM_NAND_CTRL_ENABLE | AHB_DIV_1); } -- 2.31.1