Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 03:11:00 +0000 (20:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 03:11:00 +0000 (20:11 -0700)
* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
  ARM: mach-mxs: fix machines' initializers order
  mmc: mxcmmc: explicitly includes mach/hardware.h
  arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
  arm/imx: remove mx27_setup_weimcs() from mx27.h
  arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
  arm/imx: remove mx31_setup_weimcs() from mx31.h
  ARM: tegra: devices.c should include devices.h
  ARM: tegra: cpu-tegra: unexport two functions
  ARM: tegra: cpu-tegra: sparse type fix
  ARM: tegra: dma: staticify some tables and functions
  ARM: tegra: tegra2_clocks: don't export some tables
  ARM: tegra: tegra_powergate_is_powered should be static
  ARM: tegra: tegra_rtc_read_ms should be static
  ARM: tegra: tegra_init_cache should be static
  ARM: tegra: pcie: 0 -> NULL changes
  ARM: tegra: pcie: include board.h
  ARM: tegra: pcie: don't cast __iomem pointers
  ARM: tegra: tegra2_clocks: 0 -> NULL changes
  ARM: tegra: tegra2_clocks: don't cast __iomem pointers
  ARM: tegra: timer: don't cast __iomem pointers
  ...

Fix up trivial conflicts in
  arch/arm/mach-omap2/Makefile,
  arch/arm/mach-u300/{Makefile.boot,core.c}
  arch/arm/plat-{mxc,omap}/devices.c

16 files changed:
1  2 
arch/arm/Kconfig
arch/arm/include/asm/device.h
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-tegra/cpu-tegra.c
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/Makefile.boot
arch/arm/mach-u300/core.c
arch/arm/plat-mxc/devices.c
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/i2c.c
drivers/gpio/gpio-mxc.c
drivers/mmc/host/mxcmmc.c

Simple merge
index 6615f03f56a551c7baf2251d4d0633aa61ff0a9d,b5c9f5b1f6a374de13b23103985985051f537889..7aa368003b05220cc1f0ba9301a15e5699db2278
@@@ -10,12 -10,14 +10,17 @@@ struct dev_archdata 
  #ifdef CONFIG_DMABOUNCE
        struct dmabounce_device_info *dmabounce;
  #endif
 +#ifdef CONFIG_IOMMU_API
 +      void *iommu; /* private IOMMU data */
 +#endif
  };
  
+ struct omap_device;
  struct pdev_archdata {
+ #ifdef CONFIG_ARCH_OMAP
+       struct omap_device *od;
+ #endif
  };
  
  #endif
Simple merge
Simple merge
index 7317a2b39dd17fbae0b2c54d6cf4d2650e83b214,cd45c045ab8c08d02f383bb1fb6cdc3b9f964292..d7e25379a4b47a2811e9de6d22e2f75c4e83e07d
@@@ -229,24 -217,21 +217,17 @@@ obj-$(CONFIG_MACH_OMAP_ZOOM3)           += board
                                           board-zoom-debugboard.o
  obj-$(CONFIG_MACH_OMAP_3630SDP)               += board-3630sdp.o \
                                           board-zoom-peripherals.o \
-                                          board-zoom-display.o \
-                                          board-flash.o \
-                                          hsmmc.o
- obj-$(CONFIG_MACH_CM_T35)             += board-cm-t35.o \
-                                          hsmmc.o
+                                          board-zoom-display.o
+ obj-$(CONFIG_MACH_CM_T35)             += board-cm-t35.o
  obj-$(CONFIG_MACH_CM_T3517)           += board-cm-t3517.o
- obj-$(CONFIG_MACH_IGEP0020)           += board-igep0020.o \
-                                          hsmmc.o
- obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)    += board-omap3touchbook.o \
-                                          hsmmc.o
- obj-$(CONFIG_MACH_OMAP_4430SDP)               += board-4430sdp.o \
-                                          hsmmc.o
- obj-$(CONFIG_MACH_OMAP4_PANDA)                += board-omap4panda.o \
-                                          hsmmc.o
+ obj-$(CONFIG_MACH_IGEP0020)           += board-igep0020.o
+ obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)    += board-omap3touchbook.o
 -obj-$(CONFIG_MACH_OMAP_4430SDP)               += board-4430sdp.o \
 -                                         omap_phy_internal.o
 -obj-$(CONFIG_MACH_OMAP4_PANDA)                += board-omap4panda.o \
 -                                         omap_phy_internal.o
