Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc driver specific updates from Olof Johansson:
 "These changes are specific to some driver that may be used by multiple
  boards or socs.  The most significant change in here is the move of
  the samsung iommu code from a platform specific in-kernel interface to
  the generic iommu subsystem."

Fix up trivial conflicts in arch/arm/mach-exynos/Kconfig

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
  mmc: dt: Consolidate DT bindings
  iommu/exynos: Add iommu driver for EXYNOS Platforms
  ARM: davinci: optimize the DMA ISR
  ARM: davinci: implement DEBUG_LL port choice
  ARM: tegra: Add SMMU enabler in AHB
  ARM: tegra: Add Tegra AHB driver
  Input: pxa27x_keypad add choice to set direct_key_mask
  Input: pxa27x_keypad direct key may be low active
  Input: pxa27x_keypad bug fix for direct_key_mask
  Input: pxa27x_keypad keep clock on as wakeup source
  ARM: dt: tegra: pinmux changes for USB ULPI
  ARM: tegra: add USB ULPI PHY reset GPIO to device tree
  ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
  ARM: tegra: change pll_p_out4's rate to 24MHz
  ARM: tegra: fix pclk rate
  ARM: tegra: reparent sclk to pll_c_out1
  ARM: tegra: Add pllc clock init table
  ARM: dt: tegra cardhu: basic audio support
  ARM: dt: tegra30.dtsi: Add audio-related nodes
  ARM: tegra: add AUXDATA required for audio
  ...

2 files changed, 295 insertions, 2 deletions

