Merge branch 'next/cleanup' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:15:02 +0000 (14:15 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:15:02 +0000 (14:15 -0700)
Conflicts:
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/w1/masters/omap_hdq.c

36 files changed:
1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/kernel/bios32.c
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-msm/io.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/gpio.c
arch/arm/mach-omap2/omap-wakeupgen.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_phy_internal.c
arch/arm/mach-omap2/twl-common.c
arch/arm/mach-omap2/usb-musb.c
arch/arm/mach-orion5x/common.c
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb1176.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-realview/realview_pba8.c
arch/arm/mach-realview/realview_pbx.c
arch/arm/mach-shmobile/board-kzm9g.c
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/pcie.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/plat-samsung/devs.c
drivers/gpio/gpio-omap.c
drivers/mmc/host/omap_hsmmc.c
drivers/spi/spi-omap2-mcspi.c
drivers/staging/tidspbridge/core/dsp-clock.c
drivers/staging/tidspbridge/core/tiomap3430.c
drivers/staging/tidspbridge/core/tiomap3430_pwr.c
drivers/staging/tidspbridge/core/wdt.c
drivers/staging/tidspbridge/rmgr/drv_interface.c
drivers/usb/Kconfig
drivers/usb/host/Kconfig
drivers/usb/host/ohci-nxp.c
drivers/usb/musb/tusb6010_omap.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
index af43f6acd7fc30c99467cc99034840719e743bdb,97042331cfc7a09b2b7d648344d68bf7f87c9bbd..3cb4f4c357106ac9a535f2fc6d8e46ec0191ec0d
                .virtual = (unsigned long) MSM_##name##_BASE, \
                .pfn = __phys_to_pfn(chip##_##name##_PHYS), \
                .length = chip##_##name##_SIZE, \
 -              .type = MT_DEVICE_NONSHARED, \
 +              .type = mem_type, \
         }
  
 +#define MSM_DEVICE_TYPE(name, mem_type) \
 +              MSM_CHIP_DEVICE_TYPE(name, MSM, mem_type)
 +#define MSM_CHIP_DEVICE(name, chip) \
 +              MSM_CHIP_DEVICE_TYPE(name, chip, MT_DEVICE)
  #define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM)
  
- #if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \
-       || defined(CONFIG_ARCH_MSM7X25)
+ #if defined(CONFIG_ARCH_MSM7X00A)
  static struct map_desc msm_io_desc[] __initdata = {
 -      MSM_DEVICE(VIC),
 -      MSM_CHIP_DEVICE(CSR, MSM7X00),
 -      MSM_DEVICE(DMOV),
 -      MSM_CHIP_DEVICE(GPIO1, MSM7X00),
 -      MSM_CHIP_DEVICE(GPIO2, MSM7X00),
 -      MSM_DEVICE(CLK_CTL),
 +      MSM_DEVICE_TYPE(VIC, MT_DEVICE_NONSHARED),
 +      MSM_CHIP_DEVICE_TYPE(CSR, MSM7X00, MT_DEVICE_NONSHARED),
 +      MSM_DEVICE_TYPE(DMOV, MT_DEVICE_NONSHARED),
 +      MSM_CHIP_DEVICE_TYPE(GPIO1, MSM7X00, MT_DEVICE_NONSHARED),
 +      MSM_CHIP_DEVICE_TYPE(GPIO2, MSM7X00, MT_DEVICE_NONSHARED),
 +      MSM_DEVICE_TYPE(CLK_CTL, MT_DEVICE_NONSHARED),
  #if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
        defined(CONFIG_DEBUG_MSM_UART3)
 -      MSM_DEVICE(DEBUG_UART),
 -#endif
 -#ifdef CONFIG_ARCH_MSM7X30
 -      MSM_DEVICE(GCC),
 +      MSM_DEVICE_TYPE(DEBUG_UART, MT_DEVICE_NONSHARED),
  #endif
        {
                .virtual =  (unsigned long) MSM_SHARED_RAM_BASE,
Simple merge
Simple merge
Simple merge
index 874aecc0facab5fe4e6384eeee30801e3a699967,593eaea35cecc66effd7559e11fdcf3f0f1d2413..d992db8ff0b07481fe21f24b410f9771dd3cda83
  #include <linux/usb.h>
  
  #include <plat/usb.h>
+ #include "soc.h"
  #include "control.h"
  
 -/* OMAP control module register for UTMI PHY */
 -#define CONTROL_DEV_CONF              0x300
 -#define PHY_PD                                0x1
 -
 -#define USBOTGHS_CONTROL              0x33c
 -#define       AVALID                          BIT(0)
 -#define       BVALID                          BIT(1)
 -#define       VBUSVALID                       BIT(2)
 -#define       SESSEND                         BIT(3)
 -#define       IDDIG                           BIT(4)
 -
 -static struct clk *phyclk, *clk48m, *clk32k;
 -static void __iomem *ctrl_base;
 -static int usbotghs_control;
 -
 -int omap4430_phy_init(struct device *dev)
 -{
 -      ctrl_base = ioremap(OMAP443X_SCM_BASE, SZ_1K);
 -      if (!ctrl_base) {
 -              pr_err("control module ioremap failed\n");
 -              return -ENOMEM;
 -      }
 -      /* Power down the phy */
 -      __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF);
 -
 -      if (!dev) {
 -              iounmap(ctrl_base);
 -              return 0;
 -      }
 -
 -      phyclk = clk_get(dev, "ocp2scp_usb_phy_ick");
 -      if (IS_ERR(phyclk)) {
 -              dev_err(dev, "cannot clk_get ocp2scp_usb_phy_ick\n");
 -              iounmap(ctrl_base);
 -              return PTR_ERR(phyclk);
 -      }
 -
 -      clk48m = clk_get(dev, "ocp2scp_usb_phy_phy_48m");
 -      if (IS_ERR(clk48m)) {
 -              dev_err(dev, "cannot clk_get ocp2scp_usb_phy_phy_48m\n");
 -              clk_put(phyclk);
 -              iounmap(ctrl_base);
 -              return PTR_ERR(clk48m);
 -      }
 -
 -      clk32k = clk_get(dev, "usb_phy_cm_clk32k");
 -      if (IS_ERR(clk32k)) {
 -              dev_err(dev, "cannot clk_get usb_phy_cm_clk32k\n");
 -              clk_put(phyclk);
 -              clk_put(clk48m);
 -              iounmap(ctrl_base);
 -              return PTR_ERR(clk32k);
 -      }
 -      return 0;
 -}
 -
 -int omap4430_phy_set_clk(struct device *dev, int on)
 -{
 -      static int state;
 -
 -      if (on && !state) {
 -              /* Enable the phy clocks */
 -              clk_enable(phyclk);
 -              clk_enable(clk48m);
 -              clk_enable(clk32k);
 -              state = 1;
 -      } else if (state) {
 -              /* Disable the phy clocks */
 -              clk_disable(phyclk);
 -              clk_disable(clk48m);
 -              clk_disable(clk32k);
 -              state = 0;
 -      }
 -      return 0;
 -}
 -
 -int omap4430_phy_power(struct device *dev, int ID, int on)
 -{
 -      if (on) {
 -              if (ID)
 -                      /* enable VBUS valid, IDDIG groung */
 -                      __raw_writel(AVALID | VBUSVALID, ctrl_base +
 -                                                      USBOTGHS_CONTROL);
 -              else
 -                      /*
 -                       * Enable VBUS Valid, AValid and IDDIG
 -                       * high impedance
 -                       */
 -                      __raw_writel(IDDIG | AVALID | VBUSVALID,
 -                                              ctrl_base + USBOTGHS_CONTROL);
 -      } else {
 -              /* Enable session END and IDIG to high impedance. */
 -              __raw_writel(SESSEND | IDDIG, ctrl_base +
 -                                      USBOTGHS_CONTROL);
 -      }
 -      return 0;
 -}
 -
 -int omap4430_phy_suspend(struct device *dev, int suspend)
 -{
 -      if (suspend) {
 -              /* Disable the clocks */
 -              omap4430_phy_set_clk(dev, 0);
 -              /* Power down the phy */
 -              __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF);
 -
 -              /* save the context */
 -              usbotghs_control = __raw_readl(ctrl_base + USBOTGHS_CONTROL);
 -      } else {
 -              /* Enable the internel phy clcoks */
 -              omap4430_phy_set_clk(dev, 1);
 -              /* power on the phy */
 -              if (__raw_readl(ctrl_base + CONTROL_DEV_CONF) & PHY_PD) {
 -                      __raw_writel(~PHY_PD, ctrl_base + CONTROL_DEV_CONF);
 -                      mdelay(200);
 -              }
 -
 -              /* restore the context */
 -              __raw_writel(usbotghs_control, ctrl_base + USBOTGHS_CONTROL);
 -      }
 -
 -      return 0;
 -}
 -
 -int omap4430_phy_exit(struct device *dev)
 -{
 -      if (ctrl_base)
 -              iounmap(ctrl_base);
 -      if (phyclk)
 -              clk_put(phyclk);
 -      if (clk48m)
 -              clk_put(clk48m);
 -      if (clk32k)
 -              clk_put(clk32k);
 -
 -      return 0;
 -}
 -
  void am35x_musb_reset(void)
  {
        u32     regval;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0e82b7f34fc1464ab3951e6f1f8f8bf018ba5d1f,0974ace4555824ac6a426cf7eb2dadf23f13b35a..191d973122a5503a4c84f12b171d6de7a2c0278f
@@@ -18,9 -18,9 +18,8 @@@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += teg
  obj-$(CONFIG_SMP)                     += platsmp.o headsmp.o
  obj-$(CONFIG_SMP)                       += reset.o
  obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
- obj-$(CONFIG_TEGRA_SYSTEM_DMA)                += dma.o
  obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
  obj-$(CONFIG_TEGRA_PCI)                       += pcie.o
 -obj-$(CONFIG_USB_SUPPORT)             += usb_phy.o
  
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += board-dt-tegra20.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += board-dt-tegra30.o
Simple merge
Simple merge
index 4e59746bcff42501b849b3049c2fe43d156bea83,3ee761d3a86f7d8259f6a6f35925c08942c53fac..7e6c384881a6d4e0e40635aa8e353c5edf67bfce
@@@ -18,9 -18,7 +18,8 @@@
  #include <linux/io.h>
  #include <linux/mfd/abx500/ab8500.h>
  
 +#include <asm/pmu.h>
  #include <asm/mach/map.h>
- #include <asm/pmu.h>
  #include <plat/gpio-nomadik.h>
  #include <mach/hardware.h>
  #include <mach/setup.h>
Simple merge
Simple merge
Simple merge
Simple merge
index e5adad08f1c4ffe3a9b5f90cf5fb1f9b7b590f34,453ef748bf45c3460162245eeecdcd05da832520..1dce36fb828f1d24ebcd8ea4d19c5c86d9587c88
@@@ -25,8 -25,7 +25,8 @@@
  #include <dspbridge/host_os.h>
  
  
- #define INT_34XX_WDT3_IRQ             36
 +#define OMAP34XX_WDT3_BASE            (0x49000000 + 0x30000)
+ #define INT_34XX_WDT3_IRQ             (36 + NR_IRQS)
  
  static struct dsp_wdt_setting dsp_wdt;
  
Simple merge
index b1deb0fd41970a43c5248bf82b76d9d81d154ff5,276add2358a18bb14fd82c681a676fd73fb743ce..3f1431d37e1c836f88b32aff5b002fb9cf4efa0b
@@@ -292,7 -292,7 +292,7 @@@ config USB_OHCI_HC
        depends on USB && USB_ARCH_HAS_OHCI
        select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
        select USB_OTG_UTILS if ARCH_OMAP
-       depends on USB_ISP1301 || !(ARCH_LPC32XX || ARCH_PNX4008)
 -      select USB_ISP1301 if ARCH_LPC32XX
++      depends on USB_ISP1301 || !ARCH_LPC32XX
        ---help---
          The Open Host Controller Interface (OHCI) is a standard for accessing
          USB 1.1 host controller hardware.  It does more in hardware than Intel's
Simple merge
Simple merge