Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Mar 2012 23:41:24 +0000 (16:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Mar 2012 23:41:24 +0000 (16:41 -0700)
Pull "ARM: driver specific updates" from Arnd Bergmann:
 "These are all specific to some driver.  They are typically the
  platform side of a change in the drivers directory, such as adding a
  new driver or extending the interface to the platform.  In cases where
  there is no maintainer for the driver, or the maintainer prefers to
  have the platform changes in the same branch as the driver changes,
  the patches to the drivers are included as well.

  A much smaller set of driver updates that depend on other branches
  getting merged first will be sent later.

  The new export of tegra_chip_uid conflicts with other changes in
  fuse.c.  In rtc-sa1100.c, the global removal of IRQF_DISABLED
  conflicts with the cleanup of the interrupt handling of that driver.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
Fixed up aforementioned trivial conflicts.

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
  mmc: sdhci-s3c: add platform data for the second capability
  ARM: SAMSUNG: support the second capability for samsung-soc
  ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
  ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
  ARM: EXYNOS: Enable MDMA driver
  regulator: Remove bq24022 regulator driver
  rtc: sa1100: add OF support
  pxa: magician/hx4700: Convert to gpio-regulator from bq24022
  ARM: OMAP3+: SmartReflex: fix error handling
  ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
  ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
  ARM: OMAP3+: SmartReflex: misc cleanups
  ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
  ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
  ARM: OMAP3+: hwmod: add SmartReflex IRQs
  ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
  ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
  ARM: OMAP3+: SmartReflex: Add a shutdown hook
  ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
  ...

Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/fuse.c
drivers/rtc/rtc-sa1100.c

26 files changed:
1  2 
arch/arm/Kconfig
arch/arm/boot/dts/tegra-paz00.dts
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-mmp/pxa910.c
arch/arm/mach-mxs/clock-mx23.c
arch/arm/mach-mxs/clock-mx28.c
arch/arm/mach-pxa/hx4700.c
arch/arm/mach-s3c24xx/s3c2416.c
arch/arm/mach-s3c24xx/s3c2443.c
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-harmony-power.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/tegra2_clocks.c
drivers/i2c/busses/i2c-imx.c
drivers/net/ethernet/cirrus/cs89x0.c
drivers/rtc/Kconfig
drivers/rtc/rtc-s3c.c
drivers/rtc/rtc-sa1100.c
sound/soc/imx/imx-audmux.c

Simple merge
  
        i2c@7000d000 {
                clock-frequency = <400000>;
 +
 +              adt7461@4c {
 +                      compatible = "adi,adt7461";
 +                      reg = <0x4c>;
 +              };
        };
  
+       i2s@70002a00 {
+               status = "disable";
+       };
+       sound {
+               compatible = "nvidia,tegra-audio-alc5632-paz00",
+                       "nvidia,tegra-audio-alc5632";
+               nvidia,model = "Compal PAZ00";
+               nvidia,audio-routing =
+                       "Int Spk", "SPKOUT",
+                       "Int Spk", "SPKOUTN",
+                       "Headset Mic", "MICBIAS1",
+                       "MIC1", "Headset Mic",
+                       "Headset Stereophone", "HPR",
+                       "Headset Stereophone", "HPL";
+               nvidia,audio-codec = <&alc5632>;
+               nvidia,i2s-controller = <&tegra_i2s1>;
+               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+       };
        serial@70006000 {
                clock-frequency = <216000000>;
        };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -7,18 -7,16 +7,19 @@@ obj-
  obj-y                                   += timer.o
  obj-y                                   += pinmux.o
  obj-y                                 += fuse.o
+ obj-y                                 += pmc.o
 +obj-$(CONFIG_CPU_IDLE)                        += cpuidle.o
 +obj-$(CONFIG_CPU_IDLE)                        += sleep.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += powergate.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += tegra2_emc.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += pinmux-tegra20-tables.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += pinmux-tegra30-tables.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += board-dt-tegra30.o
 -obj-$(CONFIG_SMP)                       += platsmp.o localtimer.o headsmp.o
 +obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += tegra30_clocks.o
 +obj-$(CONFIG_SMP)                     += platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
- obj-$(CONFIG_TEGRA_SYSTEM_DMA)                += dma.o
+ obj-$(CONFIG_TEGRA_SYSTEM_DMA)                += dma.o apbio.o
  obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
  obj-$(CONFIG_TEGRA_PCI)                       += pcie.o
  obj-$(CONFIG_USB_SUPPORT)             += usb_phy.o
@@@ -104,7 -125,7 +123,8 @@@ void __init tegra20_init_early(void
  #ifdef CONFIG_ARCH_TEGRA_3x_SOC
  void __init tegra30_init_early(void)
  {
 +      tegra30_init_clocks();
        tegra_init_cache(0x441, 0x551);
+       tegra_pmc_init();
  }
  #endif
@@@ -19,7 -19,6 +19,7 @@@
  
  #include <linux/kernel.h>
  #include <linux/io.h>
- #include <linux/module.h>
++#include <linux/export.h>
  
  #include <mach/iomap.h>
  
@@@ -55,32 -119,7 +120,8 @@@ unsigned long long tegra_chip_uid(void
  {
        unsigned long long lo, hi;
  
-       lo = fuse_readl(FUSE_UID_LOW);
-       hi = fuse_readl(FUSE_UID_HIGH);
+       lo = tegra_fuse_readl(FUSE_UID_LOW);
+       hi = tegra_fuse_readl(FUSE_UID_HIGH);
        return (hi << 32ull) | lo;
  }
- int tegra_sku_id(void)
- {
-       int sku_id;
-       u32 reg = fuse_readl(FUSE_SKU_INFO);
-       sku_id = reg & 0xFF;
-       return sku_id;
- }
- int tegra_cpu_process_id(void)
- {
-       int cpu_process_id;
-       u32 reg = fuse_readl(FUSE_SPARE_BIT);
-       cpu_process_id = (reg >> 6) & 3;
-       return cpu_process_id;
- }
- int tegra_core_process_id(void)
- {
-       int core_process_id;
-       u32 reg = fuse_readl(FUSE_SPARE_BIT);
-       core_process_id = (reg >> 12) & 3;
-       return core_process_id;
- }
 +EXPORT_SYMBOL(tegra_chip_uid);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -94,19 -103,23 +103,21 @@@ static irqreturn_t sa1100_rtc_interrupt
  
  static int sa1100_rtc_open(struct device *dev)
  {
+       struct sa1100_rtc *info = dev_get_drvdata(dev);
+       struct rtc_device *rtc = info->rtc;
        int ret;
-       struct platform_device *plat_dev = to_platform_device(dev);
-       struct rtc_device *rtc = platform_get_drvdata(plat_dev);
  
-       ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev);
+       ret = clk_prepare_enable(info->clk);
+       if (ret)
+               goto fail_clk;
 -      ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, IRQF_DISABLED,
 -              "rtc 1Hz", dev);
++      ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev);
        if (ret) {
-               dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
+               dev_err(dev, "IRQ %d already in use.\n", info->irq_1hz);
                goto fail_ui;
        }
-       ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0,
-                         "rtc Alrm", dev);
 -      ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, IRQF_DISABLED,
 -              "rtc Alrm", dev);
