Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull char/misc driver updates from Greg KH:
 "Here's the big char/misc driver patchset for 4.1-rc1.

  Lots of different driver subsystem updates here, nothing major, full
  details are in the shortlog.

  All of this has been in linux-next for a while"

* tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (133 commits)
  mei: trace: remove unused TRACE_SYSTEM_STRING
  DTS: ARM: OMAP3-N900: Add lis3lv02d support
  Documentation: DT: lis302: update wakeup binding
  lis3lv02d: DT: add wakeup unit 2 and wakeup threshold
  lis3lv02d: DT: use s32 to support negative values
  Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case
  Drivers: hv: hv_balloon: correctly handle val.freeram<num_pages case
  mei: replace check for connection instead of transitioning
  mei: use mei_cl_is_connected consistently
  mei: fix mei_poll operation
  hv_vmbus: Add gradually increased delay for retries in vmbus_post_msg()
  Drivers: hv: hv_balloon: survive ballooning request with num_pages=0
  Drivers: hv: hv_balloon: eliminate jumps in piecewiese linear floor function
  Drivers: hv: hv_balloon: do not online pages in offline blocks
  hv: remove the per-channel workqueue
  hv: don't schedule new works in vmbus_onoffer()/vmbus_onoffer_rescind()
  hv: run non-blocking message handlers in the dispatch tasklet
  coresight: moving to new "hwtracing" directory
  coresight-tmc: Adding a status interface to sysfs
  coresight: remove the unnecessary configuration coresight-default-sink
  ...

diff --cc Documentation/driver-model/devres.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/hw_random/core.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc drivers/extcon/extcon-arizona.c
Simple merge

diff --cc drivers/hwtracing/coresight/of_coresight.c
index 0000000,f3cc8e9..35e51ce
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@@ -1,0 -1,200 +1,191 @@@
 -static struct device_node *of_get_coresight_endpoint(
 -              const struct device_node *parent, struct device_node *prev)
 -{
 -      struct device_node *node = of_graph_get_next_endpoint(parent, prev);
 -
 -      of_node_put(prev);
 -      return node;
 -}
 -
+ /* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 and
+  * only version 2 as published by the Free Software Foundation.
+  *
+  * 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/module.h>
+ #include <linux/types.h>
+ #include <linux/err.h>
+ #include <linux/slab.h>
+ #include <linux/clk.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
+ #include <linux/of_graph.h>
+ #include <linux/of_platform.h>
+ #include <linux/platform_device.h>
+ #include <linux/amba/bus.h>
+ #include <linux/coresight.h>
+ #include <linux/cpumask.h>
+ #include <asm/smp_plat.h>
+ 
+ 
+ static int of_dev_node_match(struct device *dev, void *data)
+ {
+       return dev->of_node == data;
+ }
+ 
+ static struct device *
+ of_coresight_get_endpoint_device(struct device_node *endpoint)
+ {
+       struct device *dev = NULL;
+ 
+       /*
+        * If we have a non-configuable replicator, it will be found on the
+        * platform bus.
+        */
+       dev = bus_find_device(&platform_bus_type, NULL,
+                             endpoint, of_dev_node_match);
+       if (dev)
+               return dev;
+ 
+       /*
+        * We have a configurable component - circle through the AMBA bus
+        * looking for the device that matches the endpoint node.
+        */
+       return bus_find_device(&amba_bustype, NULL,
+                              endpoint, of_dev_node_match);
+ }
+ 
 -              ep = of_get_coresight_endpoint(node, ep);
+ static void of_coresight_get_ports(struct device_node *node,
+                                  int *nr_inport, int *nr_outport)
+ {
+       struct device_node *ep = NULL;
+       int in = 0, out = 0;
+ 
+       do {
 -                      ep = of_get_coresight_endpoint(node, ep);
++              ep = of_graph_get_next_endpoint(node, ep);
+               if (!ep)
+                       break;
+ 
+               if (of_property_read_bool(ep, "slave-mode"))
+                       in++;
+               else
+                       out++;
+ 
+       } while (ep);
+ 
+       *nr_inport = in;
+       *nr_outport = out;
+ }
+ 
+ static int of_coresight_alloc_memory(struct device *dev,
+                       struct coresight_platform_data *pdata)
+ {
+       /* List of output port on this component */
+       pdata->outports = devm_kzalloc(dev, pdata->nr_outport *
+                                      sizeof(*pdata->outports),
+                                      GFP_KERNEL);
+       if (!pdata->outports)
+               return -ENOMEM;
+ 
+       /* Children connected to this component via @outports */
+        pdata->child_names = devm_kzalloc(dev, pdata->nr_outport *
+                                         sizeof(*pdata->child_names),
+                                         GFP_KERNEL);
+       if (!pdata->child_names)
+               return -ENOMEM;
+ 
+       /* Port number on the child this component is connected to */
+       pdata->child_ports = devm_kzalloc(dev, pdata->nr_outport *
+                                         sizeof(*pdata->child_ports),
+                                         GFP_KERNEL);
+       if (!pdata->child_ports)
+               return -ENOMEM;
+ 
+       return 0;
+ }
+ 
+ struct coresight_platform_data *of_get_coresight_platform_data(
+                               struct device *dev, struct device_node *node)
+ {
+       int i = 0, ret = 0, cpu;
+       struct coresight_platform_data *pdata;
+       struct of_endpoint endpoint, rendpoint;
+       struct device *rdev;
+       struct device_node *dn;
+       struct device_node *ep = NULL;
+       struct device_node *rparent = NULL;
+       struct device_node *rport = NULL;
+ 
+       pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+       if (!pdata)
+               return ERR_PTR(-ENOMEM);
+ 
+       /* Use device name as sysfs handle */
+       pdata->name = dev_name(dev);
+ 
+       /* Get the number of input and output port for this component */
+       of_coresight_get_ports(node, &pdata->nr_inport, &pdata->nr_outport);
+ 
+       if (pdata->nr_outport) {
+               ret = of_coresight_alloc_memory(dev, pdata);
+               if (ret)
+                       return ERR_PTR(ret);
+ 
+               /* Iterate through each port to discover topology */
+               do {
+                       /* Get a handle on a port */
++                      ep = of_graph_get_next_endpoint(node, ep);
+                       if (!ep)
+                               break;
+ 
+                       /*
+                        * No need to deal with input ports, processing for as
+                        * processing for output ports will deal with them.
+                        */
+                       if (of_find_property(ep, "slave-mode", NULL))
+                               continue;
+ 
+                       /* Get a handle on the local endpoint */
+                       ret = of_graph_parse_endpoint(ep, &endpoint);
+ 
+                       if (ret)
+                               continue;
+ 
+                       /* The local out port number */
+                       pdata->outports[i] = endpoint.id;
+ 
+                       /*
+                        * Get a handle on the remote port and parent
+                        * attached to it.
+                        */
+                       rparent = of_graph_get_remote_port_parent(ep);
+                       rport = of_graph_get_remote_port(ep);
+ 
+                       if (!rparent || !rport)
+                               continue;
+ 
+                       if (of_graph_parse_endpoint(rport, &rendpoint))
+                               continue;
+ 
+                       rdev = of_coresight_get_endpoint_device(rparent);
+                       if (!rdev)
+                               continue;
+ 
+                       pdata->child_names[i] = dev_name(rdev);
+                       pdata->child_ports[i] = rendpoint.id;
+ 
+                       i++;
+               } while (ep);
+       }
+ 
+       /* Affinity defaults to CPU0 */
+       pdata->cpu = 0;
+       dn = of_parse_phandle(node, "cpu", 0);
+       for (cpu = 0; dn && cpu < nr_cpu_ids; cpu++) {
+               if (dn == of_get_cpu_node(cpu, NULL)) {
+                       pdata->cpu = cpu;
+                       break;
+               }
+       }
+ 
+       return pdata;
+ }
+ EXPORT_SYMBOL_GPL(of_get_coresight_platform_data);

diff --cc drivers/misc/mei/amthif.c
Simple merge

diff --cc drivers/misc/mei/main.c
Simple merge

diff --cc drivers/misc/mei/pci-me.c
Simple merge

diff --cc include/linux/io.h
Simple merge

diff --cc include/linux/mfd/arizona/core.h
Simple merge

diff --cc kernel/time/clockevents.c
index 25d942d,888ecc1..11dc22a
--- 1/kernel/time/clockevents.c
--- 2/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@@ -440,39 -371,8 +440,39 @@@ int clockevents_unbind_device(struct cl
        mutex_unlock(&clockevents_mutex);
        return ret;
  }
- EXPORT_SYMBOL_GPL(clockevents_unbind);
+ EXPORT_SYMBOL_GPL(clockevents_unbind_device);
  
 +/* Sanity check of state transition callbacks */
 +static int clockevents_sanity_check(struct clock_event_device *dev)
 +{
 +      /* Legacy set_mode() callback */
 +      if (dev->set_mode) {
 +              /* We shouldn't be supporting new modes now */
 +              WARN_ON(dev->set_state_periodic || dev->set_state_oneshot ||
 +                      dev->set_state_shutdown || dev->tick_resume);
 +
 +              BUG_ON(dev->mode != CLOCK_EVT_MODE_UNUSED);
 +              return 0;
 +      }
 +
 +      if (dev->features & CLOCK_EVT_FEAT_DUMMY)
 +              return 0;
 +
 +      /* New state-specific callbacks */
 +      if (!dev->set_state_shutdown)
 +              return -EINVAL;
 +
 +      if ((dev->features & CLOCK_EVT_FEAT_PERIODIC) &&
 +          !dev->set_state_periodic)
 +              return -EINVAL;
 +
 +      if ((dev->features & CLOCK_EVT_FEAT_ONESHOT) &&
 +          !dev->set_state_oneshot)
 +              return -EINVAL;
 +
 +      return 0;
 +}
 +
  /**
   * clockevents_register_device - register a clock event device
   * @dev:      device to register

diff --cc sound/soc/codecs/arizona.c
Simple merge