++obj-$(CONFIG_MACH_OMAP_4430SDP)               += board-4430sdp.o
++obj-$(CONFIG_MACH_OMAP4_PANDA)                += board-omap4panda.o
 -obj-$(CONFIG_MACH_PCM049)             += board-omap4pcm049.o \
 -                                         omap_phy_internal.o
++obj-$(CONFIG_MACH_PCM049)             += board-omap4pcm049.o
  
 -obj-$(CONFIG_MACH_OMAP3517EVM)                += board-am3517evm.o \
 -                                         omap_phy_internal.o
 +obj-$(CONFIG_MACH_OMAP3517EVM)                += board-am3517evm.o
  
  obj-$(CONFIG_MACH_CRANEBOARD)         += board-am3517crane.o
  
Simple merge
Simple merge
Simple merge
index 69357affbd77f9eb2799ee4b16fadbf2b382ae28,a06bb0deadfe2f2a39eeddbc2cd4937184d4b626..87811de0bd947cb4b516f54185e71b745562dc22
@@@ -1,15 -1,4 +1,4 @@@
- # Note: the following conditions must always be true:
- #   ZRELADDR == virt_to_phys(TEXTADDR)
- #   PARAMS_PHYS must be within 4MB of ZRELADDR
- #   INITRD_PHYS must be in RAM
- ifdef CONFIG_MACH_U300_SINGLE_RAM
-      zreladdr-y       += 0x28E08000
-   params_phys-y       := 0x28E00100
- else
-      zreladdr-y       += 0x48008000
-   params_phys-y       := 0x48000100
- endif
 -   zreladdr-y := 0x48008000
++   zreladdr-y += 0x48008000
+ params_phys-y := 0x48000100
  # This isn't used.
- #initrd_phys-y        := 0x29800000
+ #initrd_phys-y        := 0x48800000
index f4ad6d2e26f3d30d635e4c9a2c8378a69a6170d8,2f1d758133a77108cb786434f937f86da1583079..ac0791e924bc06666f4644358d94606b1295641d
@@@ -1747,8 -1600,6 +1676,7 @@@ static struct platform_device *platform
        &gpio_device,
        &nand_device,
        &wdog_device,
-       &ave_device,
 +      &pinmux_device,
  };
  
  /*
index a34b2ae895f2954a9622ff121e862d0346c8f16b,5aaa8c5f3420a18cf351972cddcdef5664eec529..4d55a7a26e98fd92a1bda89dd5f266864c0ed55f
  #include <linux/platform_device.h>
  #include <mach/common.h>
  
- int __init mxc_register_device(struct platform_device *pdev, void *data)
 -struct platform_device *__init imx_add_platform_device_dmamask(
 -              const char *name, int id,
 -              const struct resource *res, unsigned int num_resources,
 -              const void *data, size_t size_data, u64 dmamask)
--{
-       int ret;
 -      int ret = -ENOMEM;
 -      struct platform_device *pdev;
--
-       pdev->dev.platform_data = data;
 -      pdev = platform_device_alloc(name, id);
 -      if (!pdev)
 -              goto err;
--
-       ret = platform_device_register(pdev);
-       if (ret)
-               pr_debug("Unable to register platform device '%s': %d\n",
-                        pdev->name, ret);
 -      if (dmamask) {
 -              /*
 -               * This memory isn't freed when the device is put,
 -               * I don't have a nice idea for that though.  Conceptually
 -               * dma_mask in struct device should not be a pointer.
 -               * See http://thread.gmane.org/gmane.linux.kernel.pci/9081
 -               */
 -              pdev->dev.dma_mask =
 -                      kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
 -              if (!pdev->dev.dma_mask)
 -                      /* ret is still -ENOMEM; */
 -                      goto err;
--
-       return ret;
 -              *pdev->dev.dma_mask = dmamask;
 -              pdev->dev.coherent_dma_mask = dmamask;
 -      }
 -
 -      if (res) {
 -              ret = platform_device_add_resources(pdev, res, num_resources);
 -              if (ret)
 -                      goto err;
 -      }
 -
 -      if (data) {
 -              ret = platform_device_add_data(pdev, data, size_data);
 -              if (ret)
 -                      goto err;
 -      }
 -
 -      ret = platform_device_add(pdev);
 -      if (ret) {
 -err:
 -              if (dmamask)
 -                      kfree(pdev->dev.dma_mask);
 -              platform_device_put(pdev);
 -              return ERR_PTR(ret);
 -      }
 -
 -      return pdev;
