Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
index 1f39603..3f1d976 100644 (file)
--- a/drivers/mfd/intel-lpss-acpi.c
+++ b/drivers/mfd/intel-lpss-acpi.c
@@ -89,6 +89,11 @@ static const struct intel_lpss_platform_info apl_i2c_info = {
        .swnode = &apl_i2c_node,
 };
 
+static const struct intel_lpss_platform_info cnl_i2c_info = {
+       .clk_rate = 216000000,
+       .swnode = &spt_i2c_node,
+};
+
 static const struct acpi_device_id intel_lpss_acpi_ids[] = {
        /* SPT */
        { "INT3440", (kernel_ulong_t)&spt_info },
@@ -102,6 +107,19 @@ static const struct acpi_device_id intel_lpss_acpi_ids[] = {
        { "INT3448", (kernel_ulong_t)&spt_uart_info },
        { "INT3449", (kernel_ulong_t)&spt_uart_info },
        { "INT344A", (kernel_ulong_t)&spt_uart_info },
+       /* CNL */
+       { "INT34B0", (kernel_ulong_t)&spt_info },
+       { "INT34B1", (kernel_ulong_t)&spt_info },
+       { "INT34B2", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B3", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B4", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B5", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B6", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B7", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B8", (kernel_ulong_t)&spt_uart_info },
+       { "INT34B9", (kernel_ulong_t)&spt_uart_info },
+       { "INT34BA", (kernel_ulong_t)&spt_uart_info },
+       { "INT34BC", (kernel_ulong_t)&spt_info },
        /* BXT */
        { "80860AAC", (kernel_ulong_t)&bxt_i2c_info },
        { "80860ABC", (kernel_ulong_t)&bxt_info },