diff options
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/atmel-sdramc.c | 1 | ||||
| -rw-r--r-- | drivers/memory/fsl-corenet-cf.c | 1 | ||||
| -rw-r--r-- | drivers/memory/fsl_ifc.c | 13 | ||||
| -rw-r--r-- | drivers/memory/mvebu-devbus.c | 1 | ||||
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 1 | ||||
| -rw-r--r-- | drivers/memory/tegra20-mc.c | 1 | ||||
| -rw-r--r-- | drivers/memory/ti-aemif.c | 1 |
7 files changed, 11 insertions, 8 deletions
diff --git a/drivers/memory/atmel-sdramc.c b/drivers/memory/atmel-sdramc.c index fed04e8efe75..a3ebc8a87479 100644 --- a/drivers/memory/atmel-sdramc.c +++ b/drivers/memory/atmel-sdramc.c @@ -82,7 +82,6 @@ static struct platform_driver atmel_ramc_driver = { .probe = atmel_ramc_probe, .driver = { .name = "atmel-ramc", - .owner = THIS_MODULE, .of_match_table = atmel_ramc_of_match, }, }; diff --git a/drivers/memory/fsl-corenet-cf.c b/drivers/memory/fsl-corenet-cf.c index c9443fc136db..fc7ab5a3561e 100644 --- a/drivers/memory/fsl-corenet-cf.c +++ b/drivers/memory/fsl-corenet-cf.c @@ -237,7 +237,6 @@ static int ccf_remove(struct platform_device *pdev) static struct platform_driver ccf_driver = { .driver = { .name = KBUILD_MODNAME, - .owner = THIS_MODULE, .of_match_table = ccf_matches, }, .probe = ccf_probe, diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c index 3d5d792d5cb2..410c39749872 100644 --- a/drivers/memory/fsl_ifc.c +++ b/drivers/memory/fsl_ifc.c @@ -61,7 +61,7 @@ int fsl_ifc_find(phys_addr_t addr_base) if (!fsl_ifc_ctrl_dev || !fsl_ifc_ctrl_dev->regs) return -ENODEV; - for (i = 0; i < ARRAY_SIZE(fsl_ifc_ctrl_dev->regs->cspr_cs); i++) { + for (i = 0; i < fsl_ifc_ctrl_dev->banks; i++) { u32 cspr = in_be32(&fsl_ifc_ctrl_dev->regs->cspr_cs[i].cspr); if (cspr & CSPR_V && (cspr & CSPR_BA) == convert_ifc_address(addr_base)) @@ -213,7 +213,7 @@ static irqreturn_t fsl_ifc_ctrl_irq(int irqno, void *data) static int fsl_ifc_ctrl_probe(struct platform_device *dev) { int ret = 0; - + int version, banks; dev_info(&dev->dev, "Freescale Integrated Flash Controller\n"); @@ -231,6 +231,15 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) goto err; } + version = ioread32be(&fsl_ifc_ctrl_dev->regs->ifc_rev) & + FSL_IFC_VERSION_MASK; + banks = (version == FSL_IFC_VERSION_1_0_0) ? 4 : 8; + dev_info(&dev->dev, "IFC version %d.%d, %d banks\n", + version >> 24, (version >> 16) & 0xf, banks); + + fsl_ifc_ctrl_dev->version = version; + fsl_ifc_ctrl_dev->banks = banks; + /* get the Controller level irq */ fsl_ifc_ctrl_dev->irq = irq_of_parse_and_map(dev->dev.of_node, 0); if (fsl_ifc_ctrl_dev->irq == NO_IRQ) { diff --git a/drivers/memory/mvebu-devbus.c b/drivers/memory/mvebu-devbus.c index ff7138fd66d1..24852812fd44 100644 --- a/drivers/memory/mvebu-devbus.c +++ b/drivers/memory/mvebu-devbus.c @@ -346,7 +346,6 @@ static struct platform_driver mvebu_devbus_driver = { .probe = mvebu_devbus_probe, .driver = { .name = "mvebu-devbus", - .owner = THIS_MODULE, .of_match_table = mvebu_devbus_of_match, }, }; diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index ffc5e60c0664..24696f59215b 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -1987,7 +1987,6 @@ static struct platform_driver gpmc_driver = { .remove = gpmc_remove, .driver = { .name = DEVICE_NAME, - .owner = THIS_MODULE, .of_match_table = of_match_ptr(gpmc_dt_ids), .pm = &gpmc_pm_ops, }, diff --git a/drivers/memory/tegra20-mc.c b/drivers/memory/tegra20-mc.c index 7cd82b874abd..cc309a05289a 100644 --- a/drivers/memory/tegra20-mc.c +++ b/drivers/memory/tegra20-mc.c @@ -243,7 +243,6 @@ static struct platform_driver tegra20_mc_driver = { .probe = tegra20_mc_probe, .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = tegra20_mc_of_match, }, }; diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c index d3df7602f406..ca7d97a9a9ba 100644 --- a/drivers/memory/ti-aemif.c +++ b/drivers/memory/ti-aemif.c @@ -413,7 +413,6 @@ static struct platform_driver aemif_driver = { .remove = aemif_remove, .driver = { .name = KBUILD_MODNAME, - .owner = THIS_MODULE, .of_match_table = of_match_ptr(aemif_of_match), }, }; |