Commit a01b3391 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ingo Molnar

x86/platform/intel-mid: Get rid of duplication of IPC handler

There is no other device handler than ipc_device_handler() and sfi.c already
has a handler for IPC devices.

Replace a pointer to custom handler by a flag. Due to this change adjust
sfi_handle_ipc_dev() to handle it instead of ipc_device_handler().
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/20170105130235.177792-2-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 4b5b61ea
...@@ -42,10 +42,8 @@ struct devs_id { ...@@ -42,10 +42,8 @@ struct devs_id {
char name[SFI_NAME_LEN + 1]; char name[SFI_NAME_LEN + 1];
u8 type; u8 type;
u8 delay; u8 delay;
u8 msic;
void *(*get_platform_data)(void *info); void *(*get_platform_data)(void *info);
/* Custom handler for devices */
void (*device_handler)(struct sfi_device_table_entry *pentry,
struct devs_id *dev);
}; };
#define sfi_device(i) \ #define sfi_device(i) \
......
...@@ -5,7 +5,6 @@ obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI)) += platform_mrfld_sd.o ...@@ -5,7 +5,6 @@ obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI)) += platform_mrfld_sd.o
# WiFi # WiFi
obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o
# IPC Devices # IPC Devices
obj-y += platform_ipc.o
obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
obj-$(subst m,y,$(CONFIG_SND_MFLD_MACHINE)) += platform_msic_audio.o obj-$(subst m,y,$(CONFIG_SND_MFLD_MACHINE)) += platform_msic_audio.o
obj-$(subst m,y,$(CONFIG_GPIO_MSIC)) += platform_msic_gpio.o obj-$(subst m,y,$(CONFIG_GPIO_MSIC)) += platform_msic_gpio.o
......
/*
* platform_ipc.c: IPC platform library file
*
* (C) Copyright 2013 Intel Corporation
* Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; version 2
* of the License.
*/
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/sfi.h>
#include <linux/gpio.h>
#include <asm/intel-mid.h>
#include "platform_ipc.h"
void __init ipc_device_handler(struct sfi_device_table_entry *pentry,
struct devs_id *dev)
{
struct platform_device *pdev;
void *pdata = NULL;
static struct resource res __initdata = {
.name = "IRQ",
.flags = IORESOURCE_IRQ,
};
pr_debug("IPC bus, name = %16.16s, irq = 0x%2x\n",
pentry->name, pentry->irq);
/*
* We need to call platform init of IPC devices to fill misc_pdata
* structure. It will be used in msic_init for initialization.
*/
if (dev != NULL)
pdata = dev->get_platform_data(pentry);
/*
* On Medfield the platform device creation is handled by the MSIC
* MFD driver so we don't need to do it here.
*/
if (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",
pentry->name);
return;
}
res.start = pentry->irq;
platform_device_add_resources(pdev, &res, 1);
pdev->dev.platform_data = pdata;
intel_scu_device_register(pdev);
}
/*
* platform_ipc.h: IPC platform library header file
*
* (C) Copyright 2013 Intel Corporation
* Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; version 2
* of the License.
*/
#ifndef _PLATFORM_IPC_H_
#define _PLATFORM_IPC_H_
void __init
ipc_device_handler(struct sfi_device_table_entry *pentry, struct devs_id *dev);
#endif
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include "platform_msic.h" #include "platform_msic.h"
#include "platform_ipc.h"
static void *msic_audio_platform_data(void *info) static void *msic_audio_platform_data(void *info)
{ {
...@@ -40,8 +39,8 @@ static const struct devs_id msic_audio_dev_id __initconst = { ...@@ -40,8 +39,8 @@ static const struct devs_id msic_audio_dev_id __initconst = {
.name = "msic_audio", .name = "msic_audio",
.type = SFI_DEV_TYPE_IPC, .type = SFI_DEV_TYPE_IPC,
.delay = 1, .delay = 1,
.msic = 1,
.get_platform_data = &msic_audio_platform_data, .get_platform_data = &msic_audio_platform_data,
.device_handler = &ipc_device_handler,
}; };
sfi_device(msic_audio_dev_id); sfi_device(msic_audio_dev_id);
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include "platform_msic.h" #include "platform_msic.h"
#include "platform_ipc.h"
static void __init *msic_battery_platform_data(void *info) static void __init *msic_battery_platform_data(void *info)
{ {
...@@ -30,8 +29,8 @@ static const struct devs_id msic_battery_dev_id __initconst = { ...@@ -30,8 +29,8 @@ static const struct devs_id msic_battery_dev_id __initconst = {
.name = "msic_battery", .name = "msic_battery",
.type = SFI_DEV_TYPE_IPC, .type = SFI_DEV_TYPE_IPC,
.delay = 1, .delay = 1,
.msic = 1,
.get_platform_data = &msic_battery_platform_data, .get_platform_data = &msic_battery_platform_data,
.device_handler = &ipc_device_handler,
}; };
sfi_device(msic_battery_dev_id); sfi_device(msic_battery_dev_id);
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include "platform_msic.h" #include "platform_msic.h"
#include "platform_ipc.h"
static void __init *msic_gpio_platform_data(void *info) static void __init *msic_gpio_platform_data(void *info)
{ {
...@@ -41,8 +40,8 @@ static const struct devs_id msic_gpio_dev_id __initconst = { ...@@ -41,8 +40,8 @@ static const struct devs_id msic_gpio_dev_id __initconst = {
.name = "msic_gpio", .name = "msic_gpio",
.type = SFI_DEV_TYPE_IPC, .type = SFI_DEV_TYPE_IPC,
.delay = 1, .delay = 1,
.msic = 1,
.get_platform_data = &msic_gpio_platform_data, .get_platform_data = &msic_gpio_platform_data,
.device_handler = &ipc_device_handler,
}; };
sfi_device(msic_gpio_dev_id); sfi_device(msic_gpio_dev_id);
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include "platform_msic.h" #include "platform_msic.h"
#include "platform_ipc.h"
static void __init *msic_ocd_platform_data(void *info) static void __init *msic_ocd_platform_data(void *info)
{ {
...@@ -42,8 +41,8 @@ static const struct devs_id msic_ocd_dev_id __initconst = { ...@@ -42,8 +41,8 @@ static const struct devs_id msic_ocd_dev_id __initconst = {
.name = "msic_ocd", .name = "msic_ocd",
.type = SFI_DEV_TYPE_IPC, .type = SFI_DEV_TYPE_IPC,
.delay = 1, .delay = 1,
.msic = 1,
.get_platform_data = &msic_ocd_platform_data, .get_platform_data = &msic_ocd_platform_data,
.device_handler = &ipc_device_handler,
}; };
sfi_device(msic_ocd_dev_id); sfi_device(msic_ocd_dev_id);
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include "platform_msic.h" #include "platform_msic.h"
#include "platform_ipc.h"
static void __init *msic_power_btn_platform_data(void *info) static void __init *msic_power_btn_platform_data(void *info)
{ {
...@@ -29,8 +28,8 @@ static const struct devs_id msic_power_btn_dev_id __initconst = { ...@@ -29,8 +28,8 @@ static const struct devs_id msic_power_btn_dev_id __initconst = {
.name = "msic_power_btn", .name = "msic_power_btn",
.type = SFI_DEV_TYPE_IPC, .type = SFI_DEV_TYPE_IPC,
.delay = 1, .delay = 1,
.msic = 1,
.get_platform_data = &msic_power_btn_platform_data, .get_platform_data = &msic_power_btn_platform_data,
.device_handler = &ipc_device_handler,
}; };
sfi_device(msic_power_btn_dev_id); sfi_device(msic_power_btn_dev_id);
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include "platform_msic.h" #include "platform_msic.h"
#include "platform_ipc.h"
static void __init *msic_thermal_platform_data(void *info) static void __init *msic_thermal_platform_data(void *info)
{ {
...@@ -30,8 +29,8 @@ static const struct devs_id msic_thermal_dev_id __initconst = { ...@@ -30,8 +29,8 @@ static const struct devs_id msic_thermal_dev_id __initconst = {
.name = "msic_thermal", .name = "msic_thermal",
.type = SFI_DEV_TYPE_IPC, .type = SFI_DEV_TYPE_IPC,
.delay = 1, .delay = 1,
.msic = 1,
.get_platform_data = &msic_thermal_platform_data, .get_platform_data = &msic_thermal_platform_data,
.device_handler = &ipc_device_handler,
}; };
sfi_device(msic_thermal_dev_id); sfi_device(msic_thermal_dev_id);
...@@ -335,10 +335,22 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry, ...@@ -335,10 +335,22 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,
pr_debug("IPC bus, name = %16.16s, irq = 0x%2x\n", pr_debug("IPC bus, name = %16.16s, irq = 0x%2x\n",
pentry->name, pentry->irq); pentry->name, pentry->irq);
/*
* We need to call platform init of IPC devices to fill misc_pdata
* structure. It will be used in msic_init for initialization.
*/
pdata = intel_mid_sfi_get_pdata(dev, pentry); pdata = intel_mid_sfi_get_pdata(dev, pentry);
if (IS_ERR(pdata)) if (IS_ERR(pdata))
return; 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); pdev = platform_device_alloc(pentry->name, 0);
if (pdev == NULL) { if (pdev == NULL) {
pr_err("out of memory for SFI platform device '%s'.\n", pr_err("out of memory for SFI platform device '%s'.\n",
...@@ -348,7 +360,10 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry, ...@@ -348,7 +360,10 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,
install_irq_resource(pdev, pentry->irq); install_irq_resource(pdev, pentry->irq);
pdev->dev.platform_data = pdata; pdev->dev.platform_data = pdata;
platform_device_add(pdev); if (dev->delay)
intel_scu_device_register(pdev);
else
platform_device_add(pdev);
} }
static void __init sfi_handle_spi_dev(struct sfi_device_table_entry *pentry, static void __init sfi_handle_spi_dev(struct sfi_device_table_entry *pentry,
...@@ -503,27 +518,23 @@ static int __init sfi_parse_devs(struct sfi_table_header *table) ...@@ -503,27 +518,23 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)
if (!dev) if (!dev)
continue; continue;
if (dev->device_handler) { switch (pentry->type) {
dev->device_handler(pentry, dev); case SFI_DEV_TYPE_IPC:
} else { sfi_handle_ipc_dev(pentry, dev);
switch (pentry->type) { break;
case SFI_DEV_TYPE_IPC: case SFI_DEV_TYPE_SPI:
sfi_handle_ipc_dev(pentry, dev); sfi_handle_spi_dev(pentry, dev);
break; break;
case SFI_DEV_TYPE_SPI: case SFI_DEV_TYPE_I2C:
sfi_handle_spi_dev(pentry, dev); sfi_handle_i2c_dev(pentry, dev);
break; break;
case SFI_DEV_TYPE_I2C: case SFI_DEV_TYPE_SD:
sfi_handle_i2c_dev(pentry, dev); sfi_handle_sd_dev(pentry, dev);
break; break;
case SFI_DEV_TYPE_SD: case SFI_DEV_TYPE_UART:
sfi_handle_sd_dev(pentry, dev); case SFI_DEV_TYPE_HSI:
break; default:
case SFI_DEV_TYPE_UART: break;
case SFI_DEV_TYPE_HSI:
default:
break;
}
} }
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment