From patchwork Mon Aug 28 16:54:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137068 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3482941vqm; Mon, 28 Aug 2023 10:40:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbSoo01zR+2Z7Lpw/WdmE8BXW04EWSC5VYF5sIjd+c4EaQprj8JarjsQjRBB3BPMVI3p8J X-Received: by 2002:a17:907:761a:b0:9a1:b84d:fa58 with SMTP id jx26-20020a170907761a00b009a1b84dfa58mr14484530ejc.1.1693244402969; Mon, 28 Aug 2023 10:40:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693244402; cv=none; d=google.com; s=arc-20160816; b=XWgnyIbf7bEoXzdWFTP1B3CqoAt8TEMnuQE5H/QQWqLMbMo9v3nnra4tqdDVKwoaDr CIinXujO0BABAPckdOLvq5+l8mQTz8jlZHd5UrG1x8b4x0mQgc7r29XJZ3D1E+/IqIkz jSR678MLcNJQHMHLpJN/07bpLFJQLGLHMuVH3zbCOyYeJmCAqlLc9UfX4kRqRQKn71Ou N2OmWzd0O6zxmN+zUzDCjXFQkqz64A5EtX0DFhMgA/QGoHac5d4tdWK3owwlBNgOFTIZ t/Jb2p5c4ZHYpzU4lG2/cnN2kWABV1XoJyJKVjvnU/yxnsA1YXckJSS75N0v4bVKEqgf UfJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=rDN91M3h6GnZfV3AfhsEqQVlqknxrc4fFdFCMmVDDAI=; fh=D7X4m3h48WzxV5TdmXPiwihBUdg5PgMI8yRqASSjm0U=; b=NpC+gKkLXBVR1RE31uwNvZI5uI73jTcbmhA/KW3L+hBKmMm7jOFUJmKFykxGPDUS8f HgnfzSdqdju7Gehma/LIZGpnrlEUsdE1gt2tg1cuiflJ7vguH0seTReHWMGsUeB1BxGu /wteVmaLAhFdvh+ewitOdLC6rmNZjJ1RiJztswb9EmTmJexqsUQw+YfFnpBr1ebK/BIw b+ZtIosJV5Jff/IWTPb8qDzjlPI2MCqqoKr2Dm/oVjjSMgu72jEQDdUzGBElOogzakVK g1lukCDsg96BqV6WP1Dlg+N1MebhZvOZDKdRRPwlKPXs8uOIzpuYE3RfTKo8DDQ0b4hr hblQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w25-20020a17090652d900b00978884c2f47si4615463ejn.867.2023.08.28.10.39.28; Mon, 28 Aug 2023 10:40:02 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232347AbjH1QzI (ORCPT + 99 others); Mon, 28 Aug 2023 12:55:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232747AbjH1Qyz (ORCPT ); Mon, 28 Aug 2023 12:54:55 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2E8A999 for ; Mon, 28 Aug 2023 09:54:52 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,208,1688396400"; d="scan'208";a="174232944" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 29 Aug 2023 01:54:51 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id DF1B44022338; Tue, 29 Aug 2023 01:54:49 +0900 (JST) From: Biju Das To: Liam Girdwood , Mark Brown Cc: Biju Das , linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2] regulator: sy8824x: Make similar OF and ID table Date: Mon, 28 Aug 2023 17:54:47 +0100 Message-Id: <20230828165447.106058-1-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=AC_FROM_MANY_DOTS,BAYES_00, SPF_HELO_NONE,SPF_PASS 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: INBOX X-GMAIL-THRID: 1775495442961117378 X-GMAIL-MSGID: 1775495442961117378 Make similar OF and ID table to extend support for ID match using i2c_match_data(). Currently it works only for OF match tables as the driver_data is wrong for ID match. While at it, drop trailing comma in the terminator entry from ID table. Signed-off-by: Biju Das --- Note: This patch is only compile tested. v1->v2: * Dropped trailing comma in the terminator entries for ID table. --- drivers/regulator/sy8824x.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/drivers/regulator/sy8824x.c b/drivers/regulator/sy8824x.c index d49c0cba09fb..c05b67e26ac8 100644 --- a/drivers/regulator/sy8824x.c +++ b/drivers/regulator/sy8824x.c @@ -142,7 +142,7 @@ static int sy8824_i2c_probe(struct i2c_client *client) } di->dev = dev; - di->cfg = of_device_get_match_data(dev); + di->cfg = i2c_get_match_data(client); regmap = devm_regmap_init_i2c(client, di->cfg->config); if (IS_ERR(regmap)) { @@ -204,29 +204,17 @@ static const struct sy8824_config sy20278_cfg = { }; static const struct of_device_id sy8824_dt_ids[] = { - { - .compatible = "silergy,sy8824c", - .data = &sy8824c_cfg - }, - { - .compatible = "silergy,sy8824e", - .data = &sy8824e_cfg - }, - { - .compatible = "silergy,sy20276", - .data = &sy20276_cfg - }, - { - .compatible = "silergy,sy20278", - .data = &sy20278_cfg - }, + { .compatible = "silergy,sy8824c", .data = &sy8824c_cfg }, + { .compatible = "silergy,sy8824e", .data = &sy8824e_cfg }, + { .compatible = "silergy,sy20276", .data = &sy20276_cfg }, + { .compatible = "silergy,sy20278", .data = &sy20278_cfg }, { } }; MODULE_DEVICE_TABLE(of, sy8824_dt_ids); static const struct i2c_device_id sy8824_id[] = { - { "sy8824", }, - { }, + { "sy8824", (kernel_ulong_t)&sy8824c_cfg }, + { } }; MODULE_DEVICE_TABLE(i2c, sy8824_id);