Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC specific changes from Arnd Bergmann: "These changes are all to SoC-specific code, a total of 33 branches on 17 platforms were pulled into this. Like last time, Renesas sh-mobile is now the platform with the most changes, followed by OMAP and EXYNOS. Two new platforms, TI Keystone and Rockchips RK3xxx are added in this branch, both containing almost no platform specific code at all, since they are using generic subsystem interfaces for clocks, pinctrl, interrupts etc. The device drivers are getting merged through the respective subsystem maintainer trees. One more SoC (u300) is now multiplatform capable and several others (shmobile, exynos, msm, integrator, kirkwood, clps711x) are moving towards that goal with this series but need more work. Also noteworthy is the work on PCI here, which is traditionally part of the SoC specific code. With the changes done by Thomas Petazzoni, we can now more easily have PCI host controller drivers as loadable modules and keep them separate from the platform code in drivers/pci/host. This has already led to the discovery that three platforms (exynos, spear and imx) are actually using an identical PCIe host controller and will be able to share a driver once support for spear and imx is added." * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (480 commits) ARM: integrator: let pciv3 use mem/premem from device tree ARM: integrator: set local side PCI addresses right ARM: dts: Add pcie controller node for exynos5440-ssdk5440 ARM: dts: Add pcie controller node for Samsung EXYNOS5440 SoC ARM: EXYNOS: Enable PCIe support for Exynos5440 pci: Add PCIe driver for Samsung Exynos ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data ARM: keystone: Move CPU bringup code to dedicated asm file ARM: multiplatform: always pick one CPU type ARM: imx: select syscon for IMX6SL ARM: keystone: select ARM_ERRATA_798181 only for SMP ARM: imx: Synertronixx scb9328 needs to select SOC_IMX1 ARM: OMAP2+: AM43x: resolve SMP related build error dmaengine: edma: enable build for AM33XX ARM: edma: Add EDMA crossbar event mux support ARM: edma: Add DT and runtime PM support to the private EDMA API dmaengine: edma: Add TI EDMA device tree binding arm: add basic support for Rockchip RK3066a boards arm: add debug uarts for rockchip rk29xx and rk3xxx series arm: Add basic clocks for Rockchip rk3066a SoCs ...
This commit is contained in:
Linus Torvalds
@@ -297,13 +297,6 @@ config MTD_IXP4XX
|
||||
IXDP425 and Coyote. If you have an IXP4xx based board and
|
||||
would like to use the flash chips on it, say 'Y'.
|
||||
|
||||
config MTD_AUTCPU12
|
||||
bool "NV-RAM mapping AUTCPU12 board"
|
||||
depends on ARCH_AUTCPU12
|
||||
help
|
||||
This enables access to the NV-RAM on autronix autcpu12 board.
|
||||
If you have such a board, say 'Y'.
|
||||
|
||||
config MTD_IMPA7
|
||||
tristate "JEDEC Flash device mapped on impA7"
|
||||
depends on ARM && MTD_JEDECPROBE
|
||||
|
||||
@@ -32,7 +32,6 @@ obj-$(CONFIG_MTD_VMAX) += vmax301.o
|
||||
obj-$(CONFIG_MTD_SCx200_DOCFLASH)+= scx200_docflash.o
|
||||
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
|
||||
obj-$(CONFIG_MTD_PCI) += pci.o
|
||||
obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o
|
||||
obj-$(CONFIG_MTD_IMPA7) += impa7.o
|
||||
obj-$(CONFIG_MTD_UCLINUX) += uclinux.o
|
||||
obj-$(CONFIG_MTD_NETtel) += nettel.o
|
||||
|
||||
@@ -1,129 +0,0 @@
|
||||
/*
|
||||
* NV-RAM memory access on autcpu12
|
||||
* (C) 2002 Thomas Gleixner (gleixner@autronix.de)
|
||||
*
|
||||
* 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; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#include <linux/err.h>
|
||||
#include <linux/sizes.h>
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/map.h>
|
||||
|
||||
struct autcpu12_nvram_priv {
|
||||
struct mtd_info *mtd;
|
||||
struct map_info map;
|
||||
};
|
||||
|
||||
static int autcpu12_nvram_probe(struct platform_device *pdev)
|
||||
{
|
||||
map_word tmp, save0, save1;
|
||||
struct resource *res;
|
||||
struct autcpu12_nvram_priv *priv;
|
||||
|
||||
priv = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct autcpu12_nvram_priv), GFP_KERNEL);
|
||||
if (!priv)
|
||||
return -ENOMEM;
|
||||
|
||||
platform_set_drvdata(pdev, priv);
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
dev_err(&pdev->dev, "failed to get memory resource\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
priv->map.bankwidth = 4;
|
||||
priv->map.phys = res->start;
|
||||
priv->map.size = resource_size(res);
|
||||
priv->map.virt = devm_ioremap_resource(&pdev->dev, res);
|
||||
strcpy((char *)priv->map.name, res->name);
|
||||
if (IS_ERR(priv->map.virt))
|
||||
return PTR_ERR(priv->map.virt);
|
||||
|
||||
simple_map_init(&priv->map);
|
||||
|
||||
/*
|
||||
* Check for 32K/128K
|
||||
* read ofs 0
|
||||
* read ofs 0x10000
|
||||
* Write complement to ofs 0x100000
|
||||
* Read and check result on ofs 0x0
|
||||
* Restore contents
|
||||
*/
|
||||
save0 = map_read(&priv->map, 0);
|
||||
save1 = map_read(&priv->map, 0x10000);
|
||||
tmp.x[0] = ~save0.x[0];
|
||||
map_write(&priv->map, tmp, 0x10000);
|
||||
tmp = map_read(&priv->map, 0);
|
||||
/* if we find this pattern on 0x0, we have 32K size */
|
||||
if (!map_word_equal(&priv->map, tmp, save0)) {
|
||||
map_write(&priv->map, save0, 0x0);
|
||||
priv->map.size = SZ_32K;
|
||||
} else
|
||||
map_write(&priv->map, save1, 0x10000);
|
||||
|
||||
priv->mtd = do_map_probe("map_ram", &priv->map);
|
||||
if (!priv->mtd) {
|
||||
dev_err(&pdev->dev, "probing failed\n");
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
priv->mtd->owner = THIS_MODULE;
|
||||
priv->mtd->erasesize = 16;
|
||||
priv->mtd->dev.parent = &pdev->dev;
|
||||
if (!mtd_device_register(priv->mtd, NULL, 0)) {
|
||||
dev_info(&pdev->dev,
|
||||
"NV-RAM device size %ldKiB registered on AUTCPU12\n",
|
||||
priv->map.size / SZ_1K);
|
||||
return 0;
|
||||
}
|
||||
|
||||
map_destroy(priv->mtd);
|
||||
dev_err(&pdev->dev, "NV-RAM device addition failed\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
static int autcpu12_nvram_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct autcpu12_nvram_priv *priv = platform_get_drvdata(pdev);
|
||||
|
||||
mtd_device_unregister(priv->mtd);
|
||||
map_destroy(priv->mtd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver autcpu12_nvram_driver = {
|
||||
.driver = {
|
||||
.name = "autcpu12_nvram",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = autcpu12_nvram_probe,
|
||||
.remove = autcpu12_nvram_remove,
|
||||
};
|
||||
module_platform_driver(autcpu12_nvram_driver);
|
||||
|
||||
MODULE_AUTHOR("Thomas Gleixner");
|
||||
MODULE_DESCRIPTION("autcpu12 NVRAM map driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
Reference in New Issue
Block a user