++      ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, 0, "rtc Alrm", dev);
        if (ret) {
-               dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
+               dev_err(dev, "IRQ %d already in use.\n", info->irq_alarm);
                goto fail_ai;
        }
        rtc->max_user_freq = RTC_FREQ;
@@@ -80,13 -73,13 +80,13 @@@ static ssize_t audmux_read_file(struct 
                return -ENOMEM;
  
        if (audmux_clk)
-               clk_enable(audmux_clk);
+               clk_prepare_enable(audmux_clk);
  
 -      ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port));
 -      pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port));
 +      ptcr = readl(audmux_base + IMX_AUDMUX_V2_PTCR(port));
 +      pdcr = readl(audmux_base + IMX_AUDMUX_V2_PDCR(port));
  
        if (audmux_clk)
-               clk_disable(audmux_clk);
+               clk_disable_unprepare(audmux_clk);
  
        ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
                       pdcr, ptcr);
@@@ -237,13 -172,13 +237,13 @@@ int imx_audmux_v2_configure_port(unsign
                return -ENOSYS;
  
        if (audmux_clk)
-               clk_enable(audmux_clk);
+               clk_prepare_enable(audmux_clk);
  
 -      writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port));
 -      writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port));
 +      writel(ptcr, audmux_base + IMX_AUDMUX_V2_PTCR(port));
 +      writel(pdcr, audmux_base + IMX_AUDMUX_V2_PDCR(port));
  
        if (audmux_clk)
-               clk_disable(audmux_clk);
+               clk_disable_unprepare(audmux_clk);
  
        return 0;
  }