From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan O'Donovan Subject: [PATCH v3 2/3] i2c: acpi: Initialize info.type from of_compatible Date: Mon, 23 Jan 2017 16:08:56 +0000 Message-ID: <1485187737-22414-3-git-send-email-dan@emutex.com> References: <1485187737-22414-1-git-send-email-dan@emutex.com> Cc: Len Brown , linux-i2c@vger.kernel.org, Wolfram Sang , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Dan O'Donovan , Crestez Dan Leonard To: linux-acpi@vger.kernel.org, "Rafael J . Wysocki" , Jarkko Nikula , Mika Westerberg , Mark Brown Return-path: In-Reply-To: <1485187737-22414-1-git-send-email-dan@emutex.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-spi.vger.kernel.org From: Crestez Dan Leonard 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 Signed-off-by: Dan O'Donovan --- 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 583e950..a83dbc7 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -221,7 +221,13 @@ static int i2c_acpi_get_info(struct acpi_device *adev, acpi_dev_free_resource_list(&resource_list); - strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type)); + /* + * Populate modalias from compatible property if available, + * otherwise use native ACPI information + */ + if ((!adev->data.of_compatible) || + acpi_of_modalias(adev, info->type, sizeof(info->type))) + strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type)); return 0; } -- 2.7.4