diff --git a/packages/linux/package.mk b/packages/linux/package.mk index afe2529212..fc5715b614 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -29,8 +29,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.4.14" - PKG_SHA256="531e18b0eef516fa4b3843f89729fafbf3c6bc00325b082cc1f2cfcb28c8d7f0" + PKG_VERSION="5.4.15" + PKG_SHA256="6407222f850f685b346011bd696a3216d5df0f37e0184099100d2724396d94b1" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; diff --git a/packages/linux/patches/default/linux-999.22-intel_geminilake_i2c_timing.patch b/packages/linux/patches/default/linux-999.22-intel_geminilake_i2c_timing.patch deleted file mode 100644 index 2061c632b2..0000000000 --- a/packages/linux/patches/default/linux-999.22-intel_geminilake_i2c_timing.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3f31bc67e4dc6a555341dffefe328ddd58e8b431 Mon Sep 17 00:00:00 2001 -From: Jarkko Nikula -Date: Wed, 4 Sep 2019 08:56:25 +0300 -Subject: mfd: intel-lpss: Add default I2C device properties for Gemini Lake - -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 -Signed-off-by: Jarkko Nikula -Acked-by: Andy Shevchenko -Signed-off-by: Lee Jones ---- - drivers/mfd/intel-lpss-pci.c | 28 ++++++++++++++++++++-------- - 1 file changed, 20 insertions(+), 8 deletions(-) - -(limited to 'drivers/mfd/intel-lpss-pci.c') - -diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c -index 9355db29d2f9..1767f30a1676 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 }, --- -cgit 1.2-0.3.lf.el7 -