Skip to content

Commit

Permalink
mfd: intel-lpss: Pass I2C configuration via properties on BXT
Browse files Browse the repository at this point in the history
I2C host controller need to be configured properly in order to meet I2C
timings specified in the I2C protocol specification. Some Intel Broxton
based machines do not have this information in the ACPI namespace (or the
boot firmware does not support ACPI at all) so we use build-in device
properties instead.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Mika Westerberg authored and Lee Jones committed Mar 16, 2016
1 parent 2609e4d commit 0343b2f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
12 changes: 12 additions & 0 deletions drivers/mfd/intel-lpss-acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,20 @@ static const struct intel_lpss_platform_info bxt_info = {
.clk_rate = 100000000,
};

static struct property_entry bxt_i2c_properties[] = {
PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 42),
PROPERTY_ENTRY_U32("i2c-sda-falling-time-ns", 171),
PROPERTY_ENTRY_U32("i2c-scl-falling-time-ns", 208),
{ },
};

static struct property_set bxt_i2c_pset = {
.properties = bxt_i2c_properties,
};

static const struct intel_lpss_platform_info bxt_i2c_info = {
.clk_rate = 133000000,
.pset = &bxt_i2c_pset,
};

static const struct acpi_device_id intel_lpss_acpi_ids[] = {
Expand Down
12 changes: 12 additions & 0 deletions drivers/mfd/intel-lpss-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,20 @@ static const struct intel_lpss_platform_info bxt_uart_info = {
.pset = &uart_pset,
};

static struct property_entry bxt_i2c_properties[] = {
PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 42),
PROPERTY_ENTRY_U32("i2c-sda-falling-time-ns", 171),
PROPERTY_ENTRY_U32("i2c-scl-falling-time-ns", 208),
{ },
};

static struct property_set bxt_i2c_pset = {
.properties = bxt_i2c_properties,
};

static const struct intel_lpss_platform_info bxt_i2c_info = {
.clk_rate = 133000000,
.pset = &bxt_i2c_pset,
};

static const struct pci_device_id intel_lpss_pci_ids[] = {
Expand Down

0 comments on commit 0343b2f

Please sign in to comment.