diff --git a/drivers/amba/Makefile b/drivers/amba/Makefile
index 40fe74097be2..66e81c2f1e3c 100644
--- a/drivers/amba/Makefile
+++ b/drivers/amba/Makefile
@@ -1,2 +1,2 @@
-obj-y           += bus.o
-
+obj-$(CONFIG_ARM_AMBA)          += bus.o
+obj-$(CONFIG_TEGRA_AHB)         += tegra-ahb.o
diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c
new file mode 100644
index 000000000000..aa0b1f160528
--- /dev/null
+++ b/drivers/amba/tegra-ahb.c
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (C) 2011 Google, Inc.
+ *
+ * Author:
+ *      Jay Cheng <jacheng@nvidia.com>
+ *      James Wylder <james.wylder@motorola.com>
+ *      Benoit Goby <benoit@android.com>
+ *      Colin Cross <ccross@android.com>
+ *      Hiroshi DOYU <hdoyu@nvidia.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+#define DRV_NAME "tegra-ahb"
+
+#define AHB_ARBITRATION_DISABLE         0x00
+#define AHB_ARBITRATION_PRIORITY_CTRL   0x04
+#define   AHB_PRIORITY_WEIGHT(x)        (((x) & 0x7) << 29)
+#define   PRIORITY_SELECT_USB BIT(6)
+#define   PRIORITY_SELECT_USB2 BIT(18)
+#define   PRIORITY_SELECT_USB3 BIT(17)
+
+#define AHB_GIZMO_AHB_MEM               0x0c
+#define   ENB_FAST_REARBITRATE BIT(2)
+#define   DONT_SPLIT_AHB_WR     BIT(7)
+
+#define AHB_GIZMO_APB_DMA               0x10
+#define AHB_GIZMO_IDE                   0x18
+#define AHB_GIZMO_USB                   0x1c
+#define AHB_GIZMO_AHB_XBAR_BRIDGE       0x20
+#define AHB_GIZMO_CPU_AHB_BRIDGE        0x24
+#define AHB_GIZMO_COP_AHB_BRIDGE        0x28
+#define AHB_GIZMO_XBAR_APB_CTLR         0x2c
+#define AHB_GIZMO_VCP_AHB_BRIDGE        0x30
+#define AHB_GIZMO_NAND                  0x3c
+#define AHB_GIZMO_SDMMC4                0x44
+#define AHB_GIZMO_XIO                   0x48
+#define AHB_GIZMO_BSEV                  0x60
+#define AHB_GIZMO_BSEA                  0x70
+#define AHB_GIZMO_NOR                   0x74
+#define AHB_GIZMO_USB2                  0x78
+#define AHB_GIZMO_USB3                  0x7c
+#define   IMMEDIATE     BIT(18)
+
+#define AHB_GIZMO_SDMMC1                0x80
+#define AHB_GIZMO_SDMMC2                0x84
+#define AHB_GIZMO_SDMMC3                0x88
+#define AHB_MEM_PREFETCH_CFG_X          0xd8
+#define AHB_ARBITRATION_XBAR_CTRL       0xdc
+#define AHB_MEM_PREFETCH_CFG3           0xe0
+#define AHB_MEM_PREFETCH_CFG4           0xe4
+#define AHB_MEM_PREFETCH_CFG1           0xec
+#define AHB_MEM_PREFETCH_CFG2           0xf0
+#define   PREFETCH_ENB  BIT(31)
+#define   MST_ID(x)     (((x) & 0x1f) << 26)
+#define   AHBDMA_MST_ID MST_ID(5)
+#define   USB_MST_ID    MST_ID(6)
+#define   USB2_MST_ID   MST_ID(18)
+#define   USB3_MST_ID   MST_ID(17)
+#define   ADDR_BNDRY(x) (((x) & 0xf) << 21)
+#define   INACTIVITY_TIMEOUT(x) (((x) & 0xffff) << 0)
+
+#define AHB_ARBITRATION_AHB_MEM_WRQUE_MST_ID    0xf8
+
+#define AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE BIT(17)
+
+static struct platform_driver tegra_ahb_driver;
+
+static const u32 tegra_ahb_gizmo[] = {
+        AHB_ARBITRATION_DISABLE,
+        AHB_ARBITRATION_PRIORITY_CTRL,
+        AHB_GIZMO_AHB_MEM,
+        AHB_GIZMO_APB_DMA,
+        AHB_GIZMO_IDE,
+        AHB_GIZMO_USB,
+        AHB_GIZMO_AHB_XBAR_BRIDGE,
+        AHB_GIZMO_CPU_AHB_BRIDGE,
+        AHB_GIZMO_COP_AHB_BRIDGE,
+        AHB_GIZMO_XBAR_APB_CTLR,
+        AHB_GIZMO_VCP_AHB_BRIDGE,
+        AHB_GIZMO_NAND,
+        AHB_GIZMO_SDMMC4,
+        AHB_GIZMO_XIO,
+        AHB_GIZMO_BSEV,
+        AHB_GIZMO_BSEA,
+        AHB_GIZMO_NOR,
+        AHB_GIZMO_USB2,
+        AHB_GIZMO_USB3,
+        AHB_GIZMO_SDMMC1,
+        AHB_GIZMO_SDMMC2,
+        AHB_GIZMO_SDMMC3,
+        AHB_MEM_PREFETCH_CFG_X,
+        AHB_ARBITRATION_XBAR_CTRL,
+        AHB_MEM_PREFETCH_CFG3,
+        AHB_MEM_PREFETCH_CFG4,
+        AHB_MEM_PREFETCH_CFG1,
+        AHB_MEM_PREFETCH_CFG2,
+        AHB_ARBITRATION_AHB_MEM_WRQUE_MST_ID,
+};
+
+struct tegra_ahb {
+        void __iomem    *regs;
+        struct device   *dev;
+        u32             ctx[0];
+};
+
+static inline u32 gizmo_readl(struct tegra_ahb *ahb, u32 offset)
+{
+        return readl(ahb->regs + offset);
+}
+
+static inline void gizmo_writel(struct tegra_ahb *ahb, u32 value, u32 offset)
+{
+        writel(value, ahb->regs + offset);
+}
+
+#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+static int tegra_ahb_match_by_smmu(struct device *dev, void *data)
+{
+        struct tegra_ahb *ahb = dev_get_drvdata(dev);
+        struct device_node *dn = data;
+
+        return (ahb->dev->of_node == dn) ? 1 : 0;
+}
+
+int tegra_ahb_enable_smmu(struct device_node *dn)
+{
+        struct device *dev;
+        u32 val;
+        struct tegra_ahb *ahb;
+
+        dev = driver_find_device(&tegra_ahb_driver.driver, NULL, dn,
+                                 tegra_ahb_match_by_smmu);
+        if (!dev)
+                return -EPROBE_DEFER;
+        ahb = dev_get_drvdata(dev);
+        val = gizmo_readl(ahb, AHB_ARBITRATION_XBAR_CTRL);
+        val |= AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE;
+        gizmo_writel(ahb, val, AHB_ARBITRATION_XBAR_CTRL);
+        return 0;
+}
+EXPORT_SYMBOL(tegra_ahb_enable_smmu);
+#endif
+
+static int tegra_ahb_suspend(struct device *dev)
+{
+        int i;
+        struct tegra_ahb *ahb = dev_get_drvdata(dev);
+
+        for (i = 0; i < ARRAY_SIZE(tegra_ahb_gizmo); i++)
+                ahb->ctx[i] = gizmo_readl(ahb, tegra_ahb_gizmo[i]);
+        return 0;
+}
+
+static int tegra_ahb_resume(struct device *dev)
+{
+        int i;
+        struct tegra_ahb *ahb = dev_get_drvdata(dev);
+
+        for (i = 0; i < ARRAY_SIZE(tegra_ahb_gizmo); i++)
+                gizmo_writel(ahb, ahb->ctx[i], tegra_ahb_gizmo[i]);
+        return 0;
+}
+
+static UNIVERSAL_DEV_PM_OPS(tegra_ahb_pm,
+                            tegra_ahb_suspend,
+                            tegra_ahb_resume, NULL);
+
+static void tegra_ahb_gizmo_init(struct tegra_ahb *ahb)
+{
+        u32 val;
+
+        val = gizmo_readl(ahb, AHB_GIZMO_AHB_MEM);
+        val |= ENB_FAST_REARBITRATE | IMMEDIATE | DONT_SPLIT_AHB_WR;
+        gizmo_writel(ahb, val, AHB_GIZMO_AHB_MEM);
+
+        val = gizmo_readl(ahb, AHB_GIZMO_USB);
+        val |= IMMEDIATE;
+        gizmo_writel(ahb, val, AHB_GIZMO_USB);
+
+        val = gizmo_readl(ahb, AHB_GIZMO_USB2);
+        val |= IMMEDIATE;
+        gizmo_writel(ahb, val, AHB_GIZMO_USB2);
+
+        val = gizmo_readl(ahb, AHB_GIZMO_USB3);
+        val |= IMMEDIATE;
+        gizmo_writel(ahb, val, AHB_GIZMO_USB3);
+
+        val = gizmo_readl(ahb, AHB_ARBITRATION_PRIORITY_CTRL);
+        val |= PRIORITY_SELECT_USB |
+                PRIORITY_SELECT_USB2 |
+                PRIORITY_SELECT_USB3 |
+                AHB_PRIORITY_WEIGHT(7);
+        gizmo_writel(ahb, val, AHB_ARBITRATION_PRIORITY_CTRL);
+
+        val = gizmo_readl(ahb, AHB_MEM_PREFETCH_CFG1);
+        val &= ~MST_ID(~0);
+        val |= PREFETCH_ENB |
+                AHBDMA_MST_ID |
+                ADDR_BNDRY(0xc) |
+                INACTIVITY_TIMEOUT(0x1000);
+        gizmo_writel(ahb, val, AHB_MEM_PREFETCH_CFG1);
+
+        val = gizmo_readl(ahb, AHB_MEM_PREFETCH_CFG2);
+        val &= ~MST_ID(~0);
+        val |= PREFETCH_ENB |
+                USB_MST_ID |
+                ADDR_BNDRY(0xc) |
+                INACTIVITY_TIMEOUT(0x1000);
+        gizmo_writel(ahb, val, AHB_MEM_PREFETCH_CFG2);
+
+        val = gizmo_readl(ahb, AHB_MEM_PREFETCH_CFG3);
+        val &= ~MST_ID(~0);
+        val |= PREFETCH_ENB |
+                USB3_MST_ID |
+                ADDR_BNDRY(0xc) |
+                INACTIVITY_TIMEOUT(0x1000);
+        gizmo_writel(ahb, val, AHB_MEM_PREFETCH_CFG3);
+
+        val = gizmo_readl(ahb, AHB_MEM_PREFETCH_CFG4);
+        val &= ~MST_ID(~0);
+        val |= PREFETCH_ENB |
+                USB2_MST_ID |
+                ADDR_BNDRY(0xc) |
+                INACTIVITY_TIMEOUT(0x1000);
+        gizmo_writel(ahb, val, AHB_MEM_PREFETCH_CFG4);
+}
+
+static int __devinit tegra_ahb_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        struct tegra_ahb *ahb;
+        size_t bytes;
+
+        bytes = sizeof(*ahb) + sizeof(u32) * ARRAY_SIZE(tegra_ahb_gizmo);
+        ahb = devm_kzalloc(&pdev->dev, bytes, GFP_KERNEL);
+        if (!ahb)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENODEV;
+        ahb->regs = devm_request_and_ioremap(&pdev->dev, res);
+        if (!ahb->regs)
+                return -EBUSY;
+
+        ahb->dev = &pdev->dev;
+        platform_set_drvdata(pdev, ahb);
+        tegra_ahb_gizmo_init(ahb);
+        return 0;
+}
+
+static int __devexit tegra_ahb_remove(struct platform_device *pdev)
+{
+        return 0;
+}
+
+static const struct of_device_id tegra_ahb_of_match[] __devinitconst = {
+        { .compatible = "nvidia,tegra30-ahb", },
+        { .compatible = "nvidia,tegra20-ahb", },
+        {},
+};
+
+static struct platform_driver tegra_ahb_driver = {
+        .probe = tegra_ahb_probe,
+        .remove = __devexit_p(tegra_ahb_remove),
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = tegra_ahb_of_match,
+                .pm = &tegra_ahb_pm,
+        },
+};
+module_platform_driver(tegra_ahb_driver);
+
+MODULE_AUTHOR("Hiroshi DOYU <hdoyu@nvidia.com>");
+MODULE_DESCRIPTION("Tegra AHB driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);