Commit 59326a67 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

x86/platform/intel-mid: Remove unused leftovers (msic) 



There is no driver present, remove the device creation and other
leftovers.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f7009c53

arch/x86/include/asm/intel-mid.h

+0 −7
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct devs_id { 
	char name[SFI_NAME_LEN + 1];

	u8 type;

	u8 delay;

	u8 msic;

	void *(*get_platform_data)(void *info);

};
@@ -83,18 +82,12 @@ static inline enum intel_mid_cpu_type intel_mid_identify_cpu(void) 
	return __intel_mid_cpu_chip;

}



static inline bool intel_mid_has_msic(void)

{

	return (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_PENWELL);

}



extern void intel_scu_devices_create(void);

extern void intel_scu_devices_destroy(void);



#else /* !CONFIG_X86_INTEL_MID */



#define intel_mid_identify_cpu()	0

#define intel_mid_has_msic()		0



static inline void intel_scu_devices_create(void) { }

static inline void intel_scu_devices_destroy(void) { }

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

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI)) += platform_mrfld_sd.o 
# WiFi + BT

obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o

obj-$(subst m,y,$(CONFIG_BT_HCIUART_BCM)) += platform_bt.o

# IPC Devices

obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o

# SPI Devices

obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o

# I2C Devices

arch/x86/platform/intel-mid/device_libs/platform_msic.c

deleted100644 → 0
+0 −83
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * platform_msic.c: MSIC platform data initialization file

 *

 * (C) Copyright 2013 Intel Corporation

 * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>

 */



#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/scatterlist.h>

#include <linux/init.h>

#include <linux/sfi.h>

#include <linux/mfd/intel_msic.h>

#include <asm/intel_scu_ipc.h>

#include <asm/intel-mid.h>

#include "platform_msic.h"



struct intel_msic_platform_data msic_pdata;



static struct resource msic_resources[] = {

	{

		.start	= INTEL_MSIC_IRQ_PHYS_BASE,

		.end	= INTEL_MSIC_IRQ_PHYS_BASE + 64 - 1,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device msic_device = {

	.name		= "intel_msic",

	.id		= -1,

	.dev		= {

		.platform_data	= &msic_pdata,

	},

	.num_resources	= ARRAY_SIZE(msic_resources),

	.resource	= msic_resources,

};



static int msic_scu_status_change(struct notifier_block *nb,

				  unsigned long code, void *data)

{

	if (code == SCU_DOWN) {

		platform_device_unregister(&msic_device);

		return 0;

	}



	return platform_device_register(&msic_device);

}



static int __init msic_init(void)

{

	static struct notifier_block msic_scu_notifier = {

		.notifier_call	= msic_scu_status_change,

	};



	/*

	 * We need to be sure that the SCU IPC is ready before MSIC device

	 * can be registered.

	 */

	if (intel_mid_has_msic())

		intel_scu_notifier_add(&msic_scu_notifier);



	return 0;

}

arch_initcall(msic_init);



/*

 * msic_generic_platform_data - sets generic platform data for the block

 * @info: pointer to the SFI device table entry for this block

 * @block: MSIC block

 *

 * Function sets IRQ number from the SFI table entry for given device to

 * the MSIC platform data.

 */

void *msic_generic_platform_data(void *info, enum intel_msic_block block)

{

	struct sfi_device_table_entry *entry = info;



	BUG_ON(block < 0 || block >= INTEL_MSIC_BLOCK_LAST);

	msic_pdata.irq[block] = entry->irq;



	return NULL;

}

arch/x86/platform/intel-mid/device_libs/platform_msic.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * platform_msic.h: MSIC platform data header file

 *

 * (C) Copyright 2013 Intel Corporation

 * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>

 */

#ifndef _PLATFORM_MSIC_H_

#define _PLATFORM_MSIC_H_



extern struct intel_msic_platform_data msic_pdata;



void *msic_generic_platform_data(void *info, enum intel_msic_block block);



#endif

arch/x86/platform/intel-mid/sfi.c

+0 −7
Original line number Diff line number Diff line
@@ -338,13 +338,6 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry, 
	if (IS_ERR(pdata))

		return;



	/*

	 * On Medfield the platform device creation is handled by the MSIC

	 * MFD driver so we don't need to do it here.

	 */

	if (dev->msic && intel_mid_has_msic())

		return;



	pdev = platform_device_alloc(pentry->name, 0);

	if (pdev == NULL) {

		pr_err("out of memory for SFI platform device '%s'.\n",