From 69e9e715a644aef8db118a30dee3878c561b976a Mon Sep 17 00:00:00 2001 From: Naresh G Solanki Date: Mon, 4 Jun 2018 17:45:19 +0530 Subject: src/driver/i2c/{generic,hid,tpm,max}: Update device name based on devicetree.cb Name i2c device structure based on that in devicetree.cb Now log looks like: I2C: 01:0a (WCOM Touchscreen) I2C: 03:13 (Realtek RT5663) I2C: 03:39 (SSM4567 Right Speaker Amp) I2C: 03:3a (SSM4567 Left Speaker Amp) BUG=None BRANCH=None TEST=Build & boot Soraka Change-Id: I5dbb66ab705cd8601b8b1dc94bc6ee9f181b7be2 Signed-off-by: Naresh G Solanki Reviewed-on: https://review.coreboot.org/26830 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh --- src/drivers/i2c/generic/generic.c | 5 +++++ src/drivers/i2c/hid/hid.c | 6 ++++++ src/drivers/i2c/max98373/max98373.c | 6 ++++++ src/drivers/i2c/max98927/max98927.c | 6 ++++++ src/drivers/i2c/tpm/chip.c | 6 ++++++ 5 files changed, 29 insertions(+) diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c index 46fff4ac6d..7f1ce16fea 100644 --- a/src/drivers/i2c/generic/generic.c +++ b/src/drivers/i2c/generic/generic.c @@ -217,6 +217,11 @@ static void i2c_generic_enable(struct device *dev) } dev->ops = &i2c_generic_ops; + + /* Name the device as per description provided in devicetree */ + if (config && config->desc) { + dev->name = config->desc; + } } struct chip_operations drivers_i2c_generic_ops = { diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c index 71d70d0cf6..bccce75a5d 100644 --- a/src/drivers/i2c/hid/hid.c +++ b/src/drivers/i2c/hid/hid.c @@ -58,7 +58,13 @@ static struct device_operations i2c_hid_ops = { static void i2c_hid_enable(struct device *dev) { + struct drivers_i2c_hid_config *config = dev->chip_info; + dev->ops = &i2c_hid_ops; + + if (config && config->generic.desc) { + dev->name = config->generic.desc; + } } struct chip_operations drivers_i2c_hid_ops = { diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c index 19dd7879e9..558be8a2ca 100644 --- a/src/drivers/i2c/max98373/max98373.c +++ b/src/drivers/i2c/max98373/max98373.c @@ -97,7 +97,13 @@ static struct device_operations max98373_ops = { static void max98373_enable(struct device *dev) { + struct drivers_i2c_max98373_config *config = dev->chip_info; + dev->ops = &max98373_ops; + + if (config && config->desc) { + dev->name = config->desc; + } } struct chip_operations drivers_i2c_max98373_ops = { diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c index 50b3e0c034..12599fed7c 100644 --- a/src/drivers/i2c/max98927/max98927.c +++ b/src/drivers/i2c/max98927/max98927.c @@ -93,7 +93,13 @@ static struct device_operations max98927_ops = { static void max98927_enable(struct device *dev) { + struct drivers_i2c_max98927_config *config = dev->chip_info; + dev->ops = &max98927_ops; + + if (config && config->desc) { + dev->name = config->desc; + } } struct chip_operations drivers_i2c_max98927_ops = { diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c index 2655b0da07..c2af071932 100644 --- a/src/drivers/i2c/tpm/chip.c +++ b/src/drivers/i2c/tpm/chip.c @@ -84,7 +84,13 @@ static struct device_operations i2c_tpm_ops = { static void i2c_tpm_enable(struct device *dev) { + struct drivers_i2c_tpm_config *config = dev->chip_info; + dev->ops = &i2c_tpm_ops; + + if (config && config->desc) { + dev->name = config->desc; + } } struct chip_operations drivers_i2c_tpm_ops = { -- cgit v1.2.3