forked from mirrors/linux
		
	platform/x86: mlx-platform: Move module from arch/x86
Since mlx-platform is not an architectural driver, it is moved out of arch/x86/platform to drivers/platform/x86. Relevant Makefile and Kconfig are updated. Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
		
							parent
							
								
									cb2bf25145
								
							
						
					
					
						commit
						6613d18e90
					
				
					 7 changed files with 14 additions and 17 deletions
				
			
		|  | @ -7879,7 +7879,7 @@ MELLANOX PLATFORM DRIVER | ||||||
| M:      Vadim Pasternak <vadimp@mellanox.com> | M:      Vadim Pasternak <vadimp@mellanox.com> | ||||||
| L:      platform-driver-x86@vger.kernel.org | L:      platform-driver-x86@vger.kernel.org | ||||||
| S:      Supported | S:      Supported | ||||||
| F:      arch/x86/platform/mellanox/mlx-platform.c | F:      drivers/platform/x86/mlx-platform.c | ||||||
| 
 | 
 | ||||||
| MELLANOX MLX CPLD HOTPLUG DRIVER | MELLANOX MLX CPLD HOTPLUG DRIVER | ||||||
| M:	Vadim Pasternak <vadimp@mellanox.com> | M:	Vadim Pasternak <vadimp@mellanox.com> | ||||||
|  |  | ||||||
|  | @ -550,18 +550,6 @@ config X86_INTEL_QUARK | ||||||
| 	  Say Y here if you have a Quark based system such as the Arduino | 	  Say Y here if you have a Quark based system such as the Arduino | ||||||
| 	  compatible Intel Galileo. | 	  compatible Intel Galileo. | ||||||
| 
 | 
 | ||||||
| config MLX_PLATFORM |  | ||||||
| 	tristate "Mellanox Technologies platform support" |  | ||||||
| 	depends on X86_64 |  | ||||||
| 	depends on X86_EXTENDED_PLATFORM |  | ||||||
| 	---help--- |  | ||||||
| 	  This option enables system support for the Mellanox Technologies |  | ||||||
| 	  platform. |  | ||||||
| 
 |  | ||||||
| 	  Say Y here if you are building a kernel for Mellanox system. |  | ||||||
| 
 |  | ||||||
| 	  Otherwise, say N. |  | ||||||
| 
 |  | ||||||
| config X86_INTEL_LPSS | config X86_INTEL_LPSS | ||||||
| 	bool "Intel Low Power Subsystem Support" | 	bool "Intel Low Power Subsystem Support" | ||||||
| 	depends on X86 && ACPI | 	depends on X86 && ACPI | ||||||
|  |  | ||||||
|  | @ -8,7 +8,6 @@ obj-y	+= iris/ | ||||||
| obj-y	+= intel/ | obj-y	+= intel/ | ||||||
| obj-y	+= intel-mid/ | obj-y	+= intel-mid/ | ||||||
| obj-y	+= intel-quark/ | obj-y	+= intel-quark/ | ||||||
| obj-y	+= mellanox/ |  | ||||||
| obj-y	+= olpc/ | obj-y	+= olpc/ | ||||||
| obj-y	+= scx200/ | obj-y	+= scx200/ | ||||||
| obj-y	+= sfi/ | obj-y	+= sfi/ | ||||||
|  |  | ||||||
|  | @ -1 +0,0 @@ | ||||||
| obj-$(CONFIG_MLX_PLATFORM)	+= mlx-platform.o |  | ||||||
|  | @ -1028,10 +1028,21 @@ config INTEL_TELEMETRY | ||||||
| 	  directly via debugfs files. Various tools may use | 	  directly via debugfs files. Various tools may use | ||||||
| 	  this interface for SoC state monitoring. | 	  this interface for SoC state monitoring. | ||||||
| 
 | 
 | ||||||
|  | config MLX_PLATFORM | ||||||
|  | 	tristate "Mellanox Technologies platform support" | ||||||
|  | 	depends on X86_64 | ||||||
|  | 	---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 MLX_CPLD_PLATFORM | config MLX_CPLD_PLATFORM | ||||||
| 	tristate "Mellanox platform hotplug driver support" | 	tristate "Mellanox platform hotplug driver support" | ||||||
| 	default n | 	default n | ||||||
| 	depends on MLX_PLATFORM |  | ||||||
| 	select HWMON | 	select HWMON | ||||||
| 	select I2C | 	select I2C | ||||||
| 	---help--- | 	---help--- | ||||||
|  |  | ||||||
|  | @ -71,4 +71,5 @@ obj-$(CONFIG_INTEL_TELEMETRY)	+= intel_telemetry_core.o \ | ||||||
| 				   intel_telemetry_pltdrv.o \
 | 				   intel_telemetry_pltdrv.o \
 | ||||||
| 				   intel_telemetry_debugfs.o | 				   intel_telemetry_debugfs.o | ||||||
| obj-$(CONFIG_INTEL_PMC_CORE)    += intel_pmc_core.o | obj-$(CONFIG_INTEL_PMC_CORE)    += intel_pmc_core.o | ||||||
|  | obj-$(CONFIG_MLX_PLATFORM)	+= mlx-platform.o | ||||||
| obj-$(CONFIG_MLX_CPLD_PLATFORM)	+= mlxcpld-hotplug.o | obj-$(CONFIG_MLX_CPLD_PLATFORM)	+= mlxcpld-hotplug.o | ||||||
|  |  | ||||||
|  | @ -1,5 +1,4 @@ | ||||||
| /*
 | /*
 | ||||||
|  * arch/x86/platform/mellanox/mlx-platform.c |  | ||||||
|  * Copyright (c) 2016 Mellanox Technologies. All rights reserved. |  * Copyright (c) 2016 Mellanox Technologies. All rights reserved. | ||||||
|  * Copyright (c) 2016 Vadim Pasternak <vadimp@mellanox.com> |  * Copyright (c) 2016 Vadim Pasternak <vadimp@mellanox.com> | ||||||
|  * |  * | ||||||
		Loading…
	
		Reference in a new issue
	
	 Vadim Pasternak
						Vadim Pasternak