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;
index a839494,0000000..601df80
mode 100644,000000..100644
--- /dev/null
@@@ -1,314 -1,0 +1,314 @@@
-               clk_enable(audmux_clk);
 +/*
 + * Copyright 2012 Freescale Semiconductor, Inc.
 + * Copyright 2012 Linaro Ltd.
 + * Copyright 2009 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
 + *
 + * Initial development of this code was funded by
 + * Phytec Messtechnik GmbH, http://www.phytec.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.
 + */
 +
 +#include <linux/clk.h>
 +#include <linux/debugfs.h>
 +#include <linux/err.h>
 +#include <linux/io.h>
 +#include <linux/module.h>
 +#include <linux/of.h>
 +#include <linux/of_device.h>
 +#include <linux/platform_device.h>
 +#include <linux/slab.h>
 +
 +#include "imx-audmux.h"
 +
 +#define DRIVER_NAME "imx-audmux"
 +
 +static struct clk *audmux_clk;
 +static void __iomem *audmux_base;
 +
 +#define IMX_AUDMUX_V2_PTCR(x)         ((x) * 8)
 +#define IMX_AUDMUX_V2_PDCR(x)         ((x) * 8 + 4)
 +
 +#ifdef CONFIG_DEBUG_FS
 +static struct dentry *audmux_debugfs_root;
 +
 +static int audmux_open_file(struct inode *inode, struct file *file)
 +{
 +      file->private_data = inode->i_private;
 +      return 0;
 +}
 +
 +/* There is an annoying discontinuity in the SSI numbering with regard
 + * to the Linux number of the devices */
 +static const char *audmux_port_string(int port)
 +{
 +      switch (port) {
 +      case MX31_AUDMUX_PORT1_SSI0:
 +              return "imx-ssi.0";
 +      case MX31_AUDMUX_PORT2_SSI1:
 +              return "imx-ssi.1";
 +      case MX31_AUDMUX_PORT3_SSI_PINS_3:
 +              return "SSI3";
 +      case MX31_AUDMUX_PORT4_SSI_PINS_4:
 +              return "SSI4";
 +      case MX31_AUDMUX_PORT5_SSI_PINS_5:
 +              return "SSI5";
 +      case MX31_AUDMUX_PORT6_SSI_PINS_6:
 +              return "SSI6";
 +      default:
 +              return "UNKNOWN";
 +      }
 +}
 +
 +static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
 +                              size_t count, loff_t *ppos)
 +{
 +      ssize_t ret;
 +      char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
 +      int port = (int)file->private_data;
 +      u32 pdcr, ptcr;
 +
 +      if (!buf)
 +              return -ENOMEM;
 +
 +      if (audmux_clk)
-               clk_disable(audmux_clk);
++              clk_prepare_enable(audmux_clk);
 +
 +      ptcr = readl(audmux_base + IMX_AUDMUX_V2_PTCR(port));
 +      pdcr = readl(audmux_base + IMX_AUDMUX_V2_PDCR(port));
 +
 +      if (audmux_clk)
-               clk_enable(audmux_clk);
++              clk_disable_unprepare(audmux_clk);
 +
 +      ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
 +                     pdcr, ptcr);
 +
 +      if (ptcr & IMX_AUDMUX_V2_PTCR_TFSDIR)
 +              ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                              "TxFS output from %s, ",
 +                              audmux_port_string((ptcr >> 27) & 0x7));
 +      else
 +              ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                              "TxFS input, ");
 +
 +      if (ptcr & IMX_AUDMUX_V2_PTCR_TCLKDIR)
 +              ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                              "TxClk output from %s",
 +                              audmux_port_string((ptcr >> 22) & 0x7));
 +      else
 +              ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                              "TxClk input");
 +
 +      ret += snprintf(buf + ret, PAGE_SIZE - ret, "\n");
 +
 +      if (ptcr & IMX_AUDMUX_V2_PTCR_SYN) {
 +              ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                              "Port is symmetric");
 +      } else {
 +              if (ptcr & IMX_AUDMUX_V2_PTCR_RFSDIR)
 +                      ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                                      "RxFS output from %s, ",
 +                                      audmux_port_string((ptcr >> 17) & 0x7));
 +              else
 +                      ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                                      "RxFS input, ");
 +
 +              if (ptcr & IMX_AUDMUX_V2_PTCR_RCLKDIR)
 +                      ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                                      "RxClk output from %s",
 +                                      audmux_port_string((ptcr >> 12) & 0x7));
 +              else
 +                      ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                                      "RxClk input");
 +      }
 +
 +      ret += snprintf(buf + ret, PAGE_SIZE - ret,
 +                      "\nData received from %s\n",
 +                      audmux_port_string((pdcr >> 13) & 0x7));
 +
 +      ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
 +
 +      kfree(buf);
 +
 +      return ret;
 +}
 +
 +static const struct file_operations audmux_debugfs_fops = {
 +      .open = audmux_open_file,
 +      .read = audmux_read_file,
 +      .llseek = default_llseek,
 +};
 +
 +static void __init audmux_debugfs_init(void)
 +{
 +      int i;
 +      char buf[20];
 +
 +      audmux_debugfs_root = debugfs_create_dir("audmux", NULL);
 +      if (!audmux_debugfs_root) {
 +              pr_warning("Failed to create AUDMUX debugfs root\n");
 +              return;
 +      }
 +
 +      for (i = 1; i < 8; i++) {
 +              snprintf(buf, sizeof(buf), "ssi%d", i);
 +              if (!debugfs_create_file(buf, 0444, audmux_debugfs_root,
 +                                       (void *)i, &audmux_debugfs_fops))
 +                      pr_warning("Failed to create AUDMUX port %d debugfs file\n",
 +                                 i);
 +      }
 +}
 +
 +static void __devexit audmux_debugfs_remove(void)
 +{
 +      debugfs_remove_recursive(audmux_debugfs_root);
 +}
 +#else
 +static inline void audmux_debugfs_init(void)
 +{
 +}
 +
 +static inline void audmux_debugfs_remove(void)
 +{
 +}
 +#endif
 +
 +enum imx_audmux_type {
 +      IMX21_AUDMUX,
 +      IMX31_AUDMUX,
 +} audmux_type;
 +
 +static struct platform_device_id imx_audmux_ids[] = {
 +      {
 +              .name = "imx21-audmux",
 +              .driver_data = IMX21_AUDMUX,
 +      }, {
 +              .name = "imx31-audmux",
 +              .driver_data = IMX31_AUDMUX,
 +      }, {
 +              /* sentinel */
 +      }
 +};
 +MODULE_DEVICE_TABLE(platform, imx_audmux_ids);
 +
 +static const struct of_device_id imx_audmux_dt_ids[] = {
 +      { .compatible = "fsl,imx21-audmux", .data = &imx_audmux_ids[0], },
 +      { .compatible = "fsl,imx31-audmux", .data = &imx_audmux_ids[1], },
 +      { /* sentinel */ }
 +};
 +MODULE_DEVICE_TABLE(of, imx_audmux_dt_ids);
 +
 +static const uint8_t port_mapping[] = {
 +      0x0, 0x4, 0x8, 0x10, 0x14, 0x1c,
 +};
 +
 +int imx_audmux_v1_configure_port(unsigned int port, unsigned int pcr)
 +{
 +      if (audmux_type != IMX21_AUDMUX)
 +              return -EINVAL;
 +
 +      if (!audmux_base)
 +              return -ENOSYS;
 +
 +      if (port >= ARRAY_SIZE(port_mapping))
 +              return -EINVAL;
 +
 +      writel(pcr, audmux_base + port_mapping[port]);
 +
 +      return 0;
 +}
 +EXPORT_SYMBOL_GPL(imx_audmux_v1_configure_port);
 +
 +int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
 +              unsigned int pdcr)
 +{
 +      if (audmux_type != IMX31_AUDMUX)
 +              return -EINVAL;
 +
 +      if (!audmux_base)
 +              return -ENOSYS;
 +
 +      if (audmux_clk)
-               clk_disable(audmux_clk);
++              clk_prepare_enable(audmux_clk);
 +
 +      writel(ptcr, audmux_base + IMX_AUDMUX_V2_PTCR(port));
 +      writel(pdcr, audmux_base + IMX_AUDMUX_V2_PDCR(port));
 +
 +      if (audmux_clk)
++              clk_disable_unprepare(audmux_clk);
 +
 +      return 0;
 +}
 +EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
 +
 +static int __devinit imx_audmux_probe(struct platform_device *pdev)
 +{
 +      struct resource *res;
 +      const struct of_device_id *of_id =
 +                      of_match_device(imx_audmux_dt_ids, &pdev->dev);
 +
 +      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 +      audmux_base = devm_request_and_ioremap(&pdev->dev, res);
 +      if (!audmux_base)
 +              return -EADDRNOTAVAIL;
 +
 +      audmux_clk = clk_get(&pdev->dev, "audmux");
 +      if (IS_ERR(audmux_clk)) {
 +              dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
 +                              PTR_ERR(audmux_clk));
 +              audmux_clk = NULL;
 +      }
 +
 +      if (of_id)
 +              pdev->id_entry = of_id->data;
 +      audmux_type = pdev->id_entry->driver_data;
 +      if (audmux_type == IMX31_AUDMUX)
 +              audmux_debugfs_init();
 +
 +      return 0;
 +}
 +
 +static int __devexit imx_audmux_remove(struct platform_device *pdev)
 +{
 +      if (audmux_type == IMX31_AUDMUX)
 +              audmux_debugfs_remove();
 +      clk_put(audmux_clk);
 +
 +      return 0;
 +}
 +
 +static struct platform_driver imx_audmux_driver = {
 +      .probe          = imx_audmux_probe,
 +      .remove         = __devexit_p(imx_audmux_remove),
 +      .id_table       = imx_audmux_ids,
 +      .driver = {
 +              .name   = DRIVER_NAME,
 +              .owner  = THIS_MODULE,
 +              .of_match_table = imx_audmux_dt_ids,
 +      }
 +};
 +
 +static int __init imx_audmux_init(void)
 +{
 +      return platform_driver_register(&imx_audmux_driver);
 +}
 +subsys_initcall(imx_audmux_init);
 +
 +static void __exit imx_audmux_exit(void)
 +{
 +      platform_driver_unregister(&imx_audmux_driver);
 +}
 +module_exit(imx_audmux_exit);
 +
 +MODULE_DESCRIPTION("Freescale i.MX AUDMUX driver");
 +MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:" DRIVER_NAME);