Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:03:06 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:03:40 +0200
commit5dbbbc59f2b49e163e915f0aa5207aee5d677126 (patch)
tree6b385e145b47e90d1019f6363b44256284b3b603
parenta89b9c0d45af9a63005b7270a9a1e8b9f17b1920 (diff)
platform/x86: mlx-platform: Change mlxreg-io configuration
for MSN274x systems (bsc#1112374).
-rw-r--r--patches.drivers/platform-x86-mlx-platform-Change-mlxreg-io-configura.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.drivers/platform-x86-mlx-platform-Change-mlxreg-io-configura.patch b/patches.drivers/platform-x86-mlx-platform-Change-mlxreg-io-configura.patch
new file mode 100644
index 0000000000..45973731be
--- /dev/null
+++ b/patches.drivers/platform-x86-mlx-platform-Change-mlxreg-io-configura.patch
@@ -0,0 +1,38 @@
+From: Vadim Pasternak <vadimp@mellanox.com>
+Date: Thu, 26 Jul 2018 22:41:03 +0000
+Subject: platform/x86: mlx-platform: Change mlxreg-io configuration for
+ MSN274x systems
+Patch-mainline: v4.19-rc1
+Git-commit: da80c7aece1619c2c299432d3d498885ca6d757b
+References: bsc#1112374
+
+Change mlxreg-io platform driver configuration for MSN274x system types
+from the default to MSN21xx.
+
+Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
+Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/platform/x86/mlx-platform.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/platform/x86/mlx-platform.c
++++ b/drivers/platform/x86/mlx-platform.c
+@@ -1008,7 +1008,7 @@ static struct mlxreg_core_platform_data
+ .counter = ARRAY_SIZE(mlxplat_mlxcpld_default_regs_io_data),
+ };
+
+-/* Platform register access MSN21xx, MSN201x systems families data */
++/* Platform register access MSN21xx, MSN201x, MSN274x systems families data */
+ static struct mlxreg_core_data mlxplat_mlxcpld_msn21xx_regs_io_data[] = {
+ {
+ .label = "cpld1_version",
+@@ -1405,7 +1405,7 @@ static int __init mlxplat_dmi_msn274x_ma
+ mlxplat_hotplug->deferred_nr =
+ mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM - 1];
+ mlxplat_led = &mlxplat_default_led_data;
+- mlxplat_regs_io = &mlxplat_default_regs_io_data;
++ mlxplat_regs_io = &mlxplat_msn21xx_regs_io_data;
+
+ return 1;
+ };
diff --git a/series.conf b/series.conf
index 068d880f93..5829a11179 100644
--- a/series.conf
+++ b/series.conf
@@ -39228,6 +39228,7 @@
patches.drivers/platform-mellanox-mlxreg-hotplug-Add-hotplug-hwmon-u.patch
patches.drivers/platform-x86-mlx-platform-Add-ASIC-hotplug-device-co.patch
patches.drivers/platform-x86-mlx-platform-Allow-mlxreg-io-driver-act.patch
+ patches.drivers/platform-x86-mlx-platform-Change-mlxreg-io-configura.patch
patches.drivers/platform-x86-asus-nb-wmi-Add-keymap-entry-for-lid-fl.patch
patches.arch/ARM-hwmod-RTC-Don-t-assume-lock-unlock-will-be-calle.patch
patches.arch/ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch