delete queue-3.10/arm-mvebu-add-support-to-get-the-id-and-the-revision-of-a-soc.patch

diff --git a/queue-3.10/arm-mvebu-add-support-to-get-the-id-and-the-revision-of-a-soc.patch b/queue-3.10/arm-mvebu-add-support-to-get-the-id-and-the-revision-of-a-soc.patch
deleted file mode 100644 (file)
index 4428c17..0000000
--- a/queue-3.10/arm-mvebu-add-support-to-get-the-id-and-the-revision-of-a-soc.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From af8d1c63afcbf36eea06789c92e22d4af118d2fb Mon Sep 17 00:00:00 2001
-From: Gregory CLEMENT <gregory.clement@free-electrons.com>
-Date: Thu, 2 Jan 2014 15:08:59 +0100
-Subject: ARM: mvebu: Add support to get the ID and the revision of a SoC
-
-From: Gregory CLEMENT <gregory.clement@free-electrons.com>
-
-commit af8d1c63afcbf36eea06789c92e22d4af118d2fb upstream.
-
-All the mvebu SoCs have information related to their variant and
-revision that can be read from the PCI control register.
-
-This patch adds support for Armada XP and Armada 370. This reading of
-the revision and the ID are done before the PCI initialization to
-avoid any conflicts. Once these data are retrieved, the resources are
-freed to let the PCI subsystem use it.
-
-Fixes: 930ab3d403ae (i2c: mv64xxx: Add I2C Transaction Generator support)
-Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-Acked-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/mach-mvebu/Makefile       |    2 
- arch/arm/mach-mvebu/mvebu-soc-id.c |  119 +++++++++++++++++++++++++++++++++++++
- arch/arm/mach-mvebu/mvebu-soc-id.h |   32 +++++++++
- 3 files changed, 152 insertions(+), 1 deletion(-)
-
---- a/arch/arm/mach-mvebu/Makefile
-+++ b/arch/arm/mach-mvebu/Makefile
-@@ -3,7 +3,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) :=
- 
- AFLAGS_coherency_ll.o         := -Wa,-march=armv7-a
- 
--obj-y                          += system-controller.o
-+obj-y                          += system-controller.o mvebu-soc-id.o
- obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o
- obj-$(CONFIG_ARCH_MVEBU)       += coherency.o coherency_ll.o pmsu.o
- obj-$(CONFIG_SMP)                += platsmp.o headsmp.o
---- /dev/null
-+++ b/arch/arm/mach-mvebu/mvebu-soc-id.c
-@@ -0,0 +1,119 @@
-+/*
-+ * ID and revision information for mvebu SoCs
-+ *
-+ * Copyright (C) 2014 Marvell
-+ *
-+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ *
-+ * All the mvebu SoCs have information related to their variant and
-+ * revision that can be read from the PCI control register. This is
-+ * done before the PCI initialization to avoid any conflict. Once the
-+ * ID and revision are retrieved, the mapping is freed.
-+ */
-+
-+#define pr_fmt(fmt) "mvebu-soc-id: " fmt
-+
-+#include <linux/clk.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/kernel.h>
-+#include <linux/of.h>
-+#include <linux/of_address.h>
-+#include "mvebu-soc-id.h"
-+
-+#define PCIE_DEV_ID_OFF               0x0
-+#define PCIE_DEV_REV_OFF      0x8
-+
-+#define SOC_ID_MASK       0xFFFF0000
-+#define SOC_REV_MASK      0xFF
-+
-+static u32 soc_dev_id;
-+static u32 soc_rev;
-+static bool is_id_valid;
-+
-+static const struct of_device_id mvebu_pcie_of_match_table[] = {
-+      { .compatible = "marvell,armada-xp-pcie", },
-+      { .compatible = "marvell,armada-370-pcie", },
-+      {},
-+};
-+
-+int mvebu_get_soc_id(u32 *dev, u32 *rev)
-+{
-+      if (is_id_valid) {
-+              *dev = soc_dev_id;
-+              *rev = soc_rev;
-+              return 0;
-+      } else
-+              return -1;
-+}
-+
-+static int __init mvebu_soc_id_init(void)
-+{
-+      struct device_node *np;
-+      int ret = 0;
-+      void __iomem *pci_base;
-+      struct clk *clk;
-+      struct device_node *child;
-+
-+      np = of_find_matching_node(NULL, mvebu_pcie_of_match_table);
-+      if (!np)
-+              return ret;
-+
-+      /*
-+       * ID and revision are available from any port, so we
-+       * just pick the first one
-+       */
-+      child = of_get_next_child(np, NULL);
-+      if (child == NULL) {
-+              pr_err("cannot get pci node\n");
-+              ret = -ENOMEM;
-+              goto clk_err;
-+      }
-+
-+      clk = of_clk_get_by_name(child, NULL);
-+      if (IS_ERR(clk)) {
-+              pr_err("cannot get clock\n");
-+              ret = -ENOMEM;
-+              goto clk_err;
-+      }
-+
-+      ret = clk_prepare_enable(clk);
-+      if (ret) {
-+              pr_err("cannot enable clock\n");
-+              goto clk_err;
-+      }
-+
-+      pci_base = of_iomap(child, 0);
-+      if (IS_ERR(pci_base)) {
-+              pr_err("cannot map registers\n");
-+              ret = -ENOMEM;
-+              goto res_ioremap;
-+      }
-+
-+      /* SoC ID */
-+      soc_dev_id = readl(pci_base + PCIE_DEV_ID_OFF) >> 16;
-+
-+      /* SoC revision */
-+      soc_rev = readl(pci_base + PCIE_DEV_REV_OFF) & SOC_REV_MASK;
-+
-+      is_id_valid = true;
-+
-+      pr_info("MVEBU SoC ID=0x%X, Rev=0x%X\n", soc_dev_id, soc_rev);
-+
-+      iounmap(pci_base);
-+
-+res_ioremap:
-+      clk_disable_unprepare(clk);
-+
-+clk_err:
-+      of_node_put(child);
-+      of_node_put(np);
-+
-+      return ret;
-+}
-+core_initcall(mvebu_soc_id_init);
-+
---- /dev/null
-+++ b/arch/arm/mach-mvebu/mvebu-soc-id.h
-@@ -0,0 +1,32 @@
-+/*
-+ * Marvell EBU SoC ID and revision definitions.
-+ *
-+ * Copyright (C) 2014 Marvell Semiconductor
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#ifndef __LINUX_MVEBU_SOC_ID_H
-+#define __LINUX_MVEBU_SOC_ID_H
-+
-+/* Armada XP ID */
-+#define MV78230_DEV_ID            0x7823
-+#define MV78260_DEV_ID            0x7826
-+#define MV78460_DEV_ID            0x7846
-+
-+/* Armada XP Revision */
-+#define MV78XX0_A0_REV            0x1
-+#define MV78XX0_B0_REV            0x2
-+
-+#ifdef CONFIG_ARCH_MVEBU
-+int mvebu_get_soc_id(u32 *dev, u32 *rev);
-+#else
-+static inline int mvebu_get_soc_id(u32 *dev, u32 *rev)
-+{
-+      return -1;
-+}
-+#endif
-+
-+#endif /* __LINUX_MVEBU_SOC_ID_H */

diff --git a/queue-3.10/series b/queue-3.10/series
index f921916d60b1c3350fd4727f02c15a4d15b37c0d..37e6958236add2a3e1b4a2e3123506831e11ec80 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -73,4 +73,3 @@ ext4-avoid-clearing-beyond-i_blocks-when-truncating-an-inline-data-file.patch
 vfs-is-mounted-should-be-testing-mnt_ns-for-null-or-error.patch
 bcache-data-corruption-fix.patch
 hp_accel-add-a-new-pnp-id-hpq6007-for-new-hp-laptops.patch
-arm-mvebu-add-support-to-get-the-id-and-the-revision-of-a-soc.patch