From patchwork Thu Feb 27 11:27:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 1245740 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=TGmeto0X; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Sr5R2Qhjz9sPK for ; Thu, 27 Feb 2020 22:28:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 440B881022; Thu, 27 Feb 2020 12:28:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.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=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="TGmeto0X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E91D78089D; Thu, 27 Feb 2020 12:27: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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (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 55DCC80857 for ; Thu, 27 Feb 2020 12:27:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbrunet@baylibre.com Received: by mail-wm1-x342.google.com with SMTP id f19so805836wmh.1 for ; Thu, 27 Feb 2020 03:27:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VVtHtYjfWsF6ejVxZarCObZM6caqrx/HBDZ9+UPAZhg=; b=TGmeto0XQQmfhGtslnEylfQcStqaAOeQxeqdTpeywtemx0Bl+ZUXak3MIOfhtQ4f5F pio+3NJA7Dd74ip5TsealZF4vz9MuFvgwZIiVF+K8h0FXvm24JfLNs3qIFJHsNrIis34 OyyFgjuVyDuo3VlOqEDQICMIhxPqAEDKhybo66cJ0ylSv/XnoI4EXaiBTOgeM4r49KUB HYGVAmN1DbmRNfBBsBlsmM6nXwkZrq5GPD2iCBgkmcwOm9yKa2r2I0sBQVJZXHdQ0y84 21IBBI4MXttZx3HKMBgKLrr+5LOTDOOyoVdhKwqrnIDd4y4lFp+Rj73qznk6aja/QtUd i4Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VVtHtYjfWsF6ejVxZarCObZM6caqrx/HBDZ9+UPAZhg=; b=rnXfvmG3HrrIyudXHTnBk/W6U/DiJx+3yfGD2SdRIo8nbTo0Q7bCClhuXRfn8AxL6m v6y5aj8pvIg3yKeGHVtnlIYn1bYVBIuHs2LYUV4hR70pu78hw/9QXkj2Qg6J/N8VPKXD 42aU65pD9NzDVmFj8sRVZTM9ORU/GoTYnFua68Vn9wfyKf3bDBSqytTlxxbNBQ4S6wkA x2YQn6/A+qQW8cRb4vhgMO/YcGgzhQ1DuJB+d40yJ7uHc8//mlBxq/DZnxWFFmLyYal5 LgIVtrJnUqaSIMdmGo2WF3PRjq29s2ByObFnoIQAUb9E4ImLlPtKkJ4n0jnrFOIv91NF CPMg== X-Gm-Message-State: APjAAAV+9U9fGJi6axXDHUMcCWGq4nIOND0Qa9ogiyZNfandRVdngkf3 vwfj6XVzqpRg8tuvBW7JbSMKWg== X-Google-Smtp-Source: APXvYqwbZfFB96DZ93+xM1n6IVbCPzHwtLje0lsXQymTMhziDubbKvJZPLElTtUeC0dbpTitdvtX6Q== X-Received: by 2002:a05:600c:24b:: with SMTP id 11mr4725868wmj.1.1582802864894; Thu, 27 Feb 2020 03:27:44 -0800 (PST) Received: from starbuck.baylibre.local (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id c26sm7161131wmb.8.2020.02.27.03.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 03:27:44 -0800 (PST) From: Jerome Brunet To: Neil Armstrong , u-boot@lists.denx.de, u-boot-amlogic@groups.io Cc: Jerome Brunet , Kevin Hilman , Anand Moon Subject: [PATCH v2 3/6] clk: meson: reset mmc clock on probe Date: Thu, 27 Feb 2020 12:27:35 +0100 Message-Id: <20200227112738.494579-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200227112738.494579-1-jbrunet@baylibre.com> References: <20200227112738.494579-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean On some SoCs, depending on the boot device, the MMC clock block may be left in a weird state by the ROM code, in which no decent clock may be provided. Reset the related register to make sure a sane MMC clock is ready for the controller. Reviewed-by: Neil Armstrong Tested-by: Anand Moon Signed-off-by: Jerome Brunet --- drivers/clk/meson/axg.c | 7 +++++++ drivers/clk/meson/g12a.c | 7 +++++++ drivers/clk/meson/gxbb.c | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 32cbf752aed8..0ba6c303e122 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -290,6 +290,13 @@ static int meson_clk_probe(struct udevice *dev) if (IS_ERR(priv->map)) return PTR_ERR(priv->map); + /* + * Depending on the boot src, the state of the MMC clock might + * be different. Reset it to make sure we won't get stuck + */ + regmap_write(priv->map, HHI_NAND_CLK_CNTL, 0); + regmap_write(priv->map, HHI_SD_EMMC_CLK_CNTL, 0); + debug("meson-clk-axg: probed\n"); return 0; diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index 1b2523bbf1fe..03d885d986b8 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -976,6 +976,13 @@ static int meson_clk_probe(struct udevice *dev) if (IS_ERR(priv->map)) return PTR_ERR(priv->map); + /* + * Depending on the boot src, the state of the MMC clock might + * be different. Reset it to make sure we won't get stuck + */ + regmap_write(priv->map, HHI_NAND_CLK_CNTL, 0); + regmap_write(priv->map, HHI_SD_EMMC_CLK_CNTL, 0); + debug("meson-clk-g12a: probed\n"); return 0; diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index abb5337e7829..aedba991603f 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -886,6 +886,13 @@ static int meson_clk_probe(struct udevice *dev) if (IS_ERR(priv->map)) return PTR_ERR(priv->map); + /* + * Depending on the boot src, the state of the MMC clock might + * be different. Reset it to make sure we won't get stuck + */ + regmap_write(priv->map, HHI_NAND_CLK_CNTL, 0); + regmap_write(priv->map, HHI_SD_EMMC_CLK_CNTL, 0); + debug("meson-clk: probed\n"); return 0;