korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

mfd: intel-lpss: Add support for passing device properties

Browse Source 
If the boot firmware does not support ACPI we need a way to pass device
configuration information to the drivers. The unified device properties API
already supports passing platform data via properties so let's take
advantage of that and allow probe drivers to pass set of properties to the
host controller driver.

In order to do that we need to be able to modify the MFD cell corresponding
the host controller, so make the core driver to take copy of the cell
instead of using it directly. Then we can assign info->pset to the
resulting copy of a cell and let the MFD core to assign that to the
resulting device.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Mika Westerberg 2015-11-30 17:11:41 +02:00 committed by Rafael J. Wysocki
parent 4d215cabc7
commit e15ad2154b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/mfd/intel-lpss.c
View File

@ -24,6 +24,7 @@
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/pm_qos.h> #include <linux/pm_qos.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/property.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/io-64-nonatomic-lo-hi.h>
@ -72,7 +73,7 @@ struct intel_lpss {
enum intel_lpss_dev_type type; enum intel_lpss_dev_type type;
struct clk *clk; struct clk *clk;
struct clk_lookup *clock; struct clk_lookup *clock;
const struct mfd_cell *cell; struct mfd_cell *cell;
struct device *dev; struct device *dev;
void __iomem *priv; void __iomem *priv;
int devid; int devid;
@ -217,6 +218,7 @@ static void intel_lpss_ltr_hide(struct intel_lpss *lpss)
static int intel_lpss_assign_devs(struct intel_lpss *lpss) static int intel_lpss_assign_devs(struct intel_lpss *lpss)
{ {
const struct mfd_cell *cell;
unsigned int type; unsigned int type;
type = lpss->caps & LPSS_PRIV_CAPS_TYPE_MASK; type = lpss->caps & LPSS_PRIV_CAPS_TYPE_MASK;
@ -224,18 +226,22 @@ static int intel_lpss_assign_devs(struct intel_lpss *lpss)
switch (type) { switch (type) {
case LPSS_DEV_I2C: case LPSS_DEV_I2C:
lpss->cell = &intel_lpss_i2c_cell; cell = &intel_lpss_i2c_cell;
break; break;
case LPSS_DEV_UART: case LPSS_DEV_UART:
lpss->cell = &intel_lpss_uart_cell; cell = &intel_lpss_uart_cell;
break; break;
case LPSS_DEV_SPI: case LPSS_DEV_SPI:
lpss->cell = &intel_lpss_spi_cell; cell = &intel_lpss_spi_cell;
break; break;
default: default:
return -ENODEV; return -ENODEV;
} }
lpss->cell = devm_kmemdup(lpss->dev, cell, sizeof(*cell), GFP_KERNEL);
if (!lpss->cell)
return -ENOMEM;
lpss->type = type; lpss->type = type;
return 0; return 0;
@ -401,6 +407,8 @@ int intel_lpss_probe(struct device *dev,
if (ret) if (ret)
return ret; return ret;
lpss->cell->pset = info->pset;
intel_lpss_init_dev(lpss); intel_lpss_init_dev(lpss);
lpss->devid = ida_simple_get(&intel_lpss_devid_ida, 0, 0, GFP_KERNEL); lpss->devid = ida_simple_get(&intel_lpss_devid_ida, 0, 0, GFP_KERNEL);

2
drivers/mfd/intel-lpss.h
View File

@ -16,12 +16,14 @@
struct device; struct device;
struct resource; struct resource;
struct property_set;
struct intel_lpss_platform_info { struct intel_lpss_platform_info {
struct resource *mem; struct resource *mem;
int irq; int irq;
unsigned long clk_rate; unsigned long clk_rate;
const char *clk_con_id; const char *clk_con_id;
struct property_set *pset;
}; };
int intel_lpss_probe(struct device *dev, int intel_lpss_probe(struct device *dev,