From patchwork Sun May 7 13:39:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 13233729 X-Patchwork-Delegate: geert@linux-m68k.org 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 EFFEEC7EE24 for ; Sun, 7 May 2023 13:39:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231261AbjEGNjX (ORCPT ); Sun, 7 May 2023 09:39:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231194AbjEGNjW (ORCPT ); Sun, 7 May 2023 09:39:22 -0400 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [IPv6:2001:67c:2050:0:465::201]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09B2C1635F; Sun, 7 May 2023 06:39:18 -0700 (PDT) Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4QDlrh43Zkz9shP; Sun, 7 May 2023 15:39:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1683466756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4fgQ2AA/ZP9Q31JC0thF0rs1ha1creCyXIytqfAePqI=; b=I6CRR4WJAV4eLopU79RVgaciorlZZBFTitS7Gq96uHlp6WtKeX5e1uIHhkVH+f4IBL+r9Y L5xfxGPCEMy/XezGJ7xj1vFLSm0mvLrJrmfuCg4ZUIWjKxflfgjGbmiCbAeeP6QHGtAgw+ STpYnEaTUkD0RyyXQvNsDuq43Q26gpry17oVSUP5rjgPLYIsFnNS35/oYitplaOeCZcOZr D86dR0g0HjAUzf0ouLRH4sVozyjZjVmUg4rdGEqDJd5MjjZNdqP7mYVRx1TDAt84FqiHAC /I84Gaig1maGZULrcGdDpzX51E6js4kjGM7LqI3HMI9goy9PFCxfPbIZa0Bepw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1683466754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4fgQ2AA/ZP9Q31JC0thF0rs1ha1creCyXIytqfAePqI=; b=OjKWptYTBwxm9l71hoPz77JGVVOFOOS2aLwGh0OR2mRPeIEenK0qmSxHi4DMB8OzlXgTfX FLU8C67jfS86eLLzGTaHNDrkyorJmYTROVU7ZZvIVRpnq+wdkQ9fAsdBaHbUrkA0xhMP/N ayS5ujffUUe58Vfq6il5O9rSS7bG1ue4Mv5El5pg3OPoTMInVVDYD3e4+kG6ai9uHvVvb8 iKPTy3XNT6aiGKEwIX6r0lomm/xRI25mR0CAEam2SBSHv8CK1HmfQnIMzTCmCP+nGlhD7r tjSgAaDC4sorSTr0CGQeVjHxnjB2z+6K2lArm6NkqzD+cfVLSwnHS6v9LpDI4Q== To: linux-clk@vger.kernel.org Cc: Marek Vasut , Alex Helms , Geert Uytterhoeven , Luca Ceresoli , Magnus Damm , Michael Turquette , Nathan Chancellor , Nick Desaulniers , Stephen Boyd , Tom Rix , linux-renesas-soc@vger.kernel.org Subject: [PATCH 1/3] clk: vc5: Fix .driver_data content in i2c_device_id Date: Sun, 7 May 2023 15:39:04 +0200 Message-Id: <20230507133906.15061-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 8ad0a7f78ccef191bd9 X-MBO-RS-META: emtkqf589wnhogos4d39cky6th4ssjrj X-Rspamd-Queue-Id: 4QDlrh43Zkz9shP Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org The .driver_data content in i2c_device_id table must match the .data content in of_device_id table, else device_get_match_data() would return bogus value on i2c_device_id match. Align the two tables. The i2c_device_id table is now converted from of_device_id using 's@.compatible = "idt,\([^"]\+"\), .data = \(.*\)@"\1, .driver_data = (kernel_ulong_t)\2@' Fixes: 9adddb01ce5f ("clk: vc5: Add structure to describe particular chip features") Signed-off-by: Marek Vasut Reviewed-by: Luca Ceresoli Reviewed-by: Geert Uytterhoeven --- Cc: Alex Helms Cc: Geert Uytterhoeven Cc: Luca Ceresoli Cc: Magnus Damm Cc: Michael Turquette Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Stephen Boyd Cc: Tom Rix Cc: linux-clk@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org --- drivers/clk/clk-versaclock5.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/clk/clk-versaclock5.c b/drivers/clk/clk-versaclock5.c index fa71a57875ce..5452471b7ba5 100644 --- a/drivers/clk/clk-versaclock5.c +++ b/drivers/clk/clk-versaclock5.c @@ -1271,14 +1271,14 @@ static const struct vc5_chip_info idt_5p49v6975_info = { }; static const struct i2c_device_id vc5_id[] = { - { "5p49v5923", .driver_data = IDT_VC5_5P49V5923 }, - { "5p49v5925", .driver_data = IDT_VC5_5P49V5925 }, - { "5p49v5933", .driver_data = IDT_VC5_5P49V5933 }, - { "5p49v5935", .driver_data = IDT_VC5_5P49V5935 }, - { "5p49v60", .driver_data = IDT_VC6_5P49V60 }, - { "5p49v6901", .driver_data = IDT_VC6_5P49V6901 }, - { "5p49v6965", .driver_data = IDT_VC6_5P49V6965 }, - { "5p49v6975", .driver_data = IDT_VC6_5P49V6975 }, + { "5p49v5923", .driver_data = (kernel_ulong_t)&idt_5p49v5923_info }, + { "5p49v5925", .driver_data = (kernel_ulong_t)&idt_5p49v5925_info }, + { "5p49v5933", .driver_data = (kernel_ulong_t)&idt_5p49v5933_info }, + { "5p49v5935", .driver_data = (kernel_ulong_t)&idt_5p49v5935_info }, + { "5p49v60", .driver_data = (kernel_ulong_t)&idt_5p49v60_info }, + { "5p49v6901", .driver_data = (kernel_ulong_t)&idt_5p49v6901_info }, + { "5p49v6965", .driver_data = (kernel_ulong_t)&idt_5p49v6965_info }, + { "5p49v6975", .driver_data = (kernel_ulong_t)&idt_5p49v6975_info }, { } }; MODULE_DEVICE_TABLE(i2c, vc5_id); From patchwork Sun May 7 13:39:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 13233727 X-Patchwork-Delegate: geert@linux-m68k.org 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 5D3A4C77B7D for ; Sun, 7 May 2023 13:39:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231222AbjEGNjX (ORCPT ); Sun, 7 May 2023 09:39:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229628AbjEGNjW (ORCPT ); Sun, 7 May 2023 09:39:22 -0400 X-Greylist: delayed 2261 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 07 May 2023 06:39:19 PDT Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A378F17FD1 for ; Sun, 7 May 2023 06:39:19 -0700 (PDT) Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4QDlrj6cVNz9sTR; Sun, 7 May 2023 15:39:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1683466757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CzQ/DzKHizl9gwBYpFJbGlskLtPe1Io2toM+AVjcCDQ=; b=vZcJKUc3Fxgkb0/Gyt9tYE6ZDANjkYnZZiIerSfcKcCH5kGgtrsrExWUfWj/Dn5cKoD5z2 XcjbnIkDVYG/2OzsQ1HHXDCJzT0c5jD4uGFLqsRDN+ZBz2bgnRzPc/oNQcQomyvxCwRQgw 3TkB4jBvfuFOchKzvNa+SMAyQCOYgWxucI58ebwnrBs62Ui8ao+7c6yM5qMBuntSmGe0V1 PnIvjUCwakvRXEzUGyzXimn52ECQKggj8jjHwgNuertMh1bWA49QaDRCOm3d5JpSy6WoRf l5m3T4E58g/jVUtA3DXQz7PlBOMm5G7iuPtCDngVdfvjKiJsSS/7QRYEJLb9yw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1683466756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CzQ/DzKHizl9gwBYpFJbGlskLtPe1Io2toM+AVjcCDQ=; b=sO0E4iVDqDT3QFTj3F39v3pNBs/Lnh89yL+T+QByR3KuZ6wcu2ZXfYc6fqrbRujuOxOS/s XWaoHBGBwRuh1UUpjQperP4F6yHQIqEap9ZN9Gz7ZzRBdEji2VTlIqov6wdH3fUAOqCho4 n3Xn+vHEJf/J7rZxSaEMKS0F1h9SkoP9u5l0KXX+V4QxwwACU39L70nzMmTpAprCZXNlOk ABBYnVFDnEmEqstQiKSht4cYf89vZl2uegw+rCYVSaLSIG9rIq5zU67N9wHJ3/0ewhtnuV G0sQxvgcMZedgSuZ4GMdxzxLQwqZfaljFxf2Wwjlycqwxq3DzHO/PjnV+wyFwg== To: linux-clk@vger.kernel.org Cc: Marek Vasut , Alex Helms , Geert Uytterhoeven , Luca Ceresoli , Magnus Damm , Michael Turquette , Nathan Chancellor , Nick Desaulniers , Stephen Boyd , Tom Rix , linux-renesas-soc@vger.kernel.org Subject: [PATCH 2/3] clk: vc7: Fix .driver_data content in i2c_device_id Date: Sun, 7 May 2023 15:39:05 +0200 Message-Id: <20230507133906.15061-2-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230507133906.15061-1-marek.vasut+renesas@mailbox.org> References: <20230507133906.15061-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: 91z3uhjdeddszjchgssnshj5srmjz7ca X-MBO-RS-ID: 9f29d7bc7f8f0877124 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org The .driver_data content in i2c_device_id table must match the .data content in of_device_id table, else device_get_match_data() would return bogus value on i2c_device_id match. Align the two tables. The i2c_device_id table is now converted from of_device_id using 's@.compatible = "renesas,\([^"]\+"\), .data = \(.*\)@"\1, .driver_data = (kernel_ulong_t)\2@' Fixes: 48c5e98fedd9 ("clk: Renesas versaclock7 ccf device driver") Signed-off-by: Marek Vasut Reviewed-by: Geert Uytterhoeven --- Cc: Alex Helms Cc: Geert Uytterhoeven Cc: Luca Ceresoli Cc: Magnus Damm Cc: Michael Turquette Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Stephen Boyd Cc: Tom Rix Cc: linux-clk@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org --- drivers/clk/clk-versaclock7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/clk-versaclock7.c b/drivers/clk/clk-versaclock7.c index 8e4f86e852aa..0ae191f50b4b 100644 --- a/drivers/clk/clk-versaclock7.c +++ b/drivers/clk/clk-versaclock7.c @@ -1282,7 +1282,7 @@ static const struct regmap_config vc7_regmap_config = { }; static const struct i2c_device_id vc7_i2c_id[] = { - { "rc21008a", VC7_RC21008A }, + { "rc21008a", .driver_data = (kernel_ulong_t)&vc7_rc21008a_info }, {} }; MODULE_DEVICE_TABLE(i2c, vc7_i2c_id); From patchwork Sun May 7 13:39:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 13233728 X-Patchwork-Delegate: geert@linux-m68k.org 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 448CAC7EE2A for ; Sun, 7 May 2023 13:39:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231194AbjEGNjZ (ORCPT ); Sun, 7 May 2023 09:39:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229628AbjEGNjY (ORCPT ); Sun, 7 May 2023 09:39:24 -0400 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1DFE17FCE; Sun, 7 May 2023 06:39:20 -0700 (PDT) Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4QDlrl1Slqz9sV0; Sun, 7 May 2023 15:39:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1683466759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DqhpfqQ1jPAneqcud8kUo2XC74P29aEtLCZQKHDRNeY=; b=MHFPzrwCv4htjxDsbFkgCMPVklGfiXPykG/mhRt16+4Jp1iwqo2ThkTBB69y6Fe6uMTKpt apqMsWJzwQtjROs81Il8yWNAgF2DGls2lrEF1G1lnLo/b3oAUIOuIqDoe7y1DEd7ffYglN N4Xg5ogVl0PlCZxuKrPiZfN/oZ/ziqO4SVbXS4F9bk8lOdSQ19H61uWpiXZjfbBYYDE3S0 VS70bEHNH6H8NP6qRpfqrjI+qUIYOQHCVBOzctL0wsmIPgVuvJfAMlWNBDSrYcN0YoJOep ZNynos/5EeE32b21epXrbIe3Yi79PcGjbE1ZtEdhcENt133jmEdU/VSYGajEaA== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1683466757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DqhpfqQ1jPAneqcud8kUo2XC74P29aEtLCZQKHDRNeY=; b=no5YzfpncfpIEfBDMFY2lSCjZklRQuBz3loN7LANaxzg1WH8tWdiOru1n95QeQl503cW6j 7N7IZ8HIaCnkTYVU0/n9YTGHtkg+cT/cFZJ/9hg3iFJOpz/ZLL4okRIwNsMcSvsyddJfKb 6PnWrCYFCGUfJojslHGtHmCQDHPgFfIrZ/NZpS67sFLRpY7WovCR4WJ8Nkel1kBRDwCe+2 9J7DY70TK25UJV9xQbAPKzhgwM6djFKx2hqevcF438TPm9xdSqEEwlxZ9MGnYngggg5/sP 0z8yXKcCZefG/cNbuDFugw/4V38+HhhliENKhY3dlKSUXz8wr+YHTECZ9OBFPw== To: linux-clk@vger.kernel.org Cc: Marek Vasut , Alex Helms , Geert Uytterhoeven , Luca Ceresoli , Magnus Damm , Michael Turquette , Nathan Chancellor , Nick Desaulniers , Stephen Boyd , Tom Rix , linux-renesas-soc@vger.kernel.org Subject: [PATCH 3/3] clk: rs9: Fix .driver_data content in i2c_device_id Date: Sun, 7 May 2023 15:39:06 +0200 Message-Id: <20230507133906.15061-3-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230507133906.15061-1-marek.vasut+renesas@mailbox.org> References: <20230507133906.15061-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 9fe0008d3a116348b51 X-MBO-RS-META: kk57igdeijcz6kqg5jgk996apu4ncy5o X-Rspamd-Queue-Id: 4QDlrl1Slqz9sV0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org The .driver_data content in i2c_device_id table must match the .data content in of_device_id table, else device_get_match_data() would return bogus value on i2c_device_id match. Align the two tables. The i2c_device_id table is now converted from of_device_id using 's@.compatible = "renesas,\([^"]\+"\), .data = \(.*\)@"\1, .driver_data = (kernel_ulong_t)\2@' Fixes: 892e0ddea1aa ("clk: rs9: Add Renesas 9-series PCIe clock generator driver") Signed-off-by: Marek Vasut Reviewed-by: Geert Uytterhoeven --- Cc: Alex Helms Cc: Geert Uytterhoeven Cc: Luca Ceresoli Cc: Magnus Damm Cc: Michael Turquette Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Stephen Boyd Cc: Tom Rix Cc: linux-clk@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org --- drivers/clk/clk-renesas-pcie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk-renesas-pcie.c b/drivers/clk/clk-renesas-pcie.c index 10d31c222a1c..6060cafe1aa2 100644 --- a/drivers/clk/clk-renesas-pcie.c +++ b/drivers/clk/clk-renesas-pcie.c @@ -392,8 +392,8 @@ static const struct rs9_chip_info renesas_9fgv0441_info = { }; static const struct i2c_device_id rs9_id[] = { - { "9fgv0241", .driver_data = RENESAS_9FGV0241 }, - { "9fgv0441", .driver_data = RENESAS_9FGV0441 }, + { "9fgv0241", .driver_data = (kernel_ulong_t)&renesas_9fgv0241_info }, + { "9fgv0441", .driver_data = (kernel_ulong_t)&renesas_9fgv0441_info }, { } }; MODULE_DEVICE_TABLE(i2c, rs9_id);