From patchwork Fri Oct 23 08:20:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Westerberg X-Patchwork-Id: 7470711 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0CF3DBEEA4 for ; Fri, 23 Oct 2015 08:21:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25F01205B8 for ; Fri, 23 Oct 2015 08:21:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33AE520595 for ; Fri, 23 Oct 2015 08:21:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752098AbbJWIVB (ORCPT ); Fri, 23 Oct 2015 04:21:01 -0400 Received: from mga01.intel.com ([192.55.52.88]:9080 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751768AbbJWIU5 (ORCPT ); Fri, 23 Oct 2015 04:20:57 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 23 Oct 2015 01:20:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,185,1444719600"; d="scan'208,223";a="833695531" Received: from lahna.fi.intel.com (HELO lahna) ([10.237.72.200]) by fmsmga002.fm.intel.com with SMTP; 23 Oct 2015 01:20:55 -0700 Received: by lahna (sSMTP sendmail emulation); Fri, 23 Oct 2015 11:20:54 +0300 Date: Fri, 23 Oct 2015 11:20:54 +0300 From: Mika Westerberg To: Ben Gardner Cc: linux-acpi@vger.kernel.org Subject: Re: ACPI: Can I use I2cSerialBus with a PCI I2C controller? Message-ID: <20151023082054.GP1526@lahna.fi.intel.com> References: <20151021085056.GV1526@lahna.fi.intel.com> <20151022080157.GI1526@lahna.fi.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Oct 22, 2015 at 12:17:58PM -0500, Ben Gardner wrote: > > The next issue is that the I2C-core isn't matching the device to the > > "at24" driver, which has the alias "24c02". > > Here is what I found. > i2c-core is creating the device with the ACPI name "24C02:00". > The at24 driver uses "24c02" as the alias. > i2c-code is matching devices to drivers using strcmp(). > > Result: no match. ("24c02" != "24C02:00"). > > If I modify acpi_i2c_add_device() to cut off the name at the ':' and > covert to lowercase when populating info.type, it matches and works. > I must be missing something here, because this would have never worked as-is. > I'll ask on the I2C mailing list. You should either use proper _HID/_CID for the device or put "PRP0001" to the _HID and let the match happen with DT .compatible strings. I've attached a hack that I use locally. The corresponding ASL fragment would look like: Device (AT24) { Name (_HID, "PRP0001") Method (_CRS, 0, Serialized) { Name (UBUF, ResourceTemplate () { I2cSerialBus (0x50, ControllerInitiated, 0x00061A80, AddressingMode7Bit, "\\_SB.I2C6", 0x00, ResourceConsumer) }) Return (UBUF) } Name (_DSD, Package () { ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { Package () {"compatible", "atmel,24c02"}, Package () {"size", 256}, Package () {"pagesize", 32}, Package () {"abs-value", 1}, }, }) Method (_STA, 0, NotSerialized) { Return (0xF) } } From 78792d4e759f023975700222caffa7a20f77fcf9 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Mon, 29 Sep 2014 13:11:07 +0300 Subject: [PATCH] misc/at24: Make use of device property API Not-Signed-off-by: Mika Westerberg --- drivers/misc/eeprom/at24.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index c6cb7f8f325e..d2963b5632d4 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -20,9 +20,9 @@ #include #include #include -#include #include #include +#include /* * I2C EEPROMs from most vendors are inexpensive and mostly interchangeable. @@ -443,26 +443,24 @@ static ssize_t at24_macc_write(struct memory_accessor *macc, const char *buf, /*-------------------------------------------------------------------------*/ -#ifdef CONFIG_OF -static void at24_get_ofdata(struct i2c_client *client, +static int at24_get_fwdata(struct i2c_client *client, struct at24_platform_data *chip) { - const __be32 *val; - struct device_node *node = client->dev.of_node; - - if (node) { - if (of_get_property(node, "read-only", NULL)) - chip->flags |= AT24_FLAG_READONLY; - val = of_get_property(node, "pagesize", NULL); - if (val) - chip->page_size = be32_to_cpup(val); - } + if (device_property_present(&client->dev, "read-only")) + chip->flags |= AT24_FLAG_READONLY; + if (device_property_read_u16(&client->dev, "pagesize", &chip->page_size)) + return -ENODEV; + if (device_property_read_u32(&client->dev, "size", &chip->byte_len)) + return -ENODEV; + + return 0; } -#else -static void at24_get_ofdata(struct i2c_client *client, - struct at24_platform_data *chip) -{ } -#endif /* CONFIG_OF */ + +static const struct of_device_id at24_of_match[] = { + { .compatible = "atmel,24c02" }, + { }, +}; +MODULE_DEVICE_TABLE(of, at24_of_match); static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -477,7 +475,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) if (client->dev.platform_data) { chip = *(struct at24_platform_data *)client->dev.platform_data; - } else { + } else if (id) { if (!id->driver_data) return -ENODEV; @@ -493,10 +491,15 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) chip.page_size = 1; /* update chipdata if OF is present */ - at24_get_ofdata(client, &chip); + at24_get_fwdata(client, &chip); chip.setup = NULL; chip.context = NULL; + } else { + memset(&chip, 0, sizeof(chip)); + err = at24_get_fwdata(client, &chip); + if (err) + return err; } if (!is_power_of_2(chip.byte_len)) @@ -661,6 +664,7 @@ static int at24_remove(struct i2c_client *client) static struct i2c_driver at24_driver = { .driver = { .name = "at24", + .of_match_table = at24_of_match, }, .probe = at24_probe, .remove = at24_remove,