Merge branch '4.15-rc1-clkctrl-mach-omap2' of https://github.com/t-kristo/linux-pm...

diff --cc arch/arm/mach-omap2/cm.h
index 7b66e17,39c9c10..b19e83d
--- 1/arch/arm/mach-omap2/cm.h
--- 2/arch/arm/mach-omap2/cm.h
+++ b/arch/arm/mach-omap2/cm.h
@@@ -72,8 -74,9 +74,9 @@@ int omap_cm_wait_module_idle(u8 part, s
                             u8 idlest_shift);
  int omap_cm_module_enable(u8 mode, u8 part, u16 inst, u16 clkctrl_offs);
  int omap_cm_module_disable(u8 part, u16 inst, u16 clkctrl_offs);
 -extern int cm_register(struct cm_ll_data *cld);
 -extern int cm_unregister(struct cm_ll_data *cld);
+ u32 omap_cm_xlate_clkctrl(u8 part, u16 inst, u16 clkctrl_offs);
 +extern int cm_register(const struct cm_ll_data *cld);
 +extern int cm_unregister(const struct cm_ll_data *cld);
  int omap_cm_init(void);
  int omap2_cm_base_init(void);
  

diff --cc arch/arm/mach-omap2/cm33xx.c
Simple merge

diff --cc arch/arm/mach-omap2/cm_common.c
Simple merge

diff --cc arch/arm/mach-omap2/cminst44xx.c
index 2e2274f,0ea4c90..7deefee
--- 1/arch/arm/mach-omap2/cminst44xx.c
--- 2/arch/arm/mach-omap2/cminst44xx.c
+++ b/arch/arm/mach-omap2/cminst44xx.c
@@@ -509,10 -505,9 +505,9 @@@ struct clkdm_ops am43xx_clkdm_operation
        .clkdm_deny_idle        = omap4_clkdm_deny_idle,
        .clkdm_clk_enable       = omap4_clkdm_clk_enable,
        .clkdm_clk_disable      = omap4_clkdm_clk_disable,
-       .clkdm_xlate_address    = omap4_clkdm_xlate_address,
  };
  
 -static struct cm_ll_data omap4xxx_cm_ll_data = {
 +static const struct cm_ll_data omap4xxx_cm_ll_data = {
        .wait_module_ready      = &omap4_cminst_wait_module_ready,
        .wait_module_idle       = &omap4_cminst_wait_module_idle,
        .module_enable          = &omap4_cminst_module_enable,