Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp3245562imc; Wed, 13 Mar 2019 12:36:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYuHVhOzIOnSFN+23SfHIrvyh3ytbJrzUnJBaLcqyMHVGziWcLpBwgWGux+tL9zrqEYoOg X-Received: by 2002:a63:4c18:: with SMTP id z24mr42083806pga.62.1552505781361; Wed, 13 Mar 2019 12:36:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552505781; cv=none; d=google.com; s=arc-20160816; b=VWGqu0aSJ6zNU6AQdGi1UCTqo/vRTG2O2dbeoEbzD67SDeGPogXDaFFsG3HkVpYqNN QCE9MRsIxQGqwpRNap2IklarZu/T7AMHqvsAAC/nKYkTvaf+Ft2FuIYntrMCUqTtEoP0 1yWvnyv85Sre9fH9UPAPcDb2zDOgLJIcRnIANnIRgVDNQJcP6xGiSbeeEdtiIzoRhc4d WM8jtIoB6/F6JGKpPlGligY93Ouj8/ndEA/YgIYLdUBqMN6ZU57WxinZFo1Kx8yNtq2i /3DIDSKRe8tl+NM1QIV1H9HjGSOPPZMzJzZkKFjGwITGL+p3Dkyx/WKM4BblD+Nx0FHb SBzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Mdp9lg9wns8azVMgNKAkAWijWJkNLwKU2BUosNVcmAI=; b=UU7vqv1EwkVxBu3V8yZCWOqnGZRVoJ1lpXwBGsz1IYcWr+pjbvwvlqJ0HsP5LmqlCh eEv9Ob28qoZsXwGQn2zRvYue8gKS7EgiSmtFY6ClGTb3oduv/icPebKR+zsF/tVg6Kd0 tnJya2XokhBch0nVnqjTQwFYA8CA9IccKHI8lu0UVuLW0HfRAHvLgv9uUlckS7/gMLEO 4mQoWfs6FK02o9Wlx+iGNfGhnh8363+tijYkdEt5Gk/PwrSgj+gPHmk5ibx+tQ0Oaf0Q YlDYPdULMf3bkhtNXRu3CV+7bid7jR0YMT3eTSpN4+klAMuk2g2OZHpJ+VDwBzEQrx0u MUoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oZufe1AI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y32si10534459pga.518.2019.03.13.12.36.05; Wed, 13 Mar 2019 12:36:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oZufe1AI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726588AbfCMTKc (ORCPT + 99 others); Wed, 13 Mar 2019 15:10:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:41082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726847AbfCMTKa (ORCPT ); Wed, 13 Mar 2019 15:10:30 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 68C542147C; Wed, 13 Mar 2019 19:10:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504229; bh=hfXkIWQ8Scgwqcfuq9XYPFASLJ7GafPf9vlreKA0Rzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oZufe1AIsVqEbK8BqRu5ALo2MOlGHtNx9mFUZsgnyMI6RPVJmHuH4oj0Foay1wMtY 5hKahg1AHqkEtWrstzn4e3vBdb/QXYE+X39c6ehWzgf4BiT3hyBKEiL7B19XfuY2Sa NfVFBylqc0p6BSf8OQAEm93idyF3ceja8OWMSW2Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andre Przywara , Maxime Ripard , Sasha Levin Subject: [PATCH AUTOSEL 4.20 03/60] clk: sunxi: A31: Fix wrong AHB gate number Date: Wed, 13 Mar 2019 15:09:24 -0400 Message-Id: <20190313191021.158171-3-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191021.158171-1-sashal@kernel.org> References: <20190313191021.158171-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andre Przywara [ Upstream commit ee0b27a3a4da0b0ed2318aa092f8856896e9450b ] According to the manual the gate clock for MMC3 is at bit 11, and NAND1 is controlled by bit 12. Fix the gate bit definitions in the clock driver. Fixes: c6e6c96d8fa6 ("clk: sunxi-ng: Add A31/A31s clocks") Signed-off-by: Andre Przywara Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c index 3b97f60540ad..609970c0b666 100644 --- a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c +++ b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c @@ -264,9 +264,9 @@ static SUNXI_CCU_GATE(ahb1_mmc1_clk, "ahb1-mmc1", "ahb1", static SUNXI_CCU_GATE(ahb1_mmc2_clk, "ahb1-mmc2", "ahb1", 0x060, BIT(10), 0); static SUNXI_CCU_GATE(ahb1_mmc3_clk, "ahb1-mmc3", "ahb1", - 0x060, BIT(12), 0); + 0x060, BIT(11), 0); static SUNXI_CCU_GATE(ahb1_nand1_clk, "ahb1-nand1", "ahb1", - 0x060, BIT(13), 0); + 0x060, BIT(12), 0); static SUNXI_CCU_GATE(ahb1_nand0_clk, "ahb1-nand0", "ahb1", 0x060, BIT(13), 0); static SUNXI_CCU_GATE(ahb1_sdram_clk, "ahb1-sdram", "ahb1", -- 2.19.1