Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 10:46:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mfd: Use mfd cell platform_data for timberdale cells platform bits

Browse Source 
With the addition of a device platform mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.

Acked-by: Richard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2011-04-08 01:23:57 +02:00
parent 7dc00a0d14
commit 3271d382c3
9 changed files with 64 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dma/timb_dma.c
View File

@ -27,7 +27,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/core.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/timb_dma.h> #include <linux/timb_dma.h>
@ -685,7 +684,7 @@ static irqreturn_t td_irq(int irq, void *devid)
static int __devinit td_probe(struct platform_device *pdev) static int __devinit td_probe(struct platform_device *pdev)
{ {
struct timb_dma_platform_data *pdata = mfd_get_data(pdev); struct timb_dma_platform_data *pdata = pdev->dev.platform_data;
struct timb_dma *td; struct timb_dma *td;
struct resource *iomem; struct resource *iomem;
int irq; int irq;

6
drivers/gpio/timbgpio.c
View File

@ -23,7 +23,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/core.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/timb_gpio.h> #include <linux/timb_gpio.h>
@ -229,7 +228,7 @@ static int __devinit timbgpio_probe(struct platform_device *pdev)
struct gpio_chip *gc; struct gpio_chip *gc;
struct timbgpio *tgpio; struct timbgpio *tgpio;
struct resource *iomem; struct resource *iomem;
struct timbgpio_platform_data *pdata = mfd_get_data(pdev); struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
if (!pdata || pdata->nr_pins > 32) { if (!pdata || pdata->nr_pins > 32) {
@ -320,13 +319,14 @@ err_mem:
static int __devexit timbgpio_remove(struct platform_device *pdev) static int __devexit timbgpio_remove(struct platform_device *pdev)
{ {
int err; int err;
struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
struct timbgpio *tgpio = platform_get_drvdata(pdev); struct timbgpio *tgpio = platform_get_drvdata(pdev);
struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
if (irq >= 0 && tgpio->irq_base > 0) { if (irq >= 0 && tgpio->irq_base > 0) {
int i; int i;
for (i = 0; i < tgpio->gpio.ngpio; i++) { for (i = 0; i < pdata->nr_pins; i++) {
irq_set_chip(tgpio->irq_base + i, NULL); irq_set_chip(tgpio->irq_base + i, NULL);
irq_set_chip_data(tgpio->irq_base + i, NULL); irq_set_chip_data(tgpio->irq_base + i, NULL);
} }

3
drivers/i2c/busses/i2c-ocores.c
View File

@ -49,7 +49,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/core.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/wait.h> #include <linux/wait.h>
@ -306,7 +305,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
return -EIO; return -EIO;
} }
pdata = mfd_get_data(pdev); pdata = pdev->dev.platform_data;
if (pdata) { if (pdata) {
i2c->regstep = pdata->regstep; i2c->regstep = pdata->regstep;
i2c->clock_khz = pdata->clock_khz; i2c->clock_khz = pdata->clock_khz;

3
drivers/i2c/busses/i2c-xiic.c
View File

@ -34,7 +34,6 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/core.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/wait.h> #include <linux/wait.h>
@ -705,7 +704,7 @@ static int __devinit xiic_i2c_probe(struct platform_device *pdev)
if (irq < 0) if (irq < 0)
goto resource_missing; goto resource_missing;
pdata = mfd_get_data(pdev); pdata = (struct xiic_i2c_platform_data *) pdev->dev.platform_data;
if (!pdata) if (!pdata)
return -EINVAL; return -EINVAL;

3
drivers/media/radio/radio-timb.c
View File

@ -21,7 +21,6 @@
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/core.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
@ -149,7 +148,7 @@ static const struct v4l2_file_operations timbradio_fops = {
static int __devinit timbradio_probe(struct platform_device *pdev) static int __devinit timbradio_probe(struct platform_device *pdev)
{ {
struct timb_radio_platform_data *pdata = mfd_get_data(pdev); struct timb_radio_platform_data *pdata = pdev->dev.platform_data;
struct timbradio *tr; struct timbradio *tr;
int err; int err;

3
drivers/media/video/timblogiw.c
View File

@ -24,7 +24,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include <linux/mfd/core.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/list.h> #include <linux/list.h>
@ -791,7 +790,7 @@ static int __devinit timblogiw_probe(struct platform_device *pdev)
{ {
int err; int err;
struct timblogiw *lw = NULL; struct timblogiw *lw = NULL;
struct timb_video_platform_data *pdata = mfd_get_data(pdev); struct timb_video_platform_data *pdata = pdev->dev.platform_data;
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "No platform data\n"); dev_err(&pdev->dev, "No platform data\n");

81
drivers/mfd/timberdale.c
View File

@ -384,7 +384,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
.name = "timb-dma", .name = "timb-dma",
.num_resources = ARRAY_SIZE(timberdale_dma_resources), .num_resources = ARRAY_SIZE(timberdale_dma_resources),
.resources = timberdale_dma_resources, .resources = timberdale_dma_resources,
.mfd_data = &timb_dma_platform_data, .platform_data = &timb_dma_platform_data,
.pdata_size = sizeof(timb_dma_platform_data),
}, },
{ {
.name = "timb-uart", .name = "timb-uart",
@ -395,37 +396,43 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
.name = "xiic-i2c", .name = "xiic-i2c",
.num_resources = ARRAY_SIZE(timberdale_xiic_resources), .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
.resources = timberdale_xiic_resources, .resources = timberdale_xiic_resources,
.mfd_data = &timberdale_xiic_platform_data, .platform_data = &timberdale_xiic_platform_data,
.pdata_size = sizeof(timberdale_xiic_platform_data),
}, },
{ {
.name = "timb-gpio", .name = "timb-gpio",
.num_resources = ARRAY_SIZE(timberdale_gpio_resources), .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
.resources = timberdale_gpio_resources, .resources = timberdale_gpio_resources,
.mfd_data = &timberdale_gpio_platform_data, .platform_data = &timberdale_gpio_platform_data,
.pdata_size = sizeof(timberdale_gpio_platform_data),
}, },
{ {
.name = "timb-video", .name = "timb-video",
.num_resources = ARRAY_SIZE(timberdale_video_resources), .num_resources = ARRAY_SIZE(timberdale_video_resources),
.resources = timberdale_video_resources, .resources = timberdale_video_resources,
.mfd_data = &timberdale_video_platform_data, .platform_data = &timberdale_video_platform_data,
.pdata_size = sizeof(timberdale_video_platform_data),
}, },
{ {
.name = "timb-radio", .name = "timb-radio",
.num_resources = ARRAY_SIZE(timberdale_radio_resources), .num_resources = ARRAY_SIZE(timberdale_radio_resources),
.resources = timberdale_radio_resources, .resources = timberdale_radio_resources,
.mfd_data = &timberdale_radio_platform_data, .platform_data = &timberdale_radio_platform_data,
.pdata_size = sizeof(timberdale_radio_platform_data),
}, },
{ {
.name = "xilinx_spi", .name = "xilinx_spi",
.num_resources = ARRAY_SIZE(timberdale_spi_resources), .num_resources = ARRAY_SIZE(timberdale_spi_resources),
.resources = timberdale_spi_resources, .resources = timberdale_spi_resources,
.mfd_data = &timberdale_xspi_platform_data, .platform_data = &timberdale_xspi_platform_data,
.pdata_size = sizeof(timberdale_xspi_platform_data),
}, },
{ {
.name = "ks8842", .name = "ks8842",
.num_resources = ARRAY_SIZE(timberdale_eth_resources), .num_resources = ARRAY_SIZE(timberdale_eth_resources),
.resources = timberdale_eth_resources, .resources = timberdale_eth_resources,
.mfd_data = &timberdale_ks8842_platform_data, .platform_data = &timberdale_ks8842_platform_data,
.pdata_size = sizeof(timberdale_ks8842_platform_data),
}, },
}; };
@ -434,7 +441,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
.name = "timb-dma", .name = "timb-dma",
.num_resources = ARRAY_SIZE(timberdale_dma_resources), .num_resources = ARRAY_SIZE(timberdale_dma_resources),
.resources = timberdale_dma_resources, .resources = timberdale_dma_resources,
.mfd_data = &timb_dma_platform_data, .platform_data = &timb_dma_platform_data,
.pdata_size = sizeof(timb_dma_platform_data),
}, },
{ {
.name = "timb-uart", .name = "timb-uart",
@ -450,13 +458,15 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
.name = "xiic-i2c", .name = "xiic-i2c",
.num_resources = ARRAY_SIZE(timberdale_xiic_resources), .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
.resources = timberdale_xiic_resources, .resources = timberdale_xiic_resources,
.mfd_data = &timberdale_xiic_platform_data, .platform_data = &timberdale_xiic_platform_data,
.pdata_size = sizeof(timberdale_xiic_platform_data),
}, },
{ {
.name = "timb-gpio", .name = "timb-gpio",
.num_resources = ARRAY_SIZE(timberdale_gpio_resources), .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
.resources = timberdale_gpio_resources, .resources = timberdale_gpio_resources,
.mfd_data = &timberdale_gpio_platform_data, .platform_data = &timberdale_gpio_platform_data,
.pdata_size = sizeof(timberdale_gpio_platform_data),
}, },
{ {
.name = "timb-mlogicore", .name = "timb-mlogicore",
@ -467,25 +477,29 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
.name = "timb-video", .name = "timb-video",
.num_resources = ARRAY_SIZE(timberdale_video_resources), .num_resources = ARRAY_SIZE(timberdale_video_resources),
.resources = timberdale_video_resources, .resources = timberdale_video_resources,
.mfd_data = &timberdale_video_platform_data, .platform_data = &timberdale_video_platform_data,
.pdata_size = sizeof(timberdale_video_platform_data),
}, },
{ {
.name = "timb-radio", .name = "timb-radio",
.num_resources = ARRAY_SIZE(timberdale_radio_resources), .num_resources = ARRAY_SIZE(timberdale_radio_resources),
.resources = timberdale_radio_resources, .resources = timberdale_radio_resources,
.mfd_data = &timberdale_radio_platform_data, .platform_data = &timberdale_radio_platform_data,
.pdata_size = sizeof(timberdale_radio_platform_data),
}, },
{ {
.name = "xilinx_spi", .name = "xilinx_spi",
.num_resources = ARRAY_SIZE(timberdale_spi_resources), .num_resources = ARRAY_SIZE(timberdale_spi_resources),
.resources = timberdale_spi_resources, .resources = timberdale_spi_resources,
.mfd_data = &timberdale_xspi_platform_data, .platform_data = &timberdale_xspi_platform_data,
.pdata_size = sizeof(timberdale_xspi_platform_data),
}, },
{ {
.name = "ks8842", .name = "ks8842",
.num_resources = ARRAY_SIZE(timberdale_eth_resources), .num_resources = ARRAY_SIZE(timberdale_eth_resources),
.resources = timberdale_eth_resources, .resources = timberdale_eth_resources,
.mfd_data = &timberdale_ks8842_platform_data, .platform_data = &timberdale_ks8842_platform_data,
.pdata_size = sizeof(timberdale_ks8842_platform_data),
}, },
}; };
@ -494,7 +508,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
.name = "timb-dma", .name = "timb-dma",
.num_resources = ARRAY_SIZE(timberdale_dma_resources), .num_resources = ARRAY_SIZE(timberdale_dma_resources),
.resources = timberdale_dma_resources, .resources = timberdale_dma_resources,
.mfd_data = &timb_dma_platform_data, .platform_data = &timb_dma_platform_data,
.pdata_size = sizeof(timb_dma_platform_data),
}, },
{ {
.name = "timb-uart", .name = "timb-uart",
@ -505,31 +520,36 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
.name = "xiic-i2c", .name = "xiic-i2c",
.num_resources = ARRAY_SIZE(timberdale_xiic_resources), .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
.resources = timberdale_xiic_resources, .resources = timberdale_xiic_resources,
.mfd_data = &timberdale_xiic_platform_data, .platform_data = &timberdale_xiic_platform_data,
.pdata_size = sizeof(timberdale_xiic_platform_data),
}, },
{ {
.name = "timb-gpio", .name = "timb-gpio",
.num_resources = ARRAY_SIZE(timberdale_gpio_resources), .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
.resources = timberdale_gpio_resources, .resources = timberdale_gpio_resources,
.mfd_data = &timberdale_gpio_platform_data, .platform_data = &timberdale_gpio_platform_data,
.pdata_size = sizeof(timberdale_gpio_platform_data),
}, },
{ {
.name = "timb-video", .name = "timb-video",
.num_resources = ARRAY_SIZE(timberdale_video_resources), .num_resources = ARRAY_SIZE(timberdale_video_resources),
.resources = timberdale_video_resources, .resources = timberdale_video_resources,
.mfd_data = &timberdale_video_platform_data, .platform_data = &timberdale_video_platform_data,
.pdata_size = sizeof(timberdale_video_platform_data),
}, },
{ {
.name = "timb-radio", .name = "timb-radio",
.num_resources = ARRAY_SIZE(timberdale_radio_resources), .num_resources = ARRAY_SIZE(timberdale_radio_resources),
.resources = timberdale_radio_resources, .resources = timberdale_radio_resources,
.mfd_data = &timberdale_radio_platform_data, .platform_data = &timberdale_radio_platform_data,
.pdata_size = sizeof(timberdale_radio_platform_data),
}, },
{ {
.name = "xilinx_spi", .name = "xilinx_spi",
.num_resources = ARRAY_SIZE(timberdale_spi_resources), .num_resources = ARRAY_SIZE(timberdale_spi_resources),
.resources = timberdale_spi_resources, .resources = timberdale_spi_resources,
.mfd_data = &timberdale_xspi_platform_data, .platform_data = &timberdale_xspi_platform_data,
.pdata_size = sizeof(timberdale_xspi_platform_data),
}, },
}; };
@ -538,7 +558,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
.name = "timb-dma", .name = "timb-dma",
.num_resources = ARRAY_SIZE(timberdale_dma_resources), .num_resources = ARRAY_SIZE(timberdale_dma_resources),
.resources = timberdale_dma_resources, .resources = timberdale_dma_resources,
.mfd_data = &timb_dma_platform_data, .platform_data = &timb_dma_platform_data,
.pdata_size = sizeof(timb_dma_platform_data),
}, },
{ {
.name = "timb-uart", .name = "timb-uart",
@ -549,37 +570,43 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
.name = "ocores-i2c", .name = "ocores-i2c",
.num_resources = ARRAY_SIZE(timberdale_ocores_resources), .num_resources = ARRAY_SIZE(timberdale_ocores_resources),
.resources = timberdale_ocores_resources, .resources = timberdale_ocores_resources,
.mfd_data = &timberdale_ocores_platform_data, .platform_data = &timberdale_ocores_platform_data,
.pdata_size = sizeof(timberdale_ocores_platform_data),
}, },
{ {
.name = "timb-gpio", .name = "timb-gpio",
.num_resources = ARRAY_SIZE(timberdale_gpio_resources), .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
.resources = timberdale_gpio_resources, .resources = timberdale_gpio_resources,
.mfd_data = &timberdale_gpio_platform_data, .platform_data = &timberdale_gpio_platform_data,
.pdata_size = sizeof(timberdale_gpio_platform_data),
}, },
{ {
.name = "timb-video", .name = "timb-video",
.num_resources = ARRAY_SIZE(timberdale_video_resources), .num_resources = ARRAY_SIZE(timberdale_video_resources),
.resources = timberdale_video_resources, .resources = timberdale_video_resources,
.mfd_data = &timberdale_video_platform_data, .platform_data = &timberdale_video_platform_data,
.pdata_size = sizeof(timberdale_video_platform_data),
}, },
{ {
.name = "timb-radio", .name = "timb-radio",
.num_resources = ARRAY_SIZE(timberdale_radio_resources), .num_resources = ARRAY_SIZE(timberdale_radio_resources),
.resources = timberdale_radio_resources, .resources = timberdale_radio_resources,
.mfd_data = &timberdale_radio_platform_data, .platform_data = &timberdale_radio_platform_data,
.pdata_size = sizeof(timberdale_radio_platform_data),
}, },
{ {
.name = "xilinx_spi", .name = "xilinx_spi",
.num_resources = ARRAY_SIZE(timberdale_spi_resources), .num_resources = ARRAY_SIZE(timberdale_spi_resources),
.resources = timberdale_spi_resources, .resources = timberdale_spi_resources,
.mfd_data = &timberdale_xspi_platform_data, .platform_data = &timberdale_xspi_platform_data,
.pdata_size = sizeof(timberdale_xspi_platform_data),
}, },
{ {
.name = "ks8842", .name = "ks8842",
.num_resources = ARRAY_SIZE(timberdale_eth_resources), .num_resources = ARRAY_SIZE(timberdale_eth_resources),
.resources = timberdale_eth_resources, .resources = timberdale_eth_resources,
.mfd_data = &timberdale_ks8842_platform_data, .platform_data = &timberdale_ks8842_platform_data,
.pdata_size = sizeof(timberdale_ks8842_platform_data),
}, },
}; };

