From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BF70C76191 for ; Thu, 18 Jul 2019 08:45:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFB7621841 for ; Thu, 18 Jul 2019 08:45:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726735AbfGRIpO (ORCPT ); Thu, 18 Jul 2019 04:45:14 -0400 Received: from cloudserver094114.home.pl ([79.96.170.134]:63558 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726482AbfGRIpO (ORCPT ); Thu, 18 Jul 2019 04:45:14 -0400 Received: from 79.184.255.39.ipv4.supernova.orange.pl (79.184.255.39) (HELO kreacher.localnet) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.267) id e977318142943186; Thu, 18 Jul 2019 10:45:11 +0200 From: "Rafael J. Wysocki" To: Chuanhua Han Cc: lenb@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, leoyang.li@nxp.com, Meenakshi Aggarwal , Udit Kumar Subject: Re: [PATCH] ACPI: support for NXP i2c controller Date: Thu, 18 Jul 2019 10:45:10 +0200 Message-ID: <4848044.j3iIk1DuVf@kreacher> In-Reply-To: <20190711102601.20582-1-chuanhua.han@nxp.com> References: <20190711102601.20582-1-chuanhua.han@nxp.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Thursday, July 11, 2019 12:26:01 PM CEST Chuanhua Han wrote: > Enable NXP i2c controller to boot with ACPI > > Signed-off-by: Meenakshi Aggarwal > Signed-off-by: Udit Kumar > Signed-off-by: Chuanhua Han In case you want this to go in through the i2c tree: Acked-by: Rafael J. Wysocki or in case you want me to take it, please let me know, but I will need an ACK from the i2c side then. > --- > drivers/acpi/acpi_apd.c | 6 ++++++ > drivers/i2c/busses/i2c-imx.c | 15 +++++++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c > index ff47317..cf8566c 100644 > --- a/drivers/acpi/acpi_apd.c > +++ b/drivers/acpi/acpi_apd.c > @@ -165,6 +165,11 @@ static const struct apd_device_desc thunderx2_i2c_desc = { > .fixed_clk_rate = 125000000, > }; > > +static const struct apd_device_desc nxp_i2c_desc = { > + .setup = acpi_apd_setup, > + .fixed_clk_rate = 350000000, > +}; > + > static const struct apd_device_desc hip08_spi_desc = { > .setup = acpi_apd_setup, > .fixed_clk_rate = 250000000, > @@ -238,6 +243,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { > { "HISI02A1", APD_ADDR(hip07_i2c_desc) }, > { "HISI02A2", APD_ADDR(hip08_i2c_desc) }, > { "HISI0173", APD_ADDR(hip08_spi_desc) }, > + { "NXP0001", APD_ADDR(nxp_i2c_desc) }, > #endif > { } > }; > diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c > index b1b8b93..99f9b96 100644 > --- a/drivers/i2c/busses/i2c-imx.c > +++ b/drivers/i2c/busses/i2c-imx.c > @@ -44,6 +44,7 @@ > #include > #include > #include > +#include > > /* This will be the driver name the kernel reports */ > #define DRIVER_NAME "imx-i2c" > @@ -255,6 +256,12 @@ static const struct of_device_id i2c_imx_dt_ids[] = { > }; > MODULE_DEVICE_TABLE(of, i2c_imx_dt_ids); > > +static const struct acpi_device_id i2c_imx_acpi_ids[] = { > + {"NXP0001", .driver_data = (kernel_ulong_t)&vf610_i2c_hwdata}, > + { } > +}; > +MODULE_DEVICE_TABLE(acpi, i2c_imx_acpi_ids); > + > static inline int is_imx1_i2c(struct imx_i2c_struct *i2c_imx) > { > return i2c_imx->hwdata->devtype == IMX1_I2C; > @@ -1052,6 +1059,9 @@ static int i2c_imx_probe(struct platform_device *pdev) > { > const struct of_device_id *of_id = of_match_device(i2c_imx_dt_ids, > &pdev->dev); > + const struct acpi_device_id *acpi_id = > + acpi_match_device(i2c_imx_acpi_ids, > + &pdev->dev); > struct imx_i2c_struct *i2c_imx; > struct resource *res; > struct imxi2c_platform_data *pdata = dev_get_platdata(&pdev->dev); > @@ -1079,6 +1089,9 @@ static int i2c_imx_probe(struct platform_device *pdev) > > if (of_id) > i2c_imx->hwdata = of_id->data; > + else if (acpi_id) > + i2c_imx->hwdata = (struct imx_i2c_hwdata *) > + acpi_id->driver_data; > else > i2c_imx->hwdata = (struct imx_i2c_hwdata *) > platform_get_device_id(pdev)->driver_data; > @@ -1091,6 +1104,7 @@ static int i2c_imx_probe(struct platform_device *pdev) > i2c_imx->adapter.nr = pdev->id; > i2c_imx->adapter.dev.of_node = pdev->dev.of_node; > i2c_imx->base = base; > + ACPI_COMPANION_SET(&i2c_imx->adapter.dev, ACPI_COMPANION(&pdev->dev)); > > /* Get I2C clock */ > i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); > @@ -1253,6 +1267,7 @@ static struct platform_driver i2c_imx_driver = { > .name = DRIVER_NAME, > .pm = &i2c_imx_pm_ops, > .of_match_table = i2c_imx_dt_ids, > + .acpi_match_table = ACPI_PTR(i2c_imx_acpi_ids), > }, > .id_table = imx_i2c_devtype, > }; >