From patchwork Wed Apr 12 14:53:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 82521 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp389413vqo; Wed, 12 Apr 2023 07:58:20 -0700 (PDT) X-Google-Smtp-Source: AKy350ZpACCn+mgYKx/IUUexpL7bW8lv0J3JfrmfXOj+Gi/8rSMjS9qGFKI3rLsPd0WMg0B/A07r X-Received: by 2002:a05:6402:489:b0:4fa:315a:cb55 with SMTP id k9-20020a056402048900b004fa315acb55mr14488000edv.21.1681311500243; Wed, 12 Apr 2023 07:58:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681311500; cv=none; d=google.com; s=arc-20160816; b=dxpemS+pzPda71AimueIrHVX25B2B6fwKuVPzrsDV0Rn6iI6nRvA7kJa9ZMyZtIInV XWnzdUoavyQ4RPfYYgau+kKWoZRoOIr/htNYkM0TS1KLwpg1nQ/t8c6G/BcFr5dkCFhU vU+BSF6kUWh/bqCaN97aT2VTRCrSHv2D24cZAw+kwd2AQ7BzRy0qbD5lqD1dACF57VW+ UWH3xm0YwbXWDCoSGvaFkXl9kLEjpuggppTS2i+j92Idz8ZYDIDSe2zz6fQLSLFfXNch ULjRWu/QgUtyCtW798DZoe/6x1m7MxH86u509ykTG6j6NwS4kRsCfFF25cQDoxL/SY4J rEfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=7UAk5E190wNgEBpxEtcgbtHjnL3P3IqX8QW8cfsP/YM=; b=q438fgtv9TEuWS5dNtCui9pCpPAuJovcohYiXovHpsmh8aOW9x1VhDaI4zz9oBkxXV YMCmdjKfj2vy5dwmCmfhLgBfgS4Cilc0KcdpfG3ZEU1DqngJkElb+G4ubfB+mEHJ5yCz erPL1IqtQ2xlzjr574CRqMpipvxkbA8+xTA9rp3Aqr3UTaNZZS5JXCnL8YgsuQ/dKkww JrzU59i0djUdpQU0vPXW2/kPVPaIpvqEGrVh2sYO1b8sevXMHhQ1fGbITXk6rTAB9qyH n3KyM9888OoDHIECj1GECMfYScCS0t1a60F6N6tD3K0UvqZ2AP8CsbUO+u1GDMuTwdSl 8dhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K0ZinGz0; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w23-20020a056402129700b00501c4e398fasi13310054edv.142.2023.04.12.07.57.55; Wed, 12 Apr 2023 07:58:20 -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=K0ZinGz0; 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 S230218AbjDLOxZ (ORCPT + 99 others); Wed, 12 Apr 2023 10:53:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229934AbjDLOxR (ORCPT ); Wed, 12 Apr 2023 10:53:17 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C75335599 for ; Wed, 12 Apr 2023 07:53:15 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id t20so15038581lfd.5 for ; Wed, 12 Apr 2023 07:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681311194; x=1683903194; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7UAk5E190wNgEBpxEtcgbtHjnL3P3IqX8QW8cfsP/YM=; b=K0ZinGz0TVWTKppVbCaFL0TrOFM6eJ9G0ii4oxQ2NwLz5SHqZCik0NxSgXadZnpMi2 3K3lq9EOgaWnxUdrl93GLhGVdlneb7KHQKl7l8sw9XTOZVrzSjYbZ0TkQR19H21bZn/k QmzKz7Omy9dIYkl69iAMg9Urw4/5fnAcKCLn7kxdUDDHChRh6F3hRb718tzFicULZXfj j4oQZ5NwJI5ROLHIyx2vZtTTC9+iKetvIvIwnN9TJz1/wdPsBWfNDhLT+uDTxxLrPswu vRugK0D1ZHBUt68LKT7swEnaplNSD/KvdG0sg8mGTkO8ujdYtcZyTJ3WfJZCdAiXI7wh te1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681311194; x=1683903194; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7UAk5E190wNgEBpxEtcgbtHjnL3P3IqX8QW8cfsP/YM=; b=YVxcSMuu/x65+V1Tyo92ggez3Wl5faXJ4FoY1IYu50dY7SuB+OwrmeAoV6YsDpgdMy Js+Zpq43ixZG2/+qpmaII9YSadQpq5OkB9T7sWbLgcIu0heWq0o6quUN1CV00CFxdRwK bEuYoUD0gJ8csb2FZZB/OLnR3jmveQwyMx4QcxID8IGsk8Yd33Jap1kW90jtjRmL7lG9 CVJEjjE490OXlAxlKX9Cd2bvfhBABxxhiJi4sc8fxz7pqaXtjZxjUrQpG2blkVTKFJcn 1J5ZlEctt6o9zclrqmDfeysV3290kAcznIduIWcvELeU4mh8DTeDSwcsqsSn7KnOQH/o SIpA== X-Gm-Message-State: AAQBX9fsPDE6CSAnaKRXkwilJSW1H4R46gf0kaxjlsgzBK1ZoVlj8MU5 UR5UZtnCm3iEFZsxOFF/MS7Zrg== X-Received: by 2002:ac2:5fc8:0:b0:4e8:3d24:de6f with SMTP id q8-20020ac25fc8000000b004e83d24de6fmr4925749lfg.14.1681311194072; Wed, 12 Apr 2023 07:53:14 -0700 (PDT) Received: from [192.168.1.101] (abxj23.neoplus.adsl.tpnet.pl. [83.9.3.23]) by smtp.gmail.com with ESMTPSA id w5-20020ac24425000000b004e95f1c9e7dsm3015367lfl.78.2023.04.12.07.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 07:53:13 -0700 (PDT) From: Konrad Dybcio Date: Wed, 12 Apr 2023 16:53:05 +0200 Subject: [PATCH 1/3] clk: qcom: dispcc-qcm2290: Fix BI_TCXO_AO handling MIME-Version: 1.0 Message-Id: <20230412-topic-qcm_dispcc-v1-1-bf2989a75ae4@linaro.org> References: <20230412-topic-qcm_dispcc-v1-0-bf2989a75ae4@linaro.org> In-Reply-To: <20230412-topic-qcm_dispcc-v1-0-bf2989a75ae4@linaro.org> To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Loic Poulain Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1681311191; l=1283; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=ZPPztK/ocj1ol1xQUHYQtAl+y1B8bJFYFayKaHP8l6g=; b=OyLOma9Xj210KuSJleD8Uh6LGCGzZ/Fnkz5r0uMAFN6a/Jv1rf4k524QCcHwwx2PbE76RmR+5qLv VVa4Ax1MA7QazGJWXAfLfpI70g3Ri6Umo0x1m/0NYa7LVQaFhl2b X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762982887390345769?= X-GMAIL-MSGID: =?utf-8?q?1762982887390345769?= BI_TCXO_AO was previously shoved in under the name of its non-AO sibling in parent_map_2. Resolve it. Fixes: cc517ea3333f ("clk: qcom: Add display clock controller driver for QCM2290") Signed-off-by: Konrad Dybcio --- drivers/clk/qcom/dispcc-qcm2290.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/qcom/dispcc-qcm2290.c b/drivers/clk/qcom/dispcc-qcm2290.c index cbb5f1ec6a54..0f516c72e624 100644 --- a/drivers/clk/qcom/dispcc-qcm2290.c +++ b/drivers/clk/qcom/dispcc-qcm2290.c @@ -24,6 +24,7 @@ enum { P_BI_TCXO, + P_BI_TCXO_AO, P_DISP_CC_PLL0_OUT_MAIN, P_DSI0_PHY_PLL_OUT_BYTECLK, P_DSI0_PHY_PLL_OUT_DSICLK, @@ -83,7 +84,7 @@ static const struct clk_parent_data disp_cc_parent_data_1[] = { }; static const struct parent_map disp_cc_parent_map_2[] = { - { P_BI_TCXO, 0 }, + { P_BI_TCXO_AO, 0 }, { P_GPLL0_OUT_MAIN, 4 }, }; @@ -154,7 +155,7 @@ static struct clk_regmap_div disp_cc_mdss_byte0_div_clk_src = { }; static const struct freq_tbl ftbl_disp_cc_mdss_ahb_clk_src[] = { - F(19200000, P_BI_TCXO, 1, 0, 0), + F(19200000, P_BI_TCXO_AO, 1, 0, 0), F(37500000, P_GPLL0_OUT_MAIN, 8, 0, 0), F(75000000, P_GPLL0_OUT_MAIN, 4, 0, 0), { } From patchwork Wed Apr 12 14:53:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 82522 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp402385vqo; Wed, 12 Apr 2023 08:12:56 -0700 (PDT) X-Google-Smtp-Source: AKy350abFflP55XuFPosL19rI3gn/v0oc9tCTeRcXAnNYHYNxt2Zo5hA7LwAkjTk/tgdty20SoMw X-Received: by 2002:a17:902:ea12:b0:19e:7889:f9fb with SMTP id s18-20020a170902ea1200b0019e7889f9fbmr25099095plg.68.1681312375823; Wed, 12 Apr 2023 08:12:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681312375; cv=none; d=google.com; s=arc-20160816; b=jBRhFFrWod330HrGV5rS7Mtr3hhABB3lNqnE3w4jcKQ2kJ3lk7inAT5g0MpFZE2CiS Rw69/Fo3zt+ZXGMzt4CxW4XMYuOprP3buDknMdA8tP4gVU/FL+QYAHiFQ9mh3PDahdIC rlCldX0zKgoarWwhTbpyfssNZ8FYerlz+LuuLXB+T/r0mwHceSl7nuKPk8kuBiDhnRMc IZQP0lJCwhA0CTDWG/mV1mY26odDaIoP52lbu/dL5Z58Ss4Sw8HrYZKbYyNKhBkurb3t gvghMSEc46V6/NAbPllkbTOKDVHjYAJA22iPEmSj4NDlto49ib33M3JDnSY2XVJ6wbeW HDPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=hzXitOAB7i9wPsi0RU5jPhBlfKzrQ5/zxTpphCz2cOw=; b=htQET7xQaR0Ey0j41kIRZ0Qybp6v5WKQDm0Eo1gIy61XQpENNWl1NEHwKL17QT6Bns dde2iNz4vdQJuGfG36peqGTMU54MYyHEqCOnlYD+Pmr6Cz8n9U1ETWkKkNMtiGiXupto AsFyW+6dFTvvV4LHpimOr4tqGiD34rLg/Zlp0zAW3iEuFbiUzrbaVfgNqkLXO3X16WBv jvDiUpWySZHrgYKRGIdXKP9ltvDE1/od0NNm51Frb5n6N4Akq85BjBLGyoI/rlMvVDwC iQE0KcUVut/2kBIuH+rFD0dblLOUTsUYbvvbJJCdo5Ns1giiaKcBWaK5enPdjoQrQHwH 29qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kHjLP0f6; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n3-20020a6546c3000000b004fc2f19bacasi16114820pgr.120.2023.04.12.08.12.43; Wed, 12 Apr 2023 08:12:55 -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=kHjLP0f6; 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 S229997AbjDLOxf (ORCPT + 99 others); Wed, 12 Apr 2023 10:53:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229626AbjDLOxT (ORCPT ); Wed, 12 Apr 2023 10:53:19 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2E6E6A68 for ; Wed, 12 Apr 2023 07:53:16 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id t20so15038663lfd.5 for ; Wed, 12 Apr 2023 07:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681311195; x=1683903195; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=hzXitOAB7i9wPsi0RU5jPhBlfKzrQ5/zxTpphCz2cOw=; b=kHjLP0f69MHCgc+2DS0cqFj1Oc6/l0E/zz1wpP/iosDA5+4Fb3UjGzu0FI7Be9vZ0u JW8/vnc3srHNBA1OZaFu92W53W9pDgKqk7kIE1cTzsuJoUdO/imTOsE3kMnfC+V10Scj RI1c8pgxNzyfxCwDNXkdmg829MY9ZAC9GbO1tdnvknofKm4yeDePKHnWV06Ymruyz9ER aUblXOsRWKGx85+e02BK4EBgAURy1B3ZiOSGQRg4MinKmcH7LWiaY6Svu+bccxFeYsc7 a/d/JWf9kALpdw3pauP8ISeNNwqWP/3VwpGupWMrYb63T1sTpuAmPIRhPVaBnAKk+lA6 opeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681311195; x=1683903195; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hzXitOAB7i9wPsi0RU5jPhBlfKzrQ5/zxTpphCz2cOw=; b=Q5QW8BgicTY22zRzfh5xQ7BoRH7pdBK8bdsngFYG6GJYdDTqmU9baIwLek6Ns6jrUv th6EJzdBl9G/g6qhvMsZfbgs+0otR4GFrMrEU6wASmeW/EdfxI5SaR7ucIHvSn2F0uBF ZG3zU2pDK+pQf8N77f5stdWVjLL643oY+kBkkSR1qw9GZqGBfXwjhF/rf4jezb3glkfn SsvDDUWuJKj8y/veUYG5pyX6UeoojMjccKZwteMWo/gF5pSHoKxgIXjrPVqUsatLa89N aZxvXl1MRe9/JAAcb+OXlMBdX8cuxwOJKEqVDfpSHAxg4vqf8GJnYvLA0r9GoJOaZyIH olYg== X-Gm-Message-State: AAQBX9fXm1uYUJQiP1nLHyBGbnzoP6v6JCK16R+FOOGQ10ulxoLyffk5 05HmTNRDpg9e8AvLyuPWyR7aJQ== X-Received: by 2002:ac2:5444:0:b0:4eb:274b:a69 with SMTP id d4-20020ac25444000000b004eb274b0a69mr1831189lfn.26.1681311195192; Wed, 12 Apr 2023 07:53:15 -0700 (PDT) Received: from [192.168.1.101] (abxj23.neoplus.adsl.tpnet.pl. [83.9.3.23]) by smtp.gmail.com with ESMTPSA id w5-20020ac24425000000b004e95f1c9e7dsm3015367lfl.78.2023.04.12.07.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 07:53:14 -0700 (PDT) From: Konrad Dybcio Date: Wed, 12 Apr 2023 16:53:06 +0200 Subject: [PATCH 2/3] clk: qcom: dispcc-qcm2290: Remove inexistent DSI1PHY clk MIME-Version: 1.0 Message-Id: <20230412-topic-qcm_dispcc-v1-2-bf2989a75ae4@linaro.org> References: <20230412-topic-qcm_dispcc-v1-0-bf2989a75ae4@linaro.org> In-Reply-To: <20230412-topic-qcm_dispcc-v1-0-bf2989a75ae4@linaro.org> To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Loic Poulain Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1681311191; l=1245; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=5FJ0glA+UfMPhOkTxeP63CncmUlAPOn1NSBFVZ9Bnf0=; b=/3Ufj2N/TAX1seIFCdp47zWL0iEhSQFuyc58fzJfbSw5uYaUX0Sp4fwvk2LHwtZ8o9SxOn6bDFJd 1RB781VIDPpSL8YMBFJbrqvR0PZrTZAapCdxgYwhEH/fZdsb/Uci X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762983805452778477?= X-GMAIL-MSGID: =?utf-8?q?1762983805452778477?= There's only one DSI PHY on this SoC. Remove the ghost entry for the clock produced by a secondary one. Fixes: cc517ea3333f ("clk: qcom: Add display clock controller driver for QCM2290") Signed-off-by: Konrad Dybcio --- drivers/clk/qcom/dispcc-qcm2290.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/clk/qcom/dispcc-qcm2290.c b/drivers/clk/qcom/dispcc-qcm2290.c index 0f516c72e624..ee62aca4e5bb 100644 --- a/drivers/clk/qcom/dispcc-qcm2290.c +++ b/drivers/clk/qcom/dispcc-qcm2290.c @@ -28,7 +28,6 @@ enum { P_DISP_CC_PLL0_OUT_MAIN, P_DSI0_PHY_PLL_OUT_BYTECLK, P_DSI0_PHY_PLL_OUT_DSICLK, - P_DSI1_PHY_PLL_OUT_DSICLK, P_GPLL0_OUT_MAIN, P_SLEEP_CLK, }; @@ -108,13 +107,11 @@ static const struct clk_parent_data disp_cc_parent_data_3[] = { static const struct parent_map disp_cc_parent_map_4[] = { { P_BI_TCXO, 0 }, { P_DSI0_PHY_PLL_OUT_DSICLK, 1 }, - { P_DSI1_PHY_PLL_OUT_DSICLK, 2 }, }; static const struct clk_parent_data disp_cc_parent_data_4[] = { { .fw_name = "bi_tcxo" }, { .fw_name = "dsi0_phy_pll_out_dsiclk" }, - { .fw_name = "dsi1_phy_pll_out_dsiclk" }, }; static const struct parent_map disp_cc_parent_map_5[] = { From patchwork Wed Apr 12 14:53:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 82524 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp404071vqo; Wed, 12 Apr 2023 08:15:04 -0700 (PDT) X-Google-Smtp-Source: AKy350ZgU7xJ2eO4L/Hjos9fpLd3DoGxRpwx3L6L54wFVKbnm14LQK1jxi568lcEY9S31ONFrtOn X-Received: by 2002:a62:3815:0:b0:63a:b1ab:79a5 with SMTP id f21-20020a623815000000b0063ab1ab79a5mr8526228pfa.18.1681312503710; Wed, 12 Apr 2023 08:15:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681312503; cv=none; d=google.com; s=arc-20160816; b=u8tsxmSbXUREnv0k/1nMicL7bAJi3jUutw7ph6MNh3lbZUM2n4aaCRWChRt2otRXSP +fyyM6clECPI5p7mZPTjeUbnkCC9TEdmaNUm8/rqmnpG1Wcj0FwiTghC3XAmrJsIw7sv uwXa29fXvLhWZAQqzGVr7x/mljCXRKvgYCs5qoYftfTo3Y25Qb8avocwMpxX/cq0MXLE 3hRn9uIP28IucKkhzzazYijVarlUiT5RURT/IHu13Vvmu8/HDM53PYtEd3jX7m2fL46B bpa8mn/mNs4ZybnICITUVjBg9hAe3Ajr8aKHixQBcbZPFMyHGhCrFCfxdMAqtXPsHFJW oWgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=QcBUTwrPn98Ub9uNAVdB99KXgqzNGzqHRdwuVwi4QY0=; b=pxmO3kabfXjuieFjitKttGlSnegtThqbCf47J0UegLtQCKidwnaj8YRqlw/dCeM8RO /y1AQfsgg2zy8v4VgU2DZz1+mbNw4p/GvRg36OSKoOC8kHzzdDTjSpgX43oTG8L2km6B u+7YiUU3FYQVVw5ZhSucpMfNipmvnR8P8/NSyCDP7rv9mNXqN6y14VGw5Ll7bINM1iAc xrB/mAbC8rvWYGIFKpSaeWw87gWhUZRB2tSUz5C1V3aAZNE81Apw1Hwe8W9J+AXdVumw CuwnBisUgfZ0+U845ofPNPRzxPq6pnMJi8WZWo610sQ6hkQONJb81jR89Cs82AkYnfFs 8mOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FTE84kV8; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r11-20020aa79ecb000000b00639cb36bb82si6890093pfq.362.2023.04.12.08.14.50; Wed, 12 Apr 2023 08:15:03 -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=FTE84kV8; 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 S230253AbjDLOxh (ORCPT + 99 others); Wed, 12 Apr 2023 10:53:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230081AbjDLOxU (ORCPT ); Wed, 12 Apr 2023 10:53:20 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01B3A6E88 for ; Wed, 12 Apr 2023 07:53:18 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id z8so16885842lfb.12 for ; Wed, 12 Apr 2023 07:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681311196; x=1683903196; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=QcBUTwrPn98Ub9uNAVdB99KXgqzNGzqHRdwuVwi4QY0=; b=FTE84kV8JcYu5Uc3XNq6UbkUo6STYOeJDee4Oi0FFI5g2B7rq+su2i53iiAZCi/zoY MA9UvPc0qtcz7w/pihTBVcZIW88OHfX89fkJyribV8Qc3k3NkO4Vizs2sQ4v8XLHnS+k zpwIjJtXmBl6T4/73l56oUYq+9eNpd72crloZ9lyi/yGMFrgItAt1NSSFpTg7wk4cXgp v5CMMJhj17eNhCX/UknNx2b4UrT/kfXkoaRoxKT+X4dd8YWF4QX5K27Olhc3PEM/s99M pVKxRZ+H/TceYszlcwcOn9M2mzH4CdRUz9DTxD+XYCn36cnBgwMg2diHxsiWFC47+bKN NGFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681311196; x=1683903196; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QcBUTwrPn98Ub9uNAVdB99KXgqzNGzqHRdwuVwi4QY0=; b=73OnbvCEL6nm9p61gSmQEcNDrQdgimenRXZpaar4gAM8/fO0uLA+rS3E1uFal6yJfL b8iakEzIEqrKeSCgiG6o7mFrTKwEDqhTSKBhkp4G31RPfRpVKgN10aXK15RU+sMt7N8r jD2W7bNaSkH5Arg3ZF9xDN7yF/k+/DV/CMbuiAr19edTugumpd1mCu3/gZxc1mO2Ga6+ cVlc99UPC6rwT9DXrIKtjGTbiZ7mMUM+vu5XEH7/e1j5D9Fah4WvMepSaygGPvplpIGD AcxnM1NaAXIOwXzROBklr8ZHZf6OIdz8T/1HfNwk3oy+LvXxvaBKvRggRYjloJkpaZD8 AN6w== X-Gm-Message-State: AAQBX9c1dBORKOPHY6oeF+warD1vhwk0FyVoLpapoWBHPiA+3sQUiKU4 zno+Aw+sUAadWoOJKcqoZn5r8fssxeaJXBjh85E= X-Received: by 2002:ac2:51a6:0:b0:4ea:f8f0:545f with SMTP id f6-20020ac251a6000000b004eaf8f0545fmr3831047lfk.52.1681311196306; Wed, 12 Apr 2023 07:53:16 -0700 (PDT) Received: from [192.168.1.101] (abxj23.neoplus.adsl.tpnet.pl. [83.9.3.23]) by smtp.gmail.com with ESMTPSA id w5-20020ac24425000000b004e95f1c9e7dsm3015367lfl.78.2023.04.12.07.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 07:53:16 -0700 (PDT) From: Konrad Dybcio Date: Wed, 12 Apr 2023 16:53:07 +0200 Subject: [PATCH 3/3] clk: qcom: dispcc-qcm2290: Fix GPLL0_OUT_DIV handling MIME-Version: 1.0 Message-Id: <20230412-topic-qcm_dispcc-v1-3-bf2989a75ae4@linaro.org> References: <20230412-topic-qcm_dispcc-v1-0-bf2989a75ae4@linaro.org> In-Reply-To: <20230412-topic-qcm_dispcc-v1-0-bf2989a75ae4@linaro.org> To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Loic Poulain Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1681311191; l=1435; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=0ujSVRUiOXtdaFduY1BUwp/tKHCvG84AuQ805mYqR5c=; b=44aZNte1QZmDbZwJffhUosLZ1SYc+AmEHM4NinljzKhiUgke/oDbeX8sOLmZe9criHLgNua6QdwX 8qWTpd6eB7m8nPI7tqzUdpkW24oZmgUlAkzIOqi40/UYZQ6lt7KM X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762983939881004437?= X-GMAIL-MSGID: =?utf-8?q?1762983939881004437?= GPLL0_OUT_DIV was previously shoved in under the name of its undivided sibling in parent_map_2. Resolve it. Fixes: cc517ea3333f ("clk: qcom: Add display clock controller driver for QCM2290") Signed-off-by: Konrad Dybcio --- drivers/clk/qcom/dispcc-qcm2290.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/clk/qcom/dispcc-qcm2290.c b/drivers/clk/qcom/dispcc-qcm2290.c index ee62aca4e5bb..44dd5cfcc150 100644 --- a/drivers/clk/qcom/dispcc-qcm2290.c +++ b/drivers/clk/qcom/dispcc-qcm2290.c @@ -28,6 +28,7 @@ enum { P_DISP_CC_PLL0_OUT_MAIN, P_DSI0_PHY_PLL_OUT_BYTECLK, P_DSI0_PHY_PLL_OUT_DSICLK, + P_GPLL0_OUT_DIV, P_GPLL0_OUT_MAIN, P_SLEEP_CLK, }; @@ -84,7 +85,7 @@ static const struct clk_parent_data disp_cc_parent_data_1[] = { static const struct parent_map disp_cc_parent_map_2[] = { { P_BI_TCXO_AO, 0 }, - { P_GPLL0_OUT_MAIN, 4 }, + { P_GPLL0_OUT_DIV, 4 }, }; static const struct clk_parent_data disp_cc_parent_data_2[] = { @@ -153,8 +154,8 @@ static struct clk_regmap_div disp_cc_mdss_byte0_div_clk_src = { static const struct freq_tbl ftbl_disp_cc_mdss_ahb_clk_src[] = { F(19200000, P_BI_TCXO_AO, 1, 0, 0), - F(37500000, P_GPLL0_OUT_MAIN, 8, 0, 0), - F(75000000, P_GPLL0_OUT_MAIN, 4, 0, 0), + F(37500000, P_GPLL0_OUT_DIV, 8, 0, 0), + F(75000000, P_GPLL0_OUT_DIV, 4, 0, 0), { } };