Received: by 2002:a05:6358:111d:b0:dc:6189:e246 with SMTP id f29csp1785414rwi; Thu, 3 Nov 2022 09:03:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4gji8j5myP2fZGfoaKMSyZNHf4o+I2CBhpIx1/4KA4X6XKqZc/fTB7k3ays11iiOMQmPXX X-Received: by 2002:a17:906:5a46:b0:7ad:b822:d2c2 with SMTP id my6-20020a1709065a4600b007adb822d2c2mr27036774ejc.41.1667491410771; Thu, 03 Nov 2022 09:03:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667491410; cv=none; d=google.com; s=arc-20160816; b=TFfZL0QXpWN931QnBq0QWagDxsJY94gGh4G5iPg0OATBGekr93YaI8swSR7EAVt5bU Aj23juPAEQbwsBp5FJy4fsD1PnFtMfMBDhMjd4U5wJudKf2xvT0oVGOKa+9wsdlN6YR1 +enl4PD3khwAHzKBKvq7hTwS4GH0pTdFrma2PEnb2DYWM3ryU49u34tnVg4hJsCCU3zL 79tYSfZ6qsHxRntvZwTTjGTFGvzGN+JCwuPUOrrGxu6weThHcl0yMxg089dGZlb8ySSQ YMH3WoZxc7kRWgx2tfnNTF0Rpd2O7P/tlaHqkWw7INFfp+JD26DS1+jbLgswv8DBo5j/ j8cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Vn1IPqicyBwN39+EinV4L+irBsrMqGVCL9ZydqW+LW4=; b=iXZvIIyU5XXWSekm6aa06496bAVJUqLITsaOo2zkitQprSr/WdPd7qQh6BTtO+onbB cC7//8smO/Y7YpfnGVzvzlJTk1C9WkqJZV9JRLAmAoY4Mo7Rt4nB4cilZnLA+a4BxNpK 3a98oyYtWh1hUQdk2vm7UG7thdSuZUGyzaeNOAMZMHTumGdVle7RTktDLaFzQP5UKS1m oTX1cEjjw4bIL+FWZWfTv7Nm+kqh4vUw/rxPWNcHEtI8e2DTM62hG0BoD06ixxU7inKS dqnhyIiHK2Iee8R4dGMh3CUa3GeK6QZbR74wvg4A/8mk7lbV+k7ZUTLqO00OC3U3Evs7 co/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QP2rEhYv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rh16-20020a17090720f000b0078db6f488c2si1460806ejb.56.2022.11.03.09.03.02; Thu, 03 Nov 2022 09:03:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QP2rEhYv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S232068AbiKCPQB (ORCPT + 97 others); Thu, 3 Nov 2022 11:16:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232108AbiKCPPs (ORCPT ); Thu, 3 Nov 2022 11:15:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF8E9167E1; Thu, 3 Nov 2022 08:15:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 73AFBB828E6; Thu, 3 Nov 2022 15:15:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7DCCC4347C; Thu, 3 Nov 2022 15:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667488536; bh=/bY1lh73b7aVSyLEpKw9JT7ndFWWHSyeI4gFYIIxwuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QP2rEhYvh4J/qWL7geNkSA7UltUvI4MMBXqk5O1LyXlMq3uwchOIDMQHvAatwwl+h cLbJjzrB3PbxitK87qdW8/lphOPGeSnlru+cNrD+62L6MLvJM6nXq9bqW/m7JGIF0u MkoajXobydWzITOunlvcRSIlC7ni48J3WF4+fklZGsJqtIoDRXRIwG6lCwIR297uLa yB0TulE/2QdhIHAwEW+89rUIBeuFkVMQAFrcVTI/O5pwEk4sdc3ZMeF+dN8mgsMnPX tKv8H2Kv+BUP/5FOUN0ORfhzoHUeia/xLhnLaoIm30xjgwRgtQIyBZYysn6kpuVgso h0eFIlKyN8wYg== From: Dinh Nguyen To: jh80.chung@samsung.com Cc: dinguyen@kernel.org, ulf.hansson@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, mturquette@baylibre.com, sboyd@kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCHv8 4/6] mmc: dw_mmc-pltfm: socfpga: add method to configure clk-phase Date: Thu, 3 Nov 2022 10:15:23 -0500 Message-Id: <20221103151525.474833-4-dinguyen@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221103151525.474833-1-dinguyen@kernel.org> References: <20221103151525.474833-1-dinguyen@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The clock-phase settings for the SDMMC controller in the SoCFPGA platforms reside in a register in the System Manager. Add a method to access that register through the syscon interface. Signed-off-by: Dinh Nguyen --- v8: no changes v7: use dev_warn if clk-phase-sd-hs is specified, but "altr,sysmgr-syscon" is not found v6: not getting the clk-phase-sd-hs is not a hard failure v5: change error handling from of_property_read_variable_u32_array() support arm32 by reading the reg_shift v4: no change v3: add space before &socfpga_drv_data v2: simplify clk-phase calculations --- drivers/mmc/host/dw_mmc-pltfm.c | 41 ++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c index 9901208be797..13e55cff8237 100644 --- a/drivers/mmc/host/dw_mmc-pltfm.c +++ b/drivers/mmc/host/dw_mmc-pltfm.c @@ -17,10 +17,16 @@ #include #include #include +#include +#include #include "dw_mmc.h" #include "dw_mmc-pltfm.h" +#define SOCFPGA_DW_MMC_CLK_PHASE_STEP 45 +#define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel, reg_shift) \ + ((((smplsel) & 0x7) << reg_shift) | (((drvsel) & 0x7) << 0)) + int dw_mci_pltfm_register(struct platform_device *pdev, const struct dw_mci_drv_data *drv_data) { @@ -62,9 +68,42 @@ const struct dev_pm_ops dw_mci_pltfm_pmops = { }; EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops); +static int dw_mci_socfpga_priv_init(struct dw_mci *host) +{ + struct device_node *np = host->dev->of_node; + struct regmap *sys_mgr_base_addr; + u32 clk_phase[2] = {0}, reg_offset, reg_shift; + int i, rc, hs_timing; + + rc = of_property_read_variable_u32_array(np, "clk-phase-sd-hs", &clk_phase[0], 2, 0); + if (rc < 0) + return 0; + + sys_mgr_base_addr = altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon"); + if (IS_ERR(sys_mgr_base_addr)) { + dev_warn(host->dev, "clk-phase-sd-hs was specified, but failed to find altr,sys-mgr regmap!\n"); + return 0; + } + + of_property_read_u32_index(np, "altr,sysmgr-syscon", 1, ®_offset); + of_property_read_u32_index(np, "altr,sysmgr-syscon", 2, ®_shift); + + for (i = 0; i < ARRAY_SIZE(clk_phase); i++) + clk_phase[i] /= SOCFPGA_DW_MMC_CLK_PHASE_STEP; + + hs_timing = SYSMGR_SDMMC_CTRL_SET(clk_phase[0], clk_phase[1], reg_shift); + regmap_write(sys_mgr_base_addr, reg_offset, hs_timing); + + return 0; +} + +static const struct dw_mci_drv_data socfpga_drv_data = { + .init = dw_mci_socfpga_priv_init, +}; + static const struct of_device_id dw_mci_pltfm_match[] = { { .compatible = "snps,dw-mshc", }, - { .compatible = "altr,socfpga-dw-mshc", }, + { .compatible = "altr,socfpga-dw-mshc", .data = &socfpga_drv_data, }, { .compatible = "img,pistachio-dw-mshc", }, {}, }; -- 2.25.1