Received: by 2002:a05:6358:53a8:b0:117:f937:c515 with SMTP id z40csp4095384rwe; Mon, 17 Apr 2023 07:56:57 -0700 (PDT) X-Google-Smtp-Source: AKy350Yd7KPs2SxnismbFagL7vV45hNr2K4YiXQ61R8EJwcAk/xmbtZ0YjmHgpmPqcwAVLxxPRIx X-Received: by 2002:a05:6a20:a89d:b0:d8:d061:96ec with SMTP id ca29-20020a056a20a89d00b000d8d06196ecmr16114137pzb.27.1681743417323; Mon, 17 Apr 2023 07:56:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681743417; cv=none; d=google.com; s=arc-20160816; b=DPIQcseH3h0g72KYQSwkYUW7y41zJt+MRfRFgDTJhVSgOR0DC5ws7dTEU3k+AMHybb Wio+0knDdHl0bsqPxdKGCybHEsLLAoKX2Ku7L1d2g9G1QFQ6vS1wncmLBdn23BgYPBpV aZ3jjNm1bn27Xf3VPaNYtfj8F7pqjxvlSkn0DI9KQKTV2+64D1zlOELK08EHB9+xPC+9 yPQVkIlEAdrbjzFezVV2XSp8y1lsr32kngDlLqyiePHtUf+cuH39agqDyEbg7D/zXVSs oHE/mBeMjyNto3PIDsB6H8OYMJuQrwz2DUPtJwP+k4YHlhxxlXJNL4TbSES3J0/WqoRM Tvog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=X5Hf/UiW8fMQe86HypOJ09uF879JSlzBCXY8H8UW8D8=; b=eYGDbGnRI4vO8L8QavdcEnXnjFxbk/YCJTYlXWNFuYF2GHF64HbSTGOj3iti771xoN KTTD2mmYc0yqRnReMLV+hfzJeF7RKrclHJ1+mDZ+aui1o0Gg1IMSp4DWDJts5yqzsQfw 2Y9WrJENs4qKu95OTrp5ehW+6jB54vCbQYTLHEeJ7EBkmAomvXDy63/xMVapn9cM7kVr XgYzLRu/2Y4xqEYb7oxIPZP3h/cQppQejMoeG8knYCWOGN2hi/KcurpTkpz8zI96+0Fx 2dZkTv65HARdwoHlTyx8MwFd9QIk8dAQchKT5yPj9R8NCxzIJngTO6mr+L0crElk89+g YmuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cX4u6RU3; 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=linaro.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l186-20020a6388c3000000b0051b6c0d78a8si9767180pgd.616.2023.04.17.07.56.45; Mon, 17 Apr 2023 07:56:57 -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=@linaro.org header.s=google header.b=cX4u6RU3; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231153AbjDQOzR (ORCPT + 99 others); Mon, 17 Apr 2023 10:55:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230497AbjDQOzF (ORCPT ); Mon, 17 Apr 2023 10:55:05 -0400 Received: from mail-yb1-xb29.google.com (mail-yb1-xb29.google.com [IPv6:2607:f8b0:4864:20::b29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 671FE9EEB for ; Mon, 17 Apr 2023 07:54:52 -0700 (PDT) Received: by mail-yb1-xb29.google.com with SMTP id m14so8678300ybk.4 for ; Mon, 17 Apr 2023 07:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681743291; x=1684335291; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=X5Hf/UiW8fMQe86HypOJ09uF879JSlzBCXY8H8UW8D8=; b=cX4u6RU3ZsOLpMlDkCDthwGRDUBMdKasT50TlEFx6jucCWx5QoQ0e2sLa1W+79T98a RCPAfW88xqXV4rSzK5exeu2xCWeHVW5YB1+J/Efd9h7AX50Ubax6lNU78Tc8gwHODVZI mnX+tW6sOnWmDpf3BhDzTLy+y9huKSeMHLwyKZ77LElDRV8OYR5PWwX6nHVGesIOrR0n EmJocjBv8dgE7HxKEZ+orBOckdMyJArI9Xm2PS3u4AbQo2A1Jn4ekrIMXt2UnZyuQgIA 6CvW5DOewP+VpaM5aO1buxkW0g7TuZe+3Sy9569X367xErSQ4ep+dJ1Mn509/gj+GWLl jZwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681743291; x=1684335291; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=X5Hf/UiW8fMQe86HypOJ09uF879JSlzBCXY8H8UW8D8=; b=TTmIfswSwZT1DqswtUrGuuKw8Mkc/WJDJyGxyrWGFMmHBmDiZvTPZOpqiI7vRwLvU+ TPWe0q/8MJvW4rLLWlNdm4SHf4fDmaIgpUUAtrbDt+KMm4zgO4QontJefa+8klH+JzkV mmS8a5TiacZsRPwdQ3DH3Gn/FI7e1xPqSckPOoM9SeiTqHmRsHLDq6K5dvSeYv2KBDXL 7kYUlaAiP0TzJCvqS8GKMR0BuD8KMR4jGB4w9g76ThVlHZAJ/7kcn3PCOZMoblswR32Y EIlgygTlE57jCB45tjubE9VbcSjzkd5G3opxPHSGYYYcYutwT6s8L8FoZaztGNSN78rO MqaQ== X-Gm-Message-State: AAQBX9fML0AdcoEsjcxGErRPYEBeKNH9xkEE2mAhYS5dwcLA+J1B4YwT rBA39j6UoR7pyr2Tli96Q8HMCiwvHembXgwuefg8bQ== X-Received: by 2002:a25:74d4:0:b0:b8e:df36:fea1 with SMTP id p203-20020a2574d4000000b00b8edf36fea1mr7754829ybc.3.1681743291278; Mon, 17 Apr 2023 07:54:51 -0700 (PDT) MIME-Version: 1.0 References: <20230410184526.15990-1-blarson@amd.com> <20230410184526.15990-13-blarson@amd.com> In-Reply-To: <20230410184526.15990-13-blarson@amd.com> From: Ulf Hansson Date: Mon, 17 Apr 2023 16:54:15 +0200 Message-ID: Subject: Re: [PATCH v13 12/15] mmc: sdhci-cadence: Support device specific init during probe To: Brad Larson Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-spi@vger.kernel.org, adrian.hunter@intel.com, alcooperx@gmail.com, andy.shevchenko@gmail.com, arnd@arndb.de, brendan.higgins@linux.dev, briannorris@chromium.org, brijeshkumar.singh@amd.com, catalin.marinas@arm.com, davidgow@google.com, gsomlo@gmail.com, gerg@linux-m68k.org, krzk@kernel.org, krzysztof.kozlowski+dt@linaro.org, lee@kernel.org, lee.jones@linaro.org, broonie@kernel.org, yamada.masahiro@socionext.com, p.zabel@pengutronix.de, piotrs@cadence.com, p.yadav@ti.com, rdunlap@infradead.org, robh+dt@kernel.org, samuel@sholland.org, fancer.lancer@gmail.com, skhan@linuxfoundation.org, suravee.suthikulpanit@amd.com, thomas.lendacky@amd.com, tonyhuang.sunplus@gmail.com, vaishnav.a@ti.com, will@kernel.org, devicetree@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 On Mon, 10 Apr 2023 at 20:47, Brad Larson wrote: > > Move struct sdhci_pltfm_data under new struct sdhci_cdns_drv_data. > Add an init() into sdhci_cdns_drv_data for platform specific device > initialization in the device probe which is not used for existing devices. > > Signed-off-by: Brad Larson > Acked-by: Adrian Hunter Applied for next, thanks! Kind regards Uffe > --- > > v10 changes: > - New patch to provide for platform specific init() with no change > to existing designs. > > --- > drivers/mmc/host/sdhci-cadence.c | 32 +++++++++++++++++++++++--------- > 1 file changed, 23 insertions(+), 9 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c > index 708d4297f241..c528a25f48b8 100644 > --- a/drivers/mmc/host/sdhci-cadence.c > +++ b/drivers/mmc/host/sdhci-cadence.c > @@ -77,6 +77,11 @@ struct sdhci_cdns_phy_cfg { > u8 addr; > }; > > +struct sdhci_cdns_drv_data { > + int (*init)(struct platform_device *pdev); > + const struct sdhci_pltfm_data pltfm_data; > +}; > + > static const struct sdhci_cdns_phy_cfg sdhci_cdns_phy_cfgs[] = { > { "cdns,phy-input-delay-sd-highspeed", SDHCI_CDNS_PHY_DLY_SD_HS, }, > { "cdns,phy-input-delay-legacy", SDHCI_CDNS_PHY_DLY_SD_DEFAULT, }, > @@ -325,13 +330,17 @@ static const struct sdhci_ops sdhci_cdns_ops = { > .set_uhs_signaling = sdhci_cdns_set_uhs_signaling, > }; > > -static const struct sdhci_pltfm_data sdhci_cdns_uniphier_pltfm_data = { > - .ops = &sdhci_cdns_ops, > - .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, > +static const struct sdhci_cdns_drv_data sdhci_cdns_uniphier_drv_data = { > + .pltfm_data = { > + .ops = &sdhci_cdns_ops, > + .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, > + }, > }; > > -static const struct sdhci_pltfm_data sdhci_cdns_pltfm_data = { > - .ops = &sdhci_cdns_ops, > +static const struct sdhci_cdns_drv_data sdhci_cdns_drv_data = { > + .pltfm_data = { > + .ops = &sdhci_cdns_ops, > + }, > }; > > static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc, > @@ -357,7 +366,7 @@ static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc, > static int sdhci_cdns_probe(struct platform_device *pdev) > { > struct sdhci_host *host; > - const struct sdhci_pltfm_data *data; > + const struct sdhci_cdns_drv_data *data; > struct sdhci_pltfm_host *pltfm_host; > struct sdhci_cdns_priv *priv; > struct clk *clk; > @@ -376,10 +385,10 @@ static int sdhci_cdns_probe(struct platform_device *pdev) > > data = of_device_get_match_data(dev); > if (!data) > - data = &sdhci_cdns_pltfm_data; > + data = &sdhci_cdns_drv_data; > > nr_phy_params = sdhci_cdns_phy_param_count(dev->of_node); > - host = sdhci_pltfm_init(pdev, data, > + host = sdhci_pltfm_init(pdev, &data->pltfm_data, > struct_size(priv, phy_params, nr_phy_params)); > if (IS_ERR(host)) { > ret = PTR_ERR(host); > @@ -397,6 +406,11 @@ static int sdhci_cdns_probe(struct platform_device *pdev) > host->ioaddr += SDHCI_CDNS_SRS_BASE; > host->mmc_host_ops.hs400_enhanced_strobe = > sdhci_cdns_hs400_enhanced_strobe; > + if (data->init) { > + ret = data->init(pdev); > + if (ret) > + goto free; > + } > sdhci_enable_v4_mode(host); > __sdhci_read_caps(host, &version, NULL, NULL); > > @@ -461,7 +475,7 @@ static const struct dev_pm_ops sdhci_cdns_pm_ops = { > static const struct of_device_id sdhci_cdns_match[] = { > { > .compatible = "socionext,uniphier-sd4hc", > - .data = &sdhci_cdns_uniphier_pltfm_data, > + .data = &sdhci_cdns_uniphier_drv_data, > }, > { .compatible = "cdns,sd4hc" }, > { /* sentinel */ } > -- > 2.17.1 >