ip6_tunnel: Update skb->protocol to ETH_P_IPV6 in ip6_tnl_xmit()

[cascardo/linux.git] / drivers / mfd / intel-lpss-acpi.c

diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
index 7ddc4a9..6bf8d64 100644 (file)
--- a/drivers/mfd/intel-lpss-acpi.c
+++ b/drivers/mfd/intel-lpss-acpi.c
@@ -52,6 +52,18 @@ static const struct intel_lpss_platform_info bxt_i2c_info = {
        .properties = bxt_i2c_properties,
 };
 
+static struct property_entry apl_i2c_properties[] = {
+       PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 207),
+       PROPERTY_ENTRY_U32("i2c-sda-falling-time-ns", 171),
+       PROPERTY_ENTRY_U32("i2c-scl-falling-time-ns", 208),
+       { },
+};
+
+static const struct intel_lpss_platform_info apl_i2c_info = {
+       .clk_rate = 133000000,
+       .properties = apl_i2c_properties,
+};
+
 static const struct acpi_device_id intel_lpss_acpi_ids[] = {
        /* SPT */
        { "INT3446", (kernel_ulong_t)&spt_i2c_info },
@@ -61,7 +73,7 @@ static const struct acpi_device_id intel_lpss_acpi_ids[] = {
        { "80860ABC", (kernel_ulong_t)&bxt_info },
        { "80860AC2", (kernel_ulong_t)&bxt_info },
        /* APL */
-       { "80865AAC", (kernel_ulong_t)&bxt_i2c_info },
+       { "80865AAC", (kernel_ulong_t)&apl_i2c_info },
        { "80865ABC", (kernel_ulong_t)&bxt_info },
        { "80865AC2", (kernel_ulong_t)&bxt_info },
        { }