From patchwork Tue Nov 29 07:04:22 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: 700345 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 3tSZLC5jsrz9tlW for ; Tue, 29 Nov 2016 18:04:51 +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="KH5okfYm"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755712AbcK2HEu (ORCPT ); Tue, 29 Nov 2016 02:04:50 -0500 Received: from mail-pf0-f177.google.com ([209.85.192.177]:33108 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753188AbcK2HEt (ORCPT ); Tue, 29 Nov 2016 02:04:49 -0500 Received: by mail-pf0-f177.google.com with SMTP id d2so30259930pfd.0 for ; Mon, 28 Nov 2016 23:04:48 -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=JJg6xNvLaQ7MRaWgI13y4WnVXK8FljxeB9DeeBQfnxo=; b=KH5okfYmgN4Upwi0d4Qh5XieXmpoD4xFCpXqLV11egbXi2dPscmjguXuYcPLz2VYCP lOQYY1yGbburmeAcNdAoacFhc3i5JHzFo/Io25GzBpjNv3QkLoP/o0MxiYCH9ngKgpXu /Ix2uXsmQPFExV4S4gvJfaV4RrzZ+/1quvVvA= 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=JJg6xNvLaQ7MRaWgI13y4WnVXK8FljxeB9DeeBQfnxo=; b=edYr5eYCHvfSOMlf2FtHlpJ7T4rtvvVMw99LB8V2xI+1doAR/T/3SplhoLDf84NrzR rHXMohbisXCA+Z42AV52HYJdFnnLjiJK2O7ritq8yJAl4t+Tnh3zuak9XaJ/5xO6mBEW 6jH7EfyBl0U67hh6NDekOy7kZFolFZVSHm+epzCKibeeqNJX3waXucZoIL1pe/H5sHHv 6kttXA9xflYnXhfPBWKXmfNA72jvSr93aSiBAQ0iREgpQlkGwsXQq/3m7Johv8Nh3njT 7KXyzlBV/I3lcejsiph4WPTcUdga+TlMsGz58546YZzDrLvg4JRSvtxlc/vNiyifbk41 RJqA== X-Gm-Message-State: AKaTC00Ks+wGD9l1Sms6ERCyRjQFZ8bqbhoJiYZ0WCJ2R+i2uTNHqudU4ZwqVMdvdBglyqKD X-Received: by 10.84.162.204 with SMTP id o12mr59335007plg.17.1480403088492; Mon, 28 Nov 2016 23:04:48 -0800 (PST) Received: from localhost.localdomain ([118.69.219.197]) by smtp.gmail.com with ESMTPSA id b126sm92046663pfg.90.2016.11.28.23.04.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 23:04:47 -0800 (PST) From: Tin Huynh 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 V4] i2c: mux: pca954x: Add ACPI support for pca954x Date: Tue, 29 Nov 2016 14:04:22 +0700 Message-Id: <1480403062-4115-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 This patch enables ACPI support for mux-pca954x driver. Signed-off-by: Tin Huynh Change from v1 : -Don't shadow id variable. -Include sorted header. -Redefine acpi_device_id. -Add CONFIG_ACPI. --- drivers/i2c/muxes/i2c-mux-pca954x.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) Change from V3: -Readd CONFIG_ACPI. 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..bdf4315 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,21 @@ struct pca954x { }; MODULE_DEVICE_TABLE(i2c, pca954x_id); +#ifdef CONFIG_ACPI +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); +#endif + #ifdef CONFIG_OF static const struct of_device_id pca954x_of_match[] = { { .compatible = "nxp,pca9540", .data = &chips[pca_9540] }, @@ -245,8 +261,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 +345,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,