From: Olof Johansson <olof@lixom.net>
Date: Tue, 6 Nov 2012 15:51:06 +0000 (-0800)
Subject: Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=66267ee58732bb4c21c7bbba004ee481b8ad2b30;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup

From Michal Simek:

* 'arm-next' of git://git.xilinx.com/linux-xlnx:
  zynq: move static peripheral mappings
  zynq: remove use of CLKDEV_LOOKUP
  zynq: use pl310 device tree bindings
  zynq: use GIC device tree bindings
  + Linux 3.7-rc3
---

66267ee58732bb4c21c7bbba004ee481b8ad2b30
diff --cc arch/arm/Makefile
index 451757d85ee3,554cfac41429..97252d86a701
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -195,9 -196,9 +196,8 @@@ machine-$(CONFIG_ARCH_ZYNQ)		+= zyn
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
 -plat-$(CONFIG_ARCH_MXC)		+= mxc
  plat-$(CONFIG_ARCH_OMAP)	+= omap
  plat-$(CONFIG_ARCH_S3C64XX)	+= samsung
- plat-$(CONFIG_ARCH_ZYNQ)	+= versatile
  plat-$(CONFIG_PLAT_IOP)		+= iop
  plat-$(CONFIG_PLAT_NOMADIK)	+= nomadik
  plat-$(CONFIG_PLAT_ORION)	+= orion
diff --cc arch/arm/mach-imx/devices/platform-mxc-mmc.c
index 7da19afa1bba,000000000000..b8203c760c8f
mode 100644,000000..100644
--- a/arch/arm/mach-imx/devices/platform-mxc-mmc.c
+++ b/arch/arm/mach-imx/devices/platform-mxc-mmc.c
@@@ -1,75 -1,0 +1,75 @@@
 +/*
 + * Copyright (C) 2010 Pengutronix
 + * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
 + *
 + * This program is free software; you can redistribute it and/or modify it under
 + * the terms of the GNU General Public License version 2 as published by the
 + * Free Software Foundation.
 + */
 +#include <linux/dma-mapping.h>
 +
 +#include "../hardware.h"
 +#include "devices-common.h"
 +
 +#define imx_mxc_mmc_data_entry_single(soc, _devid, _id, _hwid, _size)	\
 +	{								\
 +		.devid = _devid,					\
 +		.id = _id,						\
 +		.iobase = soc ## _SDHC ## _hwid ## _BASE_ADDR,		\
 +		.iosize = _size,					\
 +		.irq = soc ## _INT_SDHC ## _hwid,			\
 +		.dmareq = soc ## _DMA_REQ_SDHC ## _hwid,		\
 +	}
 +#define imx_mxc_mmc_data_entry(soc, _devid, _id, _hwid, _size)		\
 +	[_id] = imx_mxc_mmc_data_entry_single(soc, _devid, _id, _hwid, _size)
 +
 +#ifdef CONFIG_SOC_IMX21
 +const struct imx_mxc_mmc_data imx21_mxc_mmc_data[] __initconst = {
 +#define imx21_mxc_mmc_data_entry(_id, _hwid)				\
 +	imx_mxc_mmc_data_entry(MX21, "imx21-mmc", _id, _hwid, SZ_4K)
 +	imx21_mxc_mmc_data_entry(0, 1),
 +	imx21_mxc_mmc_data_entry(1, 2),
 +};
 +#endif /* ifdef CONFIG_SOC_IMX21 */
 +
 +#ifdef CONFIG_SOC_IMX27
 +const struct imx_mxc_mmc_data imx27_mxc_mmc_data[] __initconst = {
 +#define imx27_mxc_mmc_data_entry(_id, _hwid)				\
 +	imx_mxc_mmc_data_entry(MX27, "imx21-mmc", _id, _hwid, SZ_4K)
 +	imx27_mxc_mmc_data_entry(0, 1),
 +	imx27_mxc_mmc_data_entry(1, 2),
 +};
 +#endif /* ifdef CONFIG_SOC_IMX27 */
 +
 +#ifdef CONFIG_SOC_IMX31
 +const struct imx_mxc_mmc_data imx31_mxc_mmc_data[] __initconst = {
 +#define imx31_mxc_mmc_data_entry(_id, _hwid)				\
 +	imx_mxc_mmc_data_entry(MX31, "imx31-mmc", _id, _hwid, SZ_16K)
 +	imx31_mxc_mmc_data_entry(0, 1),
 +	imx31_mxc_mmc_data_entry(1, 2),
 +};
 +#endif /* ifdef CONFIG_SOC_IMX31 */
 +
 +struct platform_device *__init imx_add_mxc_mmc(
 +		const struct imx_mxc_mmc_data *data,
 +		const struct imxmmc_platform_data *pdata)
 +{
 +	struct resource res[] = {
 +		{
 +			.start = data->iobase,
- 			.end = data->iobase + SZ_4K - 1,
++			.end = data->iobase + data->iosize - 1,
 +			.flags = IORESOURCE_MEM,
 +		}, {
 +			.start = data->irq,
 +			.end = data->irq,
 +			.flags = IORESOURCE_IRQ,
 +		}, {
 +			.start = data->dmareq,
 +			.end = data->dmareq,
 +			.flags = IORESOURCE_DMA,
 +		},
 +	};
 +	return imx_add_platform_device_dmamask(data->devid, data->id,
 +			res, ARRAY_SIZE(res),
 +			pdata, sizeof(*pdata), DMA_BIT_MASK(32));
 +}