| From 8db4319d145b935a71728a0e1632060464eb5076 Mon Sep 17 00:00:00 2001 |
| From: Jarkko Nikula <jarkko.nikula@linux.intel.com> |
| Date: Wed, 4 Sep 2019 08:56:25 +0300 |
| Subject: [PATCH] mfd: intel-lpss: Add default I2C device properties for Gemini |
| Lake |
| |
| commit 3f31bc67e4dc6a555341dffefe328ddd58e8b431 upstream. |
| |
| It turned out Intel Gemini Lake doesn't use the same I2C timing |
| parameters as Broxton. |
| |
| I got confirmation from the Windows team that Gemini Lake systems should |
| use updated timing parameters that differ from those used in Broxton |
| based systems. |
| |
| Fixes: f80e78aa11ad ("mfd: intel-lpss: Add Intel Gemini Lake PCI IDs") |
| Tested-by: Chris Chiu <chiu@endlessm.com> |
| Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> |
| Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Signed-off-by: Lee Jones <lee.jones@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c |
| index 3c271b14e7c6..246b84869d7c 100644 |
| --- a/drivers/mfd/intel-lpss-pci.c |
| +++ b/drivers/mfd/intel-lpss-pci.c |
| @@ -122,6 +122,18 @@ static const struct intel_lpss_platform_info apl_i2c_info = { |
| .properties = apl_i2c_properties, |
| }; |
| |
| +static struct property_entry glk_i2c_properties[] = { |
| + PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 313), |
| + PROPERTY_ENTRY_U32("i2c-sda-falling-time-ns", 171), |
| + PROPERTY_ENTRY_U32("i2c-scl-falling-time-ns", 290), |
| + { }, |
| +}; |
| + |
| +static const struct intel_lpss_platform_info glk_i2c_info = { |
| + .clk_rate = 133000000, |
| + .properties = glk_i2c_properties, |
| +}; |
| + |
| static const struct intel_lpss_platform_info cnl_i2c_info = { |
| .clk_rate = 216000000, |
| .properties = spt_i2c_properties, |
| @@ -174,14 +186,14 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { |
| { PCI_VDEVICE(INTEL, 0x1ac6), (kernel_ulong_t)&bxt_info }, |
| { PCI_VDEVICE(INTEL, 0x1aee), (kernel_ulong_t)&bxt_uart_info }, |
| /* GLK */ |
| - { PCI_VDEVICE(INTEL, 0x31ac), (kernel_ulong_t)&bxt_i2c_info }, |
| - { PCI_VDEVICE(INTEL, 0x31ae), (kernel_ulong_t)&bxt_i2c_info }, |
| - { PCI_VDEVICE(INTEL, 0x31b0), (kernel_ulong_t)&bxt_i2c_info }, |
| - { PCI_VDEVICE(INTEL, 0x31b2), (kernel_ulong_t)&bxt_i2c_info }, |
| - { PCI_VDEVICE(INTEL, 0x31b4), (kernel_ulong_t)&bxt_i2c_info }, |
| - { PCI_VDEVICE(INTEL, 0x31b6), (kernel_ulong_t)&bxt_i2c_info }, |
| - { PCI_VDEVICE(INTEL, 0x31b8), (kernel_ulong_t)&bxt_i2c_info }, |
| - { PCI_VDEVICE(INTEL, 0x31ba), (kernel_ulong_t)&bxt_i2c_info }, |
| + { PCI_VDEVICE(INTEL, 0x31ac), (kernel_ulong_t)&glk_i2c_info }, |
| + { PCI_VDEVICE(INTEL, 0x31ae), (kernel_ulong_t)&glk_i2c_info }, |
| + { PCI_VDEVICE(INTEL, 0x31b0), (kernel_ulong_t)&glk_i2c_info }, |
| + { PCI_VDEVICE(INTEL, 0x31b2), (kernel_ulong_t)&glk_i2c_info }, |
| + { PCI_VDEVICE(INTEL, 0x31b4), (kernel_ulong_t)&glk_i2c_info }, |
| + { PCI_VDEVICE(INTEL, 0x31b6), (kernel_ulong_t)&glk_i2c_info }, |
| + { PCI_VDEVICE(INTEL, 0x31b8), (kernel_ulong_t)&glk_i2c_info }, |
| + { PCI_VDEVICE(INTEL, 0x31ba), (kernel_ulong_t)&glk_i2c_info }, |
| { PCI_VDEVICE(INTEL, 0x31bc), (kernel_ulong_t)&bxt_uart_info }, |
| { PCI_VDEVICE(INTEL, 0x31be), (kernel_ulong_t)&bxt_uart_info }, |
| { PCI_VDEVICE(INTEL, 0x31c0), (kernel_ulong_t)&bxt_uart_info }, |
| -- |
| 2.7.4 |
| |
