From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161027AbcFOSbP (ORCPT ); Wed, 15 Jun 2016 14:31:15 -0400 Received: from mga02.intel.com ([134.134.136.20]:25013 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932698AbcFOSbI (ORCPT ); Wed, 15 Jun 2016 14:31:08 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,477,1459839600"; d="scan'208";a="719611839" From: Crestez Dan Leonard To: linux-acpi@vger.kernel.org, "Rafael J. Wysocki" , Mika Westerberg Cc: Crestez Dan Leonard , Len Brown , linux-i2c@vger.kernel.org, Wolfram Sang , linux-spi@vger.kernel.org, Mark Brown , linux-kernel@vger.kernel.org, Octavian Purdila Subject: [PATCH 2/3] acpi i2c: Initialize info.type from of_compatible Date: Wed, 15 Jun 2016 21:30:28 +0300 Message-Id: <13cb5b7766b1b25a2bb61ce0053a38f6f440907b.1466014238.git.leonard.crestez@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When using devicetree i2c_board_info.type is set to the compatible string with the vendor prefix removed. For I2C devices described via ACPI the i2c_board_info.type string is set to the ACPI device name. When using ACPI and DT ids this string ends up something like "PRP0001:00". If the of_compatible property is present try to use that instead. This makes it easier to instantiate i2c drivers through ACPI with DT ids. Signed-off-by: Crestez Dan Leonard --- drivers/i2c/i2c-core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index af11b65..5ab1fb9 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -188,8 +188,14 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level, acpi_dev_free_resource_list(&resource_list); + if (adev->data.of_compatible) { + ret = acpi_of_modalias(adev, info.type, sizeof(info.type)); + if (ret) + return -EINVAL; + } else + strlcpy(info.type, dev_name(&adev->dev), sizeof(info.type)); + adev->power.flags.ignore_parent = true; - strlcpy(info.type, dev_name(&adev->dev), sizeof(info.type)); if (!i2c_new_device(adapter, &info)) { adev->power.flags.ignore_parent = false; dev_err(&adapter->dev, -- 2.5.5