Skip to contentSkip to conversation

x86/platform/intel-mid: rename spidev to mrfld_spidev

PATCH New Andy Shevchenko 2 participants 2 messages Jan 2, 2017 – Jan 5, 2017

Subsystems (2)
x86 Intel MID (Mobile Internet Device) platform
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 x86/platform/intel-mid: rename spidev to mrfld_spidev

The current implementation supports only Intel Merrifield platforms. Don't mess with the rest of the Intel MID family by not registering device with wrong properties.

Signed-off-by Andy Shevchenko <[email protected]>
---
 arch/x86/platform/intel-mid/device_libs/Makefile                      | 2 +-
 .../device_libs/{platform_spidev.c => platform_mrfld_spidev.c}        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 rename arch/x86/platform/intel-mid/device_libs/{platform_spidev.c => platform_mrfld_spidev.c} (91%)
arch/x86/platform/intel-mid/device_libs/Makefile +1 -1
index 61b5ed2b7d40..90e4f2a6625b 100644
@@ -15,7 +15,7 @@ obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o
 obj-$(subst m,y,$(CONFIG_GPIO_INTEL_PMIC)) += platform_pmic_gpio.o
 obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
 # SPI Devices
-obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_spidev.o
+obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o
 # I2C Devices
 obj-$(subst m,y,$(CONFIG_SENSORS_EMC1403)) += platform_emc1403.o
 obj-$(subst m,y,$(CONFIG_SENSORS_LIS3LV02D)) += platform_lis331.o
arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c renamed from arch/x86/platform/intel-mid/device_libs/platform_spidev.c +4 -0
similarity index 91%
rename from arch/x86/platform/intel-mid/device_libs/platform_spidev.c
rename to arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c
index 30c601b399ee..27186ad654c9 100644
@@ -11,6 +11,7 @@
  * of the License.
  */
 
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/sfi.h>
 #include <linux/spi/pxa2xx_spi.h>

@@ -34,6 +35,9 @@ static void __init *spidev_platform_data(void *info)
 {
 	struct spi_board_info *spi_info = info;
 
+	if (intel_mid_identify_cpu() != INTEL_MID_CPU_CHIP_TANGIER)
+		return ERR_PTR(-ENODEV);
+
 	spi_info->mode = SPI_MODE_0;
 	spi_info->controller_data = &spidev_spi_chip;
Signature · 1 line
2.11.0
merge bot
#1 lore raw

[tip:x86/urgent] x86/platform/intel-mid: Rename 'spidev' to 'mrfld_spidev'

x86/platform/intel-mid: Rename 'spidev' to 'mrfld_spidev'
Commit-ID:  159d3726db12b3476bc59ea0ab0a702103d466b5
Gitweb:     http://git.kernel.org/tip/159d3726db12b3476bc59ea0ab0a702103d466b5
Author:     Andy Shevchenko <[email protected]>
AuthorDate: Mon, 2 Jan 2017 11:24:50 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 5 Jan 2017 09:03:29 +0100

x86/platform/intel-mid: Rename 'spidev' to 'mrfld_spidev'

The current implementation supports only Intel Merrifield platforms. Don't mess with the rest of the Intel MID family by not registering device with wrong properties.

Signed-off-by Andy Shevchenko <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/platform/intel-mid/device_libs/Makefile                      | 2 +-
 .../device_libs/{platform_spidev.c => platform_mrfld_spidev.c}        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
arch/x86/platform/intel-mid/device_libs/Makefile +1 -1
index 61b5ed2..90e4f2a 100644
@@ -15,7 +15,7 @@ obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o
 obj-$(subst m,y,$(CONFIG_GPIO_INTEL_PMIC)) += platform_pmic_gpio.o
 obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
 # SPI Devices
-obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_spidev.o
+obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o
 # I2C Devices
 obj-$(subst m,y,$(CONFIG_SENSORS_EMC1403)) += platform_emc1403.o
 obj-$(subst m,y,$(CONFIG_SENSORS_LIS3LV02D)) += platform_lis331.o
arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c renamed from arch/x86/platform/intel-mid/device_libs/platform_spidev.c +4 -0
similarity index 91%
rename from arch/x86/platform/intel-mid/device_libs/platform_spidev.c
rename to arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c
index 30c601b..27186ad 100644
@@ -11,6 +11,7 @@
  * of the License.
  */
 
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/sfi.h>
 #include <linux/spi/pxa2xx_spi.h>

@@ -34,6 +35,9 @@ static void __init *spidev_platform_data(void *info)
 {
 	struct spi_board_info *spi_info = info;
 
+	if (intel_mid_identify_cpu() != INTEL_MID_CPU_CHIP_TANGIER)
+		return ERR_PTR(-ENODEV);
+
 	spi_info->mode = SPI_MODE_0;
 	spi_info->controller_data = &spidev_spi_chip;