From patchwork Thu Nov 9 18:19:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 163538 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp625314vqs; Thu, 9 Nov 2023 10:29:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IF8HapCKR6+y2EQFzRV8507P3gmq5v72WehIPGOZxtczXg3i8Q3ZoH9z2msvdE7IMtaLkQn X-Received: by 2002:a9d:61d0:0:b0:6b8:807b:b50 with SMTP id h16-20020a9d61d0000000b006b8807b0b50mr5615399otk.22.1699554544464; Thu, 09 Nov 2023 10:29:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699554544; cv=none; d=google.com; s=arc-20160816; b=rLYICq67UzUjJup3wao7RBQIiRiDD6ewHmz8yNWc+ELu748DN06YmPanAvZeJPhPg4 l/6DMgArBqmBWyuIVnAEOGu4YUmUgWOv9zCmJlrJ/M7bwN8SXRiWfTMqrk8QuJmIekN/ D+tw1PqCXuUm/i+1r/1Ah/5M/NvHvIeyUXm4H+qb8bczIjcml30gfPCwMGIFC2V6Wl2c 8KqYPElWpVtXc3enYdSNJWVX6aKbd+f+sheasGGLtFGMyvFQPKj0OVR5/ve7COjjsfXs jSSgswjUn5vjQL9uXm99s9mGBzP4a6cQnB1ldD74uIldLuddQn0fcvkiFEawYfMjSFkS hixw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yHD7unkrISW1gYAHduLeqmzsQ/KrBYrbNAU9MX6ul4g=; fh=mq6/FMGJdqTI0UuZRoAMccy9L/KbJAT6TPJFW+BrH4Y=; b=jse5DgMUDfSWfh3A7ZR1jnbsnQIXCmN8lmG4QrRsE7B4lxbpeqeKx1oiyYNz92+F7M /vPEdcmT/P3FPq45fXIBpchZcFzn68KlcjvxMHxHrKqbRd1c6pjzh2pW4gN2+yH8uwl3 5nmeJkfyFQ6CgYqqu+s2C+nMNDAYDHkq3Iu94YKthSFhI7yBA7sZtVAjT63HuIRZPDos 25ZassQACQ/d2BNperl3SfAK2rFiSiY9h0QewtUsiSVYbt1VLCA6ry45/JCSZrDSZ2IR h5B5enirk2b+7d5mA53wzrZOPz4cAPYDBD9quR+RnZYbeH2FVOGtF+16qKTO9Jy8MUC+ daxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="PHPWAC/5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id k190-20020a636fc7000000b005ac61b76914si7826648pgc.93.2023.11.09.10.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 10:29:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="PHPWAC/5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 5A0C581C77A4; Thu, 9 Nov 2023 10:28:55 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345010AbjKIS2l (ORCPT + 31 others); Thu, 9 Nov 2023 13:28:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344978AbjKIS2j (ORCPT ); Thu, 9 Nov 2023 13:28:39 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF6F93C05; Thu, 9 Nov 2023 10:28:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699554516; x=1731090516; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nsu6XeaiAM+ewQpg64HUre5R+9unzyXbgg5xDRI4JQ0=; b=PHPWAC/5sCmwZPCR7rCnQwpoIp514Ww0k91EDALNpNg/0P+rJtpKhzaL ak32pBUMzE6RnHk9qOLXJSfQc3qyJO3LHJPx8ffFzBKCWq7fz0u0Ebl7q STouDRR1zf7Bx1V6CUFvPud4tPhyoirEo3a7wMUPLYpb1Pd2JnDL+NbPJ WYJj4VLPpErKdgSDtqH+0Ui+pe8VJpZxA2MElgYh5y1wiJNjX5h6Gfqrx +4yRhgaXnIP2Fuff3u9gU5uBi0NfUJZJd//KL5VKxx+d4LV4CB7x0A5jB rjHwTC8ItfmevzhAiBZi9m2JYkIQKbqMN8ZQ9bl02G/6qsvz0gDB320Lu Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="389853901" X-IronPort-AV: E=Sophos;i="6.03,290,1694761200"; d="scan'208";a="389853901" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2023 10:28:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="936938973" X-IronPort-AV: E=Sophos;i="6.03,290,1694761200"; d="scan'208";a="936938973" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 09 Nov 2023 10:28:33 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5CE3972F; Thu, 9 Nov 2023 20:28:32 +0200 (EET) From: Andy Shevchenko To: Jarkko Nikula , Herbert Xu , Mario Limonciello , Andy Shevchenko , Wolfram Sang , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Jan Dabros , Andi Shyti , Hans de Goede Subject: [PATCH v2 02/12] i2c: designware: Always provide device ID tables Date: Thu, 9 Nov 2023 20:19:12 +0200 Message-ID: <20231109182823.3531846-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1996.gbec44491f096 In-Reply-To: <20231109182823.3531846-1-andriy.shevchenko@linux.intel.com> References: <20231109182823.3531846-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 09 Nov 2023 10:28:55 -0800 (PST) X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782112105798846732 X-GMAIL-MSGID: 1782112105798846732 There is no need to have ugly ifdeffery and additional macros for the device ID tables. Always provide them. Since we touch the ACPI table, make it sorted by ID. Unify termination as well. Reviewed-by: Andi Shyti Reviewed-by: Mario Limonciello Acked-by: Jarkko Nikula Signed-off-by: Andy Shevchenko --- drivers/i2c/busses/i2c-designware-platdrv.c | 62 ++++++++++----------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index cb7796b57085..7d960d3161c0 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -40,28 +40,6 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev) return clk_get_rate(dev->clk) / KILO; } -#ifdef CONFIG_ACPI -static const struct acpi_device_id dw_i2c_acpi_match[] = { - { "INT33C2", 0 }, - { "INT33C3", 0 }, - { "INT3432", 0 }, - { "INT3433", 0 }, - { "80860F41", ACCESS_NO_IRQ_SUSPEND }, - { "808622C1", ACCESS_NO_IRQ_SUSPEND }, - { "AMD0010", ACCESS_INTR_MASK }, - { "AMDI0010", ACCESS_INTR_MASK }, - { "AMDI0019", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE }, - { "AMDI0510", 0 }, - { "APMC0D0F", 0 }, - { "HISI02A1", 0 }, - { "HISI02A2", 0 }, - { "HISI02A3", 0 }, - { "HYGO0010", ACCESS_INTR_MASK }, - { } -}; -MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match); -#endif - #ifdef CONFIG_OF #define BT1_I2C_CTL 0x100 #define BT1_I2C_CTL_ADDR_MASK GENMASK(7, 0) @@ -148,14 +126,6 @@ static int dw_i2c_of_configure(struct platform_device *pdev) return 0; } - -static const struct of_device_id dw_i2c_of_match[] = { - { .compatible = "snps,designware-i2c", }, - { .compatible = "mscc,ocelot-i2c", .data = (void *)MODEL_MSCC_OCELOT }, - { .compatible = "baikal,bt1-sys-i2c", .data = (void *)MODEL_BAIKAL_BT1 }, - {}, -}; -MODULE_DEVICE_TABLE(of, dw_i2c_of_match); #else static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) { @@ -479,6 +449,34 @@ static const struct dev_pm_ops dw_i2c_dev_pm_ops = { RUNTIME_PM_OPS(dw_i2c_plat_runtime_suspend, dw_i2c_plat_runtime_resume, NULL) }; +static const struct of_device_id dw_i2c_of_match[] = { + { .compatible = "snps,designware-i2c", }, + { .compatible = "mscc,ocelot-i2c", .data = (void *)MODEL_MSCC_OCELOT }, + { .compatible = "baikal,bt1-sys-i2c", .data = (void *)MODEL_BAIKAL_BT1 }, + {} +}; +MODULE_DEVICE_TABLE(of, dw_i2c_of_match); + +static const struct acpi_device_id dw_i2c_acpi_match[] = { + { "INT33C2", 0 }, + { "INT33C3", 0 }, + { "INT3432", 0 }, + { "INT3433", 0 }, + { "80860F41", ACCESS_NO_IRQ_SUSPEND }, + { "808622C1", ACCESS_NO_IRQ_SUSPEND }, + { "AMD0010", ACCESS_INTR_MASK }, + { "AMDI0010", ACCESS_INTR_MASK }, + { "AMDI0019", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE }, + { "AMDI0510", 0 }, + { "APMC0D0F", 0 }, + { "HISI02A1", 0 }, + { "HISI02A2", 0 }, + { "HISI02A3", 0 }, + { "HYGO0010", ACCESS_INTR_MASK }, + {} +}; +MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match); + static const struct platform_device_id dw_i2c_platform_ids[] = { { "i2c_designware" }, {} @@ -490,8 +488,8 @@ static struct platform_driver dw_i2c_driver = { .remove_new = dw_i2c_plat_remove, .driver = { .name = "i2c_designware", - .of_match_table = of_match_ptr(dw_i2c_of_match), - .acpi_match_table = ACPI_PTR(dw_i2c_acpi_match), + .of_match_table = dw_i2c_of_match, + .acpi_match_table = dw_i2c_acpi_match, .pm = pm_ptr(&dw_i2c_dev_pm_ops), }, .id_table = dw_i2c_platform_ids,