342604a4bb
* [Mellanox] Don't populate arm64 Kconfig when integrating hw-mgmt
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
* Intgerate HW-MGMT 7.0030.2008 Changes
## Patch List
* 0285-UBUNTU-SAUCE-mlxbf-gige-Fix-intermittent-no-ip-issue.patch :
* 0286-pinctrl-Introduce-struct-pinfunction-and-PINCTRL_PIN.patch :
* 0287-pinctrl-mlxbf3-Add-pinctrl-driver-support.patch :
* 0288-UBUNTU-SAUCE-gpio-mmio-handle-ngpios-properly-in-bgp.patch :
* 0289-UBUNTU-SAUCE-gpio-mlxbf3-Add-gpio-driver-support.patch :
* 0291-mlxsw-core_hwmon-Align-modules-label-name-assignment.patch :
* 0292-mlxsw-i2c-Limit-single-transaction-buffer-size.patch :
* 0293-mlxsw-reg-Limit-MTBR-register-records-buffer-by-one-.patch :
* 0296-UBUNTU-SAUCE-mmc-sdhci-of-dwcmshc-Add-runtime-PM-ope.patch :
* 0298-UBUNTU-SAUCE-mlxbf-ptm-use-0444-instead-of-S_IRUGO.patch :
* 0299-UBUNTU-SAUCE-mlxbf-ptm-add-atx-debugfs-nodes.patch :
* 0300-UBUNTU-SAUCE-mlxbf-ptm-update-module-version.patch :
* 0301-UBUNTU-SAUCE-mlxbf-gige-Fix-kernel-panic-at-shutdown.patch :
* 0302-UBUNTU-SAUCE-mlxbf-bootctl-support-SMC-call-for-sett.patch :
* 0303-UBUNTU-SAUCE-Add-BF3-related-ACPI-config-and-Ring-de.patch :
* 0306-dt-bindings-trivial-devices-Add-infineon-xdpe1a2g7.patch :
* 0307-leds-mlxreg-Add-support-for-new-flavour-of-capabilit.patch :
* 0308-leds-mlxreg-Remove-code-for-amber-LED-colour.patch :
* 0308-platform_data-mlxreg-Add-capability-bit-and-mask-fie.patch :
* 0309-hwmon-mlxreg-fan-Add-support-for-new-flavour-of-capa.patch :
* 0310-hwmon-mlxreg-fan-Extend-number-of-supporetd-fans.patch :
* 0317-platform-mellanox-Introduce-support-for-switches-equ.patch :
* 0318-mellanox-Relocate-mlx-platform-driver.patch :
* 0319-UBUNTU-SAUCE-mlxbf-tmfifo-fix-potential-race.patch :
* 0320-UBUNTU-SAUCE-mlxbf-tmfifo-Drop-the-Rx-packet-if-no-m.patch :
* 0321-UBUNTU-SAUCE-mlxbf-tmfifo-Drop-jumbo-frames.patch :
* 0322-UBUNTU-SAUCE-mlxbf-tmfifo.c-Amend-previous-tmfifo-pa.patch :
* 0323-mlxbf_gige-add-set_link_ksettings-ethtool-callback.patch :
* 0324-mlxbf_gige-fix-white-space-in-mlxbf_gige_eth_ioctl.patch :
* 0325-UBUNTU-SAUCE-mlxbf-bootctl-Fix-kernel-panic-due-to-b.patch :
* 0326-platform-mellanox-mlxreg-hotplug-Add-support-for-new.patch :
* 0327-platform-mellanox-mlx-platform-Change-register-name.patch :
* 0328-platform-mellanox-mlx-platform-Add-support-for-new-X.patch :
* [Mellanox] Remove thermal zone related code and replace with new one
* Revert "Revert "[Mellanox] Align PSU temperature sysfs node name with hw-management change (#16820)" (#16956)"
This reverts commit c2edc6f9d5.
---------
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Co-authored-by: Junchao-Mellanox <junchao@nvidia.com>
Co-authored-by: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
99 lines
3.7 KiB
Diff
99 lines
3.7 KiB
Diff
From e56aebff93c7c72dab4958e56d518c17057344ff Mon Sep 17 00:00:00 2001
|
|
From: Vadim Pasternak <vadimp@nvidia.com>
|
|
Date: Mon, 24 Jul 2023 11:52:56 +0000
|
|
Subject: [PATCH backport 5.10 100/100] mellanox: Relocate mlx-platform driver
|
|
|
|
Move 'mlx-platform' driver 'x86' to 'mellanox' folder.
|
|
|
|
Motivation to allow running it on systems with ARM architecture.
|
|
|
|
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
|
|
Reviewed-by: Michael Shych <michaelsh@nvidia.com>
|
|
---
|
|
drivers/platform/mellanox/Kconfig | 12 ++++++++++++
|
|
drivers/platform/mellanox/Makefile | 1 +
|
|
drivers/platform/{x86 => mellanox}/mlx-platform.c | 0
|
|
drivers/platform/x86/Kconfig | 13 -------------
|
|
drivers/platform/x86/Makefile | 1 -
|
|
5 files changed, 13 insertions(+), 14 deletions(-)
|
|
rename drivers/platform/{x86 => mellanox}/mlx-platform.c (100%)
|
|
|
|
diff --git a/drivers/platform/mellanox/Kconfig b/drivers/platform/mellanox/Kconfig
|
|
index d54d36d92..dfa29127e 100644
|
|
--- a/drivers/platform/mellanox/Kconfig
|
|
+++ b/drivers/platform/mellanox/Kconfig
|
|
@@ -14,6 +14,18 @@ menuconfig MELLANOX_PLATFORM
|
|
|
|
if MELLANOX_PLATFORM
|
|
|
|
+config MLX_PLATFORM
|
|
+ tristate "Mellanox Technologies platform support"
|
|
+ depends on I2C && REGMAP
|
|
+ help
|
|
+ This option enables system support for the Mellanox Technologies
|
|
+ platform. The Mellanox systems provide data center networking
|
|
+ solutions based on Virtual Protocol Interconnect (VPI) technology
|
|
+ enable seamless connectivity to 56/100Gb/s InfiniBand or 10/40/56GbE
|
|
+ connection.
|
|
+
|
|
+ If you have a Mellanox system, say Y or M here.
|
|
+
|
|
config MLXREG_HOTPLUG
|
|
tristate "Mellanox platform hotplug driver support"
|
|
depends on REGMAP
|
|
diff --git a/drivers/platform/mellanox/Makefile b/drivers/platform/mellanox/Makefile
|
|
index 51a56ea1b..58ddeab43 100644
|
|
--- a/drivers/platform/mellanox/Makefile
|
|
+++ b/drivers/platform/mellanox/Makefile
|
|
@@ -3,6 +3,7 @@
|
|
# Makefile for linux/drivers/platform/mellanox
|
|
# Mellanox Platform-Specific Drivers
|
|
#
|
|
+obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o
|
|
obj-$(CONFIG_MLXBF_BOOTCTL) += mlxbf-bootctl.o
|
|
obj-$(CONFIG_MLXBF_PMC) += mlxbf-pmc.o
|
|
obj-$(CONFIG_MLXBF_TMFIFO) += mlxbf-tmfifo.o
|
|
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/mellanox/mlx-platform.c
|
|
similarity index 100%
|
|
rename from drivers/platform/x86/mlx-platform.c
|
|
rename to drivers/platform/mellanox/mlx-platform.c
|
|
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
|
index 84c5b922f..4270d4c17 100644
|
|
--- a/drivers/platform/x86/Kconfig
|
|
+++ b/drivers/platform/x86/Kconfig
|
|
@@ -1193,19 +1193,6 @@ config I2C_MULTI_INSTANTIATE
|
|
To compile this driver as a module, choose M here: the module
|
|
will be called i2c-multi-instantiate.
|
|
|
|
-config MLX_PLATFORM
|
|
- tristate "Mellanox Technologies platform support"
|
|
- depends on I2C
|
|
- select REGMAP
|
|
- help
|
|
- This option enables system support for the Mellanox Technologies
|
|
- platform. The Mellanox systems provide data center networking
|
|
- solutions based on Virtual Protocol Interconnect (VPI) technology
|
|
- enable seamless connectivity to 56/100Gb/s InfiniBand or 10/40/56GbE
|
|
- connection.
|
|
-
|
|
- If you have a Mellanox system, say Y or M here.
|
|
-
|
|
config TOUCHSCREEN_DMI
|
|
bool "DMI based touchscreen configuration info"
|
|
depends on ACPI && DMI && I2C=y && TOUCHSCREEN_SILEAD
|
|
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
|
index 5f823f7ef..1db86675f 100644
|
|
--- a/drivers/platform/x86/Makefile
|
|
+++ b/drivers/platform/x86/Makefile
|
|
@@ -122,7 +122,6 @@ obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o
|
|
|
|
# Platform drivers
|
|
obj-$(CONFIG_I2C_MULTI_INSTANTIATE) += i2c-multi-instantiate.o
|
|
-obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o
|
|
obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
|
|
|
|
# Intel uncore drivers
|
|
--
|
|
2.20.1
|
|
|