lkml.org 
[lkml]   [2017]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH for v4.9 LTS 52/87] x86/platform/intel-mid: Rename 'spidev' to 'mrfld_spidev'
    Date
    From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

    [ Upstream commit 159d3726db12b3476bc59ea0ab0a702103d466b5 ]

    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 <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: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    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%)

    diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile
    index dd6cfa4ad3ac..75029d0cfa15 100644
    --- a/arch/x86/platform/intel-mid/device_libs/Makefile
    +++ b/arch/x86/platform/intel-mid/device_libs/Makefile
    @@ -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
    diff --git a/arch/x86/platform/intel-mid/device_libs/platform_spidev.c b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c
    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
    --- a/arch/x86/platform/intel-mid/device_libs/platform_spidev.c
    +++ b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c
    @@ -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;

    --
    2.11.0
    \
     
     \ /
      Last update: 2017-07-15 03:40    [W:4.241 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site