Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 159d3726 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ingo Molnar
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170102092450.87229-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 754c73cf

arch/x86/platform/intel-mid/device_libs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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_spidev.c→arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c

+4 −0
Original line number Diff line number Diff line
@@ -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;