3
drivers/net/ks8842.c
View File

@ -26,7 +26,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/core.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
@ -1146,7 +1145,7 @@ static int __devinit ks8842_probe(struct platform_device *pdev)
struct resource *iomem; struct resource *iomem;
struct net_device *netdev; struct net_device *netdev;
struct ks8842_adapter *adapter; struct ks8842_adapter *adapter;
struct ks8842_platform_data *pdata = mfd_get_data(pdev); struct ks8842_platform_data *pdata = pdev->dev.platform_data;
u16 id; u16 id;
unsigned i; unsigned i;

3
drivers/spi/xilinx_spi.c
View File

@ -18,7 +18,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/core.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/spi_bitbang.h> #include <linux/spi/spi_bitbang.h>
#include <linux/spi/xilinx_spi.h> #include <linux/spi/xilinx_spi.h>
@ -471,7 +470,7 @@ static int __devinit xilinx_spi_probe(struct platform_device *dev)
struct spi_master *master; struct spi_master *master;
u8 i; u8 i;
pdata = mfd_get_data(dev); pdata = dev->dev.platform_data;
if (pdata) { if (pdata) {
num_cs = pdata->num_chipselect; num_cs = pdata->num_chipselect;
little_endian = pdata->little_endian; little_endian = pdata->little_endian;