Merge remote-tracking branch 'clk/clk-next'

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/arm/mach-bcm/Kconfig
Simple merge

diff --cc drivers/base/power/domain.c
index 6e1bcdef7a79cde343ffb2cf2795fe881c1654b9,222ce890124e629a1d783a44adcb33a962cf667c..b0b5c43d2bbdf5cba4c384357a9f041802db1b9a
--- 1/drivers/base/power/domain.c
--- 2/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@@ -1345,7 -1427,37 +1345,8 @@@ int pm_genpd_add_subdomain(struct gener
  
        return ret;
  }
+ EXPORT_SYMBOL_GPL(pm_genpd_add_subdomain);
  
 -/**
 - * pm_genpd_add_subdomain_names - Add a subdomain to an I/O PM domain.
 - * @master_name: Name of the master PM domain to add the subdomain to.
 - * @subdomain_name: Name of the subdomain to be added.
 - */
 -int pm_genpd_add_subdomain_names(const char *master_name,
 -                               const char *subdomain_name)
 -{
 -      struct generic_pm_domain *master = NULL, *subdomain = NULL, *gpd;
 -
 -      if (IS_ERR_OR_NULL(master_name) || IS_ERR_OR_NULL(subdomain_name))
 -              return -EINVAL;
 -
 -      mutex_lock(&gpd_list_lock);
 -      list_for_each_entry(gpd, &gpd_list, gpd_list_node) {
 -              if (!master && !strcmp(gpd->name, master_name))
 -                      master = gpd;
 -
 -              if (!subdomain && !strcmp(gpd->name, subdomain_name))
 -                      subdomain = gpd;
 -
 -              if (master && subdomain)
 -                      break;
 -      }
 -      mutex_unlock(&gpd_list_lock);
 -
 -      return pm_genpd_add_subdomain(master, subdomain);
 -}
 -
  /**
   * pm_genpd_remove_subdomain - Remove a subdomain from an I/O PM domain.
   * @genpd: Master PM domain to remove the subdomain from.
@@@ -1392,7 -1504,126 +1393,8 @@@ out
  
        return ret;
  }
+ EXPORT_SYMBOL_GPL(pm_genpd_remove_subdomain);
  
 -/**
 - * pm_genpd_attach_cpuidle - Connect the given PM domain with cpuidle.
 - * @genpd: PM domain to be connected with cpuidle.
 - * @state: cpuidle state this domain can disable/enable.
 - *
 - * Make a PM domain behave as though it contained a CPU core, that is, instead
 - * of calling its power down routine it will enable the given cpuidle state so
 - * that the cpuidle subsystem can power it down (if possible and desirable).
 - */
 -int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
 -{
 -      struct cpuidle_driver *cpuidle_drv;
 -      struct gpd_cpuidle_data *cpuidle_data;
 -      struct cpuidle_state *idle_state;
 -      int ret = 0;
 -
 -      if (IS_ERR_OR_NULL(genpd) || state < 0)
 -              return -EINVAL;
 -
 -      mutex_lock(&genpd->lock);
 -
 -      if (genpd->cpuidle_data) {
 -              ret = -EEXIST;
 -              goto out;
 -      }
 -      cpuidle_data = kzalloc(sizeof(*cpuidle_data), GFP_KERNEL);
 -      if (!cpuidle_data) {
 -              ret = -ENOMEM;
 -              goto out;
 -      }
 -      cpuidle_drv = cpuidle_driver_ref();
 -      if (!cpuidle_drv) {
 -              ret = -ENODEV;
 -              goto err_drv;
 -      }
 -      if (cpuidle_drv->state_count <= state) {
 -              ret = -EINVAL;
 -              goto err;
 -      }
 -      idle_state = &cpuidle_drv->states[state];
 -      if (!idle_state->disabled) {
 -              ret = -EAGAIN;
 -              goto err;
 -      }
 -      cpuidle_data->idle_state = idle_state;
 -      cpuidle_data->saved_exit_latency = idle_state->exit_latency;
 -      genpd->cpuidle_data = cpuidle_data;
 -      genpd_recalc_cpu_exit_latency(genpd);
 -
 - out:
 -      mutex_unlock(&genpd->lock);
 -      return ret;
 -
 - err:
 -      cpuidle_driver_unref();
 -
 - err_drv:
 -      kfree(cpuidle_data);
 -      goto out;
 -}
 -
 -/**
 - * pm_genpd_name_attach_cpuidle - Find PM domain and connect cpuidle to it.
 - * @name: Name of the domain to connect to cpuidle.
 - * @state: cpuidle state this domain can manipulate.
 - */
 -int pm_genpd_name_attach_cpuidle(const char *name, int state)
 -{
 -      return pm_genpd_attach_cpuidle(pm_genpd_lookup_name(name), state);
 -}
 -
 -/**
 - * pm_genpd_detach_cpuidle - Remove the cpuidle connection from a PM domain.
 - * @genpd: PM domain to remove the cpuidle connection from.
 - *
 - * Remove the cpuidle connection set up by pm_genpd_attach_cpuidle() from the
 - * given PM domain.
 - */
 -int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
 -{
 -      struct gpd_cpuidle_data *cpuidle_data;
 -      struct cpuidle_state *idle_state;
 -      int ret = 0;
 -
 -      if (IS_ERR_OR_NULL(genpd))
 -              return -EINVAL;
 -
 -      mutex_lock(&genpd->lock);
 -
 -      cpuidle_data = genpd->cpuidle_data;
 -      if (!cpuidle_data) {
 -              ret = -ENODEV;
 -              goto out;
 -      }
 -      idle_state = cpuidle_data->idle_state;
 -      if (!idle_state->disabled) {
 -              ret = -EAGAIN;
 -              goto out;
 -      }
 -      idle_state->exit_latency = cpuidle_data->saved_exit_latency;
 -      cpuidle_driver_unref();
 -      genpd->cpuidle_data = NULL;
 -      kfree(cpuidle_data);
 -
 - out:
 -      mutex_unlock(&genpd->lock);
 -      return ret;
 -}
 -
 -/**
 - * pm_genpd_name_detach_cpuidle - Find PM domain and disconnect cpuidle from it.
 - * @name: Name of the domain to disconnect cpuidle from.
 - */
 -int pm_genpd_name_detach_cpuidle(const char *name)
 -{
 -      return pm_genpd_detach_cpuidle(pm_genpd_lookup_name(name));
 -}
 -
  /* Default device callbacks for generic PM domains. */
  
  /**

diff --cc drivers/clk/Kconfig
index 67826167a0e0af6ebf5fcca662e04554ab89569d,57316528e9240ab9db0c5e2585ad79211e291467..c3e3a02f7f1f9b288ac93a524db3615f6abb72ae
--- 1/drivers/clk/Kconfig
--- 2/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -131,7 -132,7 +142,7 @@@ config COMMON_CLK_AXI_CLKGE
  
  config CLK_QORIQ
        bool "Clock driver for Freescale QorIQ platforms"
-       depends on (PPC_E500MC || ARM || ARM64) && OF
 -      depends on (PPC_E500MC || ARM || COMPILE_TEST) && OF
++      depends on (PPC_E500MC || ARM || ARM64 || COMPILE_TEST) && OF
        ---help---
          This adds the clock driver support for Freescale QorIQ platforms
          using common clock framework.

diff --cc drivers/clk/Makefile
index 1ec1ce1849a72c84e64446769452d22a54fd3ae5,d3e1910eebaba6ed0bf765549582345d2470933e..820714c72d368e29fe211d1699c9a68202c98359
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -36,8 -36,8 +36,9 @@@ obj-$(CONFIG_COMMON_CLK_PALMAS)               += clk
  obj-$(CONFIG_CLK_QORIQ)                       += clk-qoriq.o
  obj-$(CONFIG_COMMON_CLK_RK808)                += clk-rk808.o
  obj-$(CONFIG_COMMON_CLK_S2MPS11)      += clk-s2mps11.o
 +obj-$(CONFIG_COMMON_CLK_SCPI)           += clk-scpi.o
  obj-$(CONFIG_COMMON_CLK_SI5351)               += clk-si5351.o
+ obj-$(CONFIG_COMMON_CLK_SI514)                += clk-si514.o
  obj-$(CONFIG_COMMON_CLK_SI570)                += clk-si570.o
  obj-$(CONFIG_COMMON_CLK_CDCE925)      += clk-cdce925.o
  obj-$(CONFIG_ARCH_STM32)              += clk-stm32f4.o

diff --cc drivers/clk/berlin/bg2q.c
Simple merge

diff --cc drivers/clk/rockchip/clk-mmc-phase.c
Simple merge

diff --cc drivers/clk/shmobile/clk-mstp.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_dw.c
Simple merge