From patchwork Fri Nov 18 15:01:09 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: 696625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tL1Rc4mbhz9s5g for ; Sat, 19 Nov 2016 02:01:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=apm.com header.i=@apm.com header.b="icXxKN6b"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752483AbcKRPBg (ORCPT ); Fri, 18 Nov 2016 10:01:36 -0500 Received: from mail-pg0-f53.google.com ([74.125.83.53]:33296 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752323AbcKRPBb (ORCPT ); Fri, 18 Nov 2016 10:01:31 -0500 Received: by mail-pg0-f53.google.com with SMTP id 3so103966706pgd.0 for ; Fri, 18 Nov 2016 07:01:31 -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=uSmniKRR5PvFZaeNb4ICG+rF2z/iXHuHRH9Gzl60vQM=; b=icXxKN6bz/5dN20sMHgq91AJrOeLUSHSMuDpqzwW4gWj8Tnng2QYNDkZVRjx7aubpk 9oHhSv1URMBzo4h//mQgL18x1Q7m0j8abIjGIIX1nluXJNnZLYtTYggIe5fvQsfQSHSO SMBy4YY97ZetOo/oHEyte6PYStQcmVxMxwrns= 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=uSmniKRR5PvFZaeNb4ICG+rF2z/iXHuHRH9Gzl60vQM=; b=kshz3JsdDqHD9TqyakULH4KRLH24kiHZw/AHd1sIfliON5zhI92jTzuHaeMhrbxGNv b3EWJG7Kb05zeBa4Ag1Kbn/lfLC6VXSvxX+12229s0mt0OV62R6tfST/g+USu/QbrxKU OkgV+U+muoD8yfc1gqZhvBm0zOCqAf43KA7CdE0GUN8TvIt2RjkQ2eu3tjdM3h8tNZRd vJ+jKn01ynuS1535Dwgy5X6nVxrTvsVjIkMGOWdCGp2Q6jViaupgeMfq0EKuJqBAaZ+B 7M37rqr2KBDOSP4et0keVoFvSYhrHivZThMk26gSux2gD3VrUUSKA1yVqRftM5iNNF70 B4eg== X-Gm-Message-State: AKaTC02GQQGrc2WFotTBzvSLSQQqlLnOTKgNd1hg/JGZalr+kqG5lrC5FQBHAwU1y/78e0um X-Received: by 10.98.16.132 with SMTP id 4mr89260pfq.163.1479481290583; Fri, 18 Nov 2016 07:01:30 -0800 (PST) Received: from localhost.localdomain ([118.69.219.197]) by smtp.gmail.com with ESMTPSA id y29sm18753756pfd.63.2016.11.18.07.01.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Nov 2016 07:01:29 -0800 (PST) From: tnhuynh@apm.com To: Wolfram Sang , Peter Rosin , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Loc Ho , Thang Nguyen , Phong Vo , patches@apm.com, Tin Huynh Subject: [v1] i2c: mux: pca954x : Supports ACPI Date: Fri, 18 Nov 2016 22:01:09 +0700 Message-Id: <1479481269-16363-1-git-send-email-tnhuynh@apm.com> X-Mailer: git-send-email 1.7.1 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Tin Huynh This patch enable 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(-) diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 1091346..e7ef93b 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -42,6 +42,7 @@ #include #include #include +#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[] = { + { "PCA9540", pca_9540 }, + { "PCA9542", pca_9540 }, + { "PCA9543", pca_9543 }, + { "PCA9544", pca_9544 }, + { "PCA9545", pca_9545 }, + { "PCA9546", pca_9545 }, + { "PCA9547", pca_9547 }, + { "PCA9548", 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 *id; + + id = acpi_match_device(pca954x_acpi_ids, &client->dev); + if (!id) + return -ENODEV; + data->chip = &chips[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,