Skip to content

Commit 1f976f6

Browse files
mellanoxbmcdvhart
authored andcommitted
platform/x86: Move Mellanox platform hotplug driver to platform/mellanox
In preparation for making the hotplug driver build for different architectures, move mlxcpld-hotplug.c to platform/mellanox and the header to include/linux/platform_data as mlxreg.h to reflect the new interface changes to come. Replace references to CPLD with REG throughout the files, consistent with the new name. Signed-off-by: Vadim Pasternak <[email protected]> Acked-by: Andy Shevchenko <[email protected]> [dvhart: update copyright, rewrite commit message] Signed-off-by: Darren Hart (VMware) <[email protected]>
1 parent d6fa758 commit 1f976f6

File tree

10 files changed

+170
-146
lines changed

10 files changed

+170
-146
lines changed

MAINTAINERS

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8860,12 +8860,13 @@ W: http://www.mellanox.com
88608860
Q: http://patchwork.ozlabs.org/project/netdev/list/
88618861
F: drivers/net/ethernet/mellanox/mlxfw/
88628862

8863-
MELLANOX MLX CPLD HOTPLUG DRIVER
8863+
MELLANOX HARDWARE PLATFORM SUPPORT
8864+
M: Andy Shevchenko <[email protected]>
8865+
M: Darren Hart <[email protected]>
88648866
M: Vadim Pasternak <[email protected]>
88658867
88668868
S: Supported
8867-
F: drivers/platform/x86/mlxcpld-hotplug.c
8868-
F: include/linux/platform_data/mlxcpld-hotplug.h
8869+
F: drivers/platform/mellanox/
88698870

88708871
MELLANOX MLX4 core VPI driver
88718872
M: Tariq Toukan <[email protected]>

drivers/platform/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ endif
88
source "drivers/platform/goldfish/Kconfig"
99

1010
source "drivers/platform/chrome/Kconfig"
11+
12+
source "drivers/platform/mellanox/Kconfig"

drivers/platform/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#
55

66
obj-$(CONFIG_X86) += x86/
7+
obj-$(CONFIG_MELLANOX_PLATFORM) += mellanox/
78
obj-$(CONFIG_MIPS) += mips/
89
obj-$(CONFIG_OLPC) += olpc/
910
obj-$(CONFIG_GOLDFISH) += goldfish/

drivers/platform/mellanox/Kconfig

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
#
3+
# Platform support for Mellanox hardware
4+
#
5+
6+
menuconfig MELLANOX_PLATFORM
7+
bool "Platform support for Mellanox hardware"
8+
depends on X86 || COMPILE_TEST
9+
---help---
10+
Say Y here to get to see options for platform support for
11+
Mellanox systems. This option alone does not add any kernel code.
12+
13+
If you say N, all options in this submenu will be skipped and disabled.
14+
15+
if MELLANOX_PLATFORM
16+
17+
config MLXREG_HOTPLUG
18+
tristate "Mellanox platform hotplug driver support"
19+
depends on HWMON
20+
depends on I2C
21+
---help---
22+
This driver handles hot-plug events for the power suppliers, power
23+
cables and fans on the wide range Mellanox IB and Ethernet systems.
24+
25+
endif # MELLANOX_PLATFORM

drivers/platform/mellanox/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
#
3+
# Makefile for linux/drivers/platform/mellanox
4+
# Mellanox Platform-Specific Drivers
5+
#
6+
obj-$(CONFIG_MLXREG_HOTPLUG) += mlxreg-hotplug.o

0 commit comments

Comments
 (0)