Commit 4450e93f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

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



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

Note, for Intel Merrifield there is another driver which is
instantiated by a certain MFD one and does not need any support from
device_libs.

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 db472046
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 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
obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o
obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
# SPI Devices
obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o
@@ -24,5 +23,4 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_pcal9555a.o
obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
# MISC Devices
obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_mrfld_power_btn.o
obj-$(subst m,y,$(CONFIG_RTC_DRV_CMOS)) += platform_mrfld_rtc.o
+0 −78
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0-only
/*
 * Intel Merrifield power button support
 *
 * (C) Copyright 2017 Intel Corporation
 *
 * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 */

#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/sfi.h>

#include <asm/intel-mid.h>
#include <asm/intel_scu_ipc.h>

static struct resource mrfld_power_btn_resources[] = {
	{
		.flags		= IORESOURCE_IRQ,
	},
};

static struct platform_device mrfld_power_btn_dev = {
	.name		= "msic_power_btn",
	.id		= PLATFORM_DEVID_NONE,
	.num_resources	= ARRAY_SIZE(mrfld_power_btn_resources),
	.resource	= mrfld_power_btn_resources,
};

static int mrfld_power_btn_scu_status_change(struct notifier_block *nb,
					     unsigned long code, void *data)
{
	if (code == SCU_DOWN) {
		platform_device_unregister(&mrfld_power_btn_dev);
		return 0;
	}

	return platform_device_register(&mrfld_power_btn_dev);
}

static struct notifier_block mrfld_power_btn_scu_notifier = {
	.notifier_call	= mrfld_power_btn_scu_status_change,
};

static int __init register_mrfld_power_btn(void)
{
	if (intel_mid_identify_cpu() != INTEL_MID_CPU_CHIP_TANGIER)
		return -ENODEV;

	/*
	 * We need to be sure that the SCU IPC is ready before
	 * PMIC power button device can be registered:
	 */
	intel_scu_notifier_add(&mrfld_power_btn_scu_notifier);

	return 0;
}
arch_initcall(register_mrfld_power_btn);

static void __init *mrfld_power_btn_platform_data(void *info)
{
	struct resource *res = mrfld_power_btn_resources;
	struct sfi_device_table_entry *pentry = info;

	res->start = res->end = pentry->irq;
	return NULL;
}

static const struct devs_id mrfld_power_btn_dev_id __initconst = {
	.name			= "bcove_power_btn",
	.type			= SFI_DEV_TYPE_IPC,
	.delay			= 1,
	.msic			= 1,
	.get_platform_data	= &mrfld_power_btn_platform_data,
};

sfi_device(mrfld_power_btn_dev_id);
+0 −31
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0-only
/*
 * platform_msic_power_btn.c: MSIC power btn 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/sfi.h>
#include <linux/init.h>
#include <linux/mfd/intel_msic.h>
#include <asm/intel-mid.h>

#include "platform_msic.h"

static void __init *msic_power_btn_platform_data(void *info)
{
	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_POWER_BTN);
}

static const struct devs_id msic_power_btn_dev_id __initconst = {
	.name = "msic_power_btn",
	.type = SFI_DEV_TYPE_IPC,
	.delay = 1,
	.msic = 1,
	.get_platform_data = &msic_power_btn_platform_data,
};

sfi_device(msic_power_btn_dev_id);