--}
--
  struct device mxc_aips_bus = {
        .init_name      = "mxc_aips",
        .parent         = &platform_bus,
index c46c47afa090cd636ae03932d97f3b005ab4072d,acd132c296473b839964e2211a50f368baabd39d..19719329a47b0fb96a4b75e42f8103f505c00c84
  #include <plat/board.h>
  #include <plat/mmc.h>
  #include <plat/menelaus.h>
- #include <plat/mcbsp.h>
  #include <plat/omap44xx.h>
  
- /*-------------------------------------------------------------------------*/
 -#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
 -              defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
--
- #if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
 -static struct resource mcpdm_resources[] = {
 -      {
 -              .name           = "mcpdm_mem",
 -              .start          = OMAP44XX_MCPDM_BASE,
 -              .end            = OMAP44XX_MCPDM_BASE + SZ_4K,
 -              .flags          = IORESOURCE_MEM,
 -      },
 -      {
 -              .name           = "mcpdm_irq",
 -              .start          = OMAP44XX_IRQ_MCPDM,
 -              .end            = OMAP44XX_IRQ_MCPDM,
 -              .flags          = IORESOURCE_IRQ,
 -      },
 -};
--
- static struct platform_device **omap_mcbsp_devices;
 -static struct platform_device omap_mcpdm_device = {
 -      .name           = "omap-mcpdm",
 -      .id             = -1,
 -      .num_resources  = ARRAY_SIZE(mcpdm_resources),
 -      .resource       = mcpdm_resources,
 -};
--
- void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
-                       struct omap_mcbsp_platform_data *config, int size)
 -static void omap_init_mcpdm(void)
--{
-       int i;
-       omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
-                                    GFP_KERNEL);
-       if (!omap_mcbsp_devices) {
-               printk(KERN_ERR "Could not register McBSP devices\n");
-               return;
-       }
-       for (i = 0; i < size; i++) {
-               struct platform_device *new_mcbsp;
-               int ret;
-               new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);
-               if (!new_mcbsp)
-                       continue;
-               platform_device_add_resources(new_mcbsp, &res[i * res_count],
-                                       res_count);
-               new_mcbsp->dev.platform_data = &config[i];
-               ret = platform_device_add(new_mcbsp);
-               if (ret) {
-                       platform_device_put(new_mcbsp);
-                       continue;
-               }
-               omap_mcbsp_devices[i] = new_mcbsp;
-       }
 -      (void) platform_device_register(&omap_mcpdm_device);
--}
--#else
- void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
-                       struct omap_mcbsp_platform_data *config, int size)
- {  }
 -static inline void omap_init_mcpdm(void) {}
--#endif
--
--/*-------------------------------------------------------------------------*/
--
  #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
        defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
  
index 2388b8eebaaada9bfabbcc3369e90bcef9285b40,0c7caf2458b4c9df0a527a1ca71abb0ffc16c2d7..a162b2c2ae15b9d316e12b858e47bc6f10d787f5
@@@ -151,10 -135,9 +151,10 @@@ static inline int omap2_i2c_add_bus(in
  {
        int l;
        struct omap_hwmod *oh;
-       struct omap_device *od;
+       struct platform_device *pdev;
        char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN];
        struct omap_i2c_bus_platform_data *pdata;
 +      struct omap_i2c_dev_attr *dev_attr;
  
        omap2_i2c_mux_pins(bus_id);
  
index 82f7b65baf7216a337b44ba46af2a956cde6cdb8,b588f8a41e601dfae772ee53570eec068bf5e78c..b81c989921141fc2fc1f457d62ed23a2f1d3ad7d
  #include <linux/of.h>
  #include <linux/of_device.h>
  #include <asm-generic/bug.h>
 +#include <asm/mach/irq.h>
  
+ #define irq_to_gpio(irq)      ((irq) - MXC_GPIO_IRQ_START)
  enum mxc_gpio_hwtype {
        IMX1_GPIO,      /* runs on i.mx1 */
        IMX21_GPIO,     /* runs on i.mx21 and i.mx27 */
Simple merge