From: Tony Lindgren <tony@atomide.com>
Date: Mon, 11 Dec 2017 15:46:40 +0000 (-0800)
Subject: Merge branch '4.15-rc1-clkctrl-mach-omap2' of https://github.com/t-kristo/linux-pm... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fdf3632938a646c13f7407f2f8c33ff81eed9c76;p=openwrt%2Fstaging%2Fblogic.git

Merge branch '4.15-rc1-clkctrl-mach-omap2' of https://github.com/t-kristo/linux-pm into omap-for-v4.16/soc
---

fdf3632938a646c13f7407f2f8c33ff81eed9c76
diff --cc arch/arm/mach-omap2/cm.h
index 7b66e179e44e,39c9c10f3b1b..b19e83d53501
--- a/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);
+ u32 omap_cm_xlate_clkctrl(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);
 +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/cminst44xx.c
index 2e2274fe0238,0ea4c90da57d..7deefee49fc3
--- a/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,