From patchwork Tue Apr 30 18:46:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13649877 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 99E4BC4345F for ; Tue, 30 Apr 2024 18:47:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=sp5Yy3zn57OdYp/hDgdEb2dWraoal+E1IJhH5exXEko=; b=UC8FxpLoEZM7R4 OxzVh13MLB2lk5Qk7yIbsTxHIeH54lgsnehgV2lRORxqMeN1S5sXXSN8h3DisLEfgjfSdq89a2kSm FKPvsuoQ+TIhjthnkNKYGZMKpc1r6mHAmp9fpN4vWDLc0xEeGhHVEbD3/x8jHsM4wvVnnET8JHdyM 2lnEcEU4KT/6ThGoUgGhj7CcWZ8lY8en6z5gs744MyJR3CxVwHMtMBGeutp2j++xR5KuEtr0stAjm mCPPzE5tQ4D8fITv5WiDl8wfGA1oQ8ornoMyCTs/FCPT/QnUZTjJFSChO7HYuvIxXbEvw8+LsNjbq qRJH3tAZOUIn/9CegNgA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1sVY-00000007dO8-3yph; Tue, 30 Apr 2024 18:47:16 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1sVN-00000007dLm-3iW0 for linux-arm-kernel@lists.infradead.org; Tue, 30 Apr 2024 18:47:16 +0000 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-51ae2e37a87so7448956e87.2 for ; Tue, 30 Apr 2024 11:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714502822; x=1715107622; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZGUPpr9ka2yo3ECRl+7yFv4d0kGzQn5S5/kDIVOZE0U=; b=Y8D6NWO3FUgZE522XI3T4/EToAC3jybDkzKcRPoV8P136TG1R8RjzWke+vuhawwxvB pulyN8pP3YVeglE4+vDIE8w/D+ycNpm4bwSq6BFQw6BrYN8AYfUnZUgKIcydEDgiNeK0 mWaHzWXFPowqx79ZTN5riFBJ9EQ9uV+CXXGS1YBjJ7TcC19eshyHl7tfRS/YurkoYZCK 49/OVRDNl0hInbPiAzMKgmDgrW5ySdrfL1UOxy6b+yoAFX+IS75E4RDrlEm26aQKGs50 luWgizDROvEwhCnOjNVwZBz91sZTfeFtLgjXnNv/TuCe7VqgoSH7h5DCmLVEaUZigf7B BbCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714502822; x=1715107622; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZGUPpr9ka2yo3ECRl+7yFv4d0kGzQn5S5/kDIVOZE0U=; b=IWTrFA//W1c1NepmvJkflK/rP7T7QLvxHmnjuhL+KphA9vkXEfBufdZzM4gr+YlUtw NtdbOV3x/wGIfqDvWpbmbtoJ504OFo9ttZWOqNsMZGcVuKLWCytgoZEa/ovGWI8e88BI Qw5Ay/ydYown+cissTSgUTzncf4VoCuF6F0Y+jEmA7Yqm1RrlPcfVfjh6zUCqL96E98Y UQKPW89SzlKZhIqaqCi8PI2wCgy/71Sv9AqG5wpZuAO9XCSmTZEMC+Qk1VaoXKCP7lv+ IZLYUBS8PvwsvUwRzvUb0CC3QEOpeE3E59fBIkvVPdnQPcS5e/vM7o3o9G0LrPaPgZmM u3BQ== X-Forwarded-Encrypted: i=1; AJvYcCU4VTogzf3CrCGPIfWhfZUDOdb9HZJUT/aHF0esvGYGVVjDQi0Bkb/i2vCNiZDRqKXWmqKMw0IIXtscIpeT+4DeKQYiifIHNtU17k1cr72KIOs3y1Y= X-Gm-Message-State: AOJu0YzuTh72h97qSrfAmnUoi4CO/YbCG3vU58bacrEYFVJQbN/kheEl +CW9r5Nx13Qkp4us5BmW+qIYW9bt58citpVXcLvvl9/+uxSXZBvQSsUBjaBTpO8= X-Google-Smtp-Source: AGHT+IG4e1N5kGq9RemNty3JjtAiFeV19cBEznK7pJz0Dw3AMf8mPmfPXykgRg20OdNXsoggOTEmfg== X-Received: by 2002:a05:6512:3b8f:b0:51c:22fb:182f with SMTP id g15-20020a0565123b8f00b0051c22fb182fmr266000lfv.13.1714502821885; Tue, 30 Apr 2024 11:47:01 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.16]) by smtp.gmail.com with ESMTPSA id wg7-20020a17090705c700b00a55b17418ebsm11331493ejb.89.2024.04.30.11.47.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 11:47:01 -0700 (PDT) From: Krzysztof Kozlowski To: Michael Turquette , Stephen Boyd , linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Sylwester Nawrocki , Chanwoo Choi , Alim Akhtar Subject: [GIT PULL fixes PATCH] clk: samsung: Revert "clk: Use device_get_match_data()" Date: Tue, 30 Apr 2024 20:46:56 +0200 Message-ID: <20240430184656.357805-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240430_114714_409904_FD4DE13F X-CRM114-Status: GOOD ( 17.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Marek Szyprowski device_get_match_data() function should not be used on the device other than the one matched to the given driver, because it always returns the match_data of the matched driver. In case of exynos-clkout driver, the original code matches the OF IDs on the PARENT device, so replacing it with of_device_get_match_data() broke the driver. This has been already pointed once in commit 2bc5febd05ab ("clk: samsung: Revert "clk: samsung: exynos-clkout: Use of_device_get_match_data()""). To avoid further confusion, add a comment about this special case, which requires direct of_match_device() call to pass custom IDs array. This partially reverts commit 409c39ec92a35e3708f5b5798c78eae78512cd71. Cc: Fixes: 409c39ec92a3 ("clk: Use device_get_match_data()") Signed-off-by: Marek Szyprowski Link: https://lore.kernel.org/r/20240425075628.838497-1-m.szyprowski@samsung.com Signed-off-by: Krzysztof Kozlowski --- Hi Stephen, Please take this patch into current fixes v6.9. Best regards, Krzysztof drivers/clk/samsung/clk-exynos-clkout.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/clk/samsung/clk-exynos-clkout.c b/drivers/clk/samsung/clk-exynos-clkout.c index 3484e6cc80ad..503c6f5b20d5 100644 --- a/drivers/clk/samsung/clk-exynos-clkout.c +++ b/drivers/clk/samsung/clk-exynos-clkout.c @@ -13,9 +13,9 @@ #include #include #include +#include #include #include -#include #define EXYNOS_CLKOUT_NR_CLKS 1 #define EXYNOS_CLKOUT_PARENTS 32 @@ -84,17 +84,24 @@ MODULE_DEVICE_TABLE(of, exynos_clkout_ids); static int exynos_clkout_match_parent_dev(struct device *dev, u32 *mux_mask) { const struct exynos_clkout_variant *variant; + const struct of_device_id *match; if (!dev->parent) { dev_err(dev, "not instantiated from MFD\n"); return -EINVAL; } - variant = device_get_match_data(dev->parent); - if (!variant) { + /* + * 'exynos_clkout_ids' arrays is not the ids array matched by + * the dev->parent driver, so of_device_get_match_data() or + * device_get_match_data() cannot be used here. + */ + match = of_match_device(exynos_clkout_ids, dev->parent); + if (!match) { dev_err(dev, "cannot match parent device\n"); return -EINVAL; } + variant = match->data; *mux_mask = variant->mux_mask;