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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51F8CC43217 for ; Mon, 21 Mar 2022 23:45:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233268AbiCUXqr (ORCPT ); Mon, 21 Mar 2022 19:46:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233244AbiCUXqp (ORCPT ); Mon, 21 Mar 2022 19:46:45 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D1669155D; Mon, 21 Mar 2022 16:45:19 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id r13so7718375wrr.9; Mon, 21 Mar 2022 16:45:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=KJy+bVD9Yq3kRrz9Gx7NWpfnxrb/beBV0JaHxbyWaTA=; b=lVO9HrJJ4uaEXgoPoWdmank4eHDo4BCCdWrs5Ekg1S/+9vexHt1mPqzANAhHY7/anH qav9bD2svlyvH/SA55ORQ8LcPEegLT98gtYxV1qq2jWWg5tNZ1tT1di6PmPQy5UvvJST G9x1ec6XcQMDFfpl3Li33IAYenzOg3nV5fHgkNlb7kEedL1Oqimt2KmuNmrvmiJTm0Cw D9r2XquJCegHA0/gEsyc6S2SobXe3a2vZZZAqEM/UP28iz8/1pZ2a9Gm4oIVmODcsXHW 3ps9qFBmNa9NWGu+ecaEw5cFq4ePnFzy9CTsyWEwLcj0d5/7Ed1CZEFT6LlihBeCFxfb U7IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KJy+bVD9Yq3kRrz9Gx7NWpfnxrb/beBV0JaHxbyWaTA=; b=yiI3cfMEPlZP1PhpD+FqX7RMAUHVrcG6m8d2ZPYE+YAsln4BxkbrC06Aa/F/dmdQP0 qIwtseRXKKLU/SaEo1TM2bkqHaLJK+OSEBTgy6oDt1FcS6mEUDy5+sl5GSHNWR+TI4ov ti6qiu/ZgTWJwaGQAETYHlOkq/4+S9rN7mboDx+omMWy8BETdE9efaY3UtLdYaauVjP+ SGh8VPW/3jxZDqsjgJ5TgW3Pg1vUUE7AWsuQpbJLXuQPK5ikKtVDr9U4BUTWLy77dOEw Drw3qxDFGQ9c28q2GDkZ4wF6v/iZ6A3RUbPyRuSBTUOaN7wimzDRx5mmbt7NJ5mBWtQZ xD8w== X-Gm-Message-State: AOAM5333m2sYnPLMpH+dTjf7169bBh1ECm09HgT91HWTuL7NsvJ+uac6 p9zAlSRqoNTn18+SWIwoDmeQTc7zlng= X-Google-Smtp-Source: ABdhPJxZjFiCpmRSrWXQL0OXJ6c9dpG8YOoFBJg7rzTZsJoHYd5zEDmnMioKyaz2o1aTdPwZbPZ/XA== X-Received: by 2002:a5d:59a5:0:b0:203:d46b:f27a with SMTP id p5-20020a5d59a5000000b00203d46bf27amr20587276wrr.126.1647906317561; Mon, 21 Mar 2022 16:45:17 -0700 (PDT) Received: from Ansuel-xps.localdomain (93-42-69-170.ip85.fastwebnet.it. [93.42.69.170]) by smtp.googlemail.com with ESMTPSA id n10-20020a5d588a000000b002052e4aaf89sm105497wrf.80.2022.03.21.16.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 16:45:17 -0700 (PDT) From: Ansuel Smith To: Rob Herring , Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Ansuel Smith , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH v6 05/18] clk: qcom: kpss-xcc: convert to parent data API Date: Tue, 22 Mar 2022 00:15:35 +0100 Message-Id: <20220321231548.14276-6-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220321231548.14276-1-ansuelsmth@gmail.com> References: <20220321231548.14276-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Convert the driver to parent data API. From the Documentation pll8_vote and pxo should be declared in the DTS so fw_name can be used instead of parent_names. Name is still used to save regression on old definition. Signed-off-by: Ansuel Smith --- drivers/clk/qcom/kpss-xcc.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/clk/qcom/kpss-xcc.c b/drivers/clk/qcom/kpss-xcc.c index 4fec1f9142b8..347f70e9f5fe 100644 --- a/drivers/clk/qcom/kpss-xcc.c +++ b/drivers/clk/qcom/kpss-xcc.c @@ -12,9 +12,9 @@ #include #include -static const char *aux_parents[] = { - "pll8_vote", - "pxo", +static const struct clk_parent_data aux_parents[] = { + { .name = "pll8_vote", .fw_name = "pll8_vote" }, + { .name = "pxo", .fw_name = "pxo" }, }; static unsigned int aux_parent_map[] = { @@ -32,8 +32,8 @@ MODULE_DEVICE_TABLE(of, kpss_xcc_match_table); static int kpss_xcc_driver_probe(struct platform_device *pdev) { const struct of_device_id *id; - struct clk *clk; void __iomem *base; + struct clk_hw *hw; const char *name; id = of_match_device(kpss_xcc_match_table, &pdev->dev); @@ -55,24 +55,15 @@ static int kpss_xcc_driver_probe(struct platform_device *pdev) base += 0x28; } - clk = clk_register_mux_table(&pdev->dev, name, aux_parents, - ARRAY_SIZE(aux_parents), 0, base, 0, 0x3, - 0, aux_parent_map, NULL); + hw = __devm_clk_hw_register_mux(&pdev->dev, NULL, name, ARRAY_SIZE(aux_parents), + NULL, NULL, aux_parents, 0, base, 0, 0x3, + 0, aux_parent_map, NULL); - platform_set_drvdata(pdev, clk); - - return PTR_ERR_OR_ZERO(clk); -} - -static int kpss_xcc_driver_remove(struct platform_device *pdev) -{ - clk_unregister_mux(platform_get_drvdata(pdev)); - return 0; + return PTR_ERR_OR_ZERO(hw); } static struct platform_driver kpss_xcc_driver = { .probe = kpss_xcc_driver_probe, - .remove = kpss_xcc_driver_remove, .driver = { .name = "kpss-xcc", .of_match_table = kpss_xcc_match_table, -- 2.34.1