mfd: intel-lpss: Pass I2C configuration via properties on BXT

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>

diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
index 06f00d60be4693039db3e3d6447c60e3cc2fbbea..5a8d9c7666330ace7c30a5133e7bfc7e9b7b88e4 100644 (file)
--- a/drivers/mfd/intel-lpss-acpi.c
+++ b/drivers/mfd/intel-lpss-acpi.c
@@ -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[] = {

diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c
index afc7af92db9efcb02a58728a7aa48d25fc637df8..a19e57118641c024bad3aa35bef9a48e1916073a 100644 (file)
--- a/drivers/mfd/intel-lpss-pci.c
+++ b/drivers/mfd/intel-lpss-pci.c
@@ -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[] = {