From patchwork Tue Nov 29 03:46:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tnhuynh@apm.com X-Patchwork-Id: 9450883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0BB1760710 for ; Tue, 29 Nov 2016 03:46:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF0E727DA4 for ; Tue, 29 Nov 2016 03:46:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2F1D27F93; Tue, 29 Nov 2016 03:46:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FEC627DA4 for ; Tue, 29 Nov 2016 03:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753352AbcK2Dqo (ORCPT ); Mon, 28 Nov 2016 22:46:44 -0500 Received: from mail-pg0-f51.google.com ([74.125.83.51]:36737 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753231AbcK2Dqn (ORCPT ); Mon, 28 Nov 2016 22:46:43 -0500 Received: by mail-pg0-f51.google.com with SMTP id f188so64038446pgc.3 for ; Mon, 28 Nov 2016 19:46:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id; bh=0q2ryV3og3WYuh3VDSHttQr8Ajti9KnbzhWIEF5vuj4=; b=GVYMrosGbncc549H9IADzKHY7lq9hlVy8i92m+WZd03NcXV3kwn7sLV09EhqJI3nVR IaOlTqzpw0SlzIcl6eLdGWX2nLNaEwuAev5y0lvOTdxANipjXxifc35uKWXlUJDDJi/p GuJPIP+ayhWXmtBP49umVhiX/fBrqN5qwg9E8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0q2ryV3og3WYuh3VDSHttQr8Ajti9KnbzhWIEF5vuj4=; b=F8QIsauIFCJIbeXBgAZROUlO6ZcuXDUtsBaUihzCgU2MuTIa31SF1Rek5fnUrX23jF mgFh9PEX4T6W4H4X+ZismaderQmbmlRZ39fQlswwgloWix80RAtmEUgLoIyuqH2QhLGL Zl1vDM7t9QHgrjtzIMupjD9dn9nE+fNo2NwrlzqvbCOjE+xqR25XvGbbRYKu6FsvFuUb 41vDExrVDSEjmY4kQvhqX9eOLGcemJj59dJdP9Nj8WGXdWtyG5zFuc9wSUhSmgi+haJu 593uJWmAY5NeUQ12I2qlsGBw7nbbfV6PcCkJbzIFEM1us7DbdkT2SrxUuqNAXbEPQwS5 hlcA== X-Gm-Message-State: AKaTC032jtjdYRwaBkpHv/IECDfhYMB9TsMVPR1xVLKvnGmlcq+t5PVBXP79vajjLoWQrpKG X-Received: by 10.98.152.212 with SMTP id d81mr25962852pfk.12.1480391202146; Mon, 28 Nov 2016 19:46:42 -0800 (PST) Received: from localhost.localdomain ([118.69.219.197]) by smtp.gmail.com with ESMTPSA id k67sm90446927pfk.69.2016.11.28.19.46.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 19:46:40 -0800 (PST) From: tnhuynh@apm.com To: Wolfram Sang , Peter Rosin Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Loc Ho , Thang Nguyen , Phong Vo , patches@apm.com, Tin Huynh Subject: [PATCH V3] i2c: mux: pca954x: Add ACPI support for pca954x Date: Tue, 29 Nov 2016 10:46:29 +0700 Message-Id: <1480391189-1775-1-git-send-email-tnhuynh@apm.com> X-Mailer: git-send-email 1.7.1 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tin Huynh This patch enables ACPI support for mux-pca954x driver. Signed-off-by: Tin Huynh --- drivers/i2c/muxes/i2c-mux-pca954x.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) Change from V2: -Remove CONFIG_ACPI. Change from V1: -Don't shadow id variable. -Include sorted header. -Redefine acpi_device_id. -Add CONFIG_ACPI. diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 1091346..f80191e 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -35,6 +35,7 @@ * warranty of any kind, whether express or implied. */ +#include #include #include #include @@ -120,6 +121,19 @@ struct pca954x { }; MODULE_DEVICE_TABLE(i2c, pca954x_id); +static const struct acpi_device_id pca954x_acpi_ids[] = { + { .id = "PCA9540", .driver_data = pca_9540 }, + { .id = "PCA9542", .driver_data = pca_9540 }, + { .id = "PCA9543", .driver_data = pca_9543 }, + { .id = "PCA9544", .driver_data = pca_9544 }, + { .id = "PCA9545", .driver_data = pca_9545 }, + { .id = "PCA9546", .driver_data = pca_9545 }, + { .id = "PCA9547", .driver_data = pca_9547 }, + { .id = "PCA9548", .driver_data = pca_9548 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, pca954x_acpi_ids); + #ifdef CONFIG_OF static const struct of_device_id pca954x_of_match[] = { { .compatible = "nxp,pca9540", .data = &chips[pca_9540] }, @@ -245,8 +259,16 @@ static int pca954x_probe(struct i2c_client *client, match = of_match_device(of_match_ptr(pca954x_of_match), &client->dev); if (match) data->chip = of_device_get_match_data(&client->dev); - else + else if (id) data->chip = &chips[id->driver_data]; + else { + const struct acpi_device_id *acpi_id; + + acpi_id = acpi_match_device(pca954x_acpi_ids, &client->dev); + if (!acpi_id) + return -ENODEV; + data->chip = &chips[acpi_id->driver_data]; + } data->last_chan = 0; /* force the first selection */ @@ -321,6 +343,7 @@ static int pca954x_resume(struct device *dev) .name = "pca954x", .pm = &pca954x_pm, .of_match_table = of_match_ptr(pca954x_of_match), + .acpi_match_table = ACPI_PTR(pca954x_acpi_ids), }, .probe = pca954x_probe, .remove = pca954x_remove,