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

Pull ARM SoC driver changes from Arnd Bergmann:
 "These changes are mostly for ARM specific device drivers that either
  don't have an upstream maintainer, or that had the maintainer ask us
  to pick up the changes to avoid conflicts.

  A large chunk of this are clock drivers (bcm281xx, exynos, versatile,
  shmobile), aside from that, reset controllers for STi as well as a
  large rework of the Marvell Orion/EBU watchdog driver are notable"

* tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (99 commits)
  Revert "dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac."
  Revert "net: stmmac: Add SOCFPGA glue driver"
  ARM: shmobile: r8a7791: Fix SCIFA3-5 clocks
  ARM: STi: Add reset controller support to mach-sti Kconfig
  drivers: reset: stih416: add softreset controller
  drivers: reset: stih415: add softreset controller
  drivers: reset: Reset controller driver for STiH416
  drivers: reset: Reset controller driver for STiH415
  drivers: reset: STi SoC system configuration reset controller support
  dts: socfpga: Add sysmgr node so the gmac can use to reference
  dts: socfpga: Add support for SD/MMC on the SOCFPGA platform
  reset: Add optional resets and stubs
  ARM: shmobile: r7s72100: fix bus clock calculation
  Power: Reset: Generalize qnap-poweroff to work on Synology devices.
  dts: socfpga: Update clock entry to support multiple parents
  ARM: socfpga: Update socfpga_defconfig
  dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
  net: stmmac: Add SOCFPGA glue driver
  watchdog: orion_wdt: Use %pa to print 'phys_addr_t'
  drivers: cci: Export CCI PMU revision
  ...

2 files changed, 14 insertions, 13 deletions

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 962fd35cbd8d..5a86da97a70b 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -31,7 +31,6 @@
 
 #define DRIVER_NAME             "CCI-400"
 #define DRIVER_NAME_PMU         DRIVER_NAME " PMU"
-#define PMU_NAME                "CCI_400"
 
 #define CCI_PORT_CTRL           0x0
 #define CCI_CTRL_STATUS         0xc
@@ -88,8 +87,7 @@ static unsigned long cci_ctrl_phys;
 
 #define CCI_REV_R0              0
 #define CCI_REV_R1              1
-#define CCI_REV_R0_P4           4
-#define CCI_REV_R1_P2           6
+#define CCI_REV_R1_PX           5
 
 #define CCI_PMU_EVT_SEL         0x000
 #define CCI_PMU_CNTR            0x004
@@ -163,6 +161,15 @@ static struct pmu_port_event_ranges port_event_range[] = {
         },
 };
 
+/*
+ * Export different PMU names for the different revisions so userspace knows
+ * because the event ids are different
+ */
+static char *const pmu_names[] = {
+        [CCI_REV_R0] = "CCI_400",
+        [CCI_REV_R1] = "CCI_400_r1",
+};
+
 struct cci_pmu_drv_data {
         void __iomem *base;
         struct arm_pmu *cci_pmu;
@@ -193,21 +200,16 @@ static int probe_cci_revision(void)
         rev = readl_relaxed(cci_ctrl_base + CCI_PID2) & CCI_PID2_REV_MASK;
         rev >>= CCI_PID2_REV_SHIFT;
 
-        if (rev <= CCI_REV_R0_P4)
+        if (rev < CCI_REV_R1_PX)
                 return CCI_REV_R0;
-        else if (rev <= CCI_REV_R1_P2)
+        else
                 return CCI_REV_R1;
-
-        return -ENOENT;
 }
 
 static struct pmu_port_event_ranges *port_range_by_rev(void)
 {
         int rev = probe_cci_revision();
 
-        if (rev < 0)
-                return NULL;
-
         return &port_event_range[rev];
 }
 
@@ -526,7 +528,7 @@ static void pmu_write_counter(struct perf_event *event, u32 value)
 static int cci_pmu_init(struct arm_pmu *cci_pmu, struct platform_device *pdev)
 {
         *cci_pmu = (struct arm_pmu){
-                .name             = PMU_NAME,
+                .name             = pmu_names[probe_cci_revision()],
                 .max_period       = (1LLU << 32) - 1,
                 .get_hw_events    = pmu_get_hw_events,
                 .get_event_idx    = pmu_get_event_idx,
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 2ac754e18bcf..293e2e0a0a87 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -890,13 +890,12 @@ int __init mvebu_mbus_dt_init(void)
         const __be32 *prop;
         int ret;
 
-        np = of_find_matching_node(NULL, of_mvebu_mbus_ids);
+        np = of_find_matching_node_and_match(NULL, of_mvebu_mbus_ids, &of_id);
         if (!np) {
                 pr_err("could not find a matching SoC family\n");
                 return -ENODEV;
         }
 
-        of_id = of_match_node(of_mvebu_mbus_ids, np);
         mbus_state.soc = of_id->data;
 
         prop = of_get_property(np, "controller", NULL);