diff options
| author |   Tony Lindgren <tony@atomide.com> | 2017-12-11 07:46:40 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-12-11 07:46:40 -0800 |
| commit | fdf3632938a646c13f7407f2f8c33ff81eed9c76 (patch) | |
| tree | 9f8c982a2e40af006cffd2daad05eba4deedc04a /arch/arm/mach-omap2/cm33xx.c | |
| parent | ARM: OMAP2+: CM: make cm_ll_data structures as const (diff) | |
| parent | ARM: DM816x: hwmod_data: fix clockdomain name for sata hwmod (diff) | |
| download | wireguard-linux-fdf3632938a646c13f7407f2f8c33ff81eed9c76.tar.xz wireguard-linux-fdf3632938a646c13f7407f2f8c33ff81eed9c76.zip | |
Merge branch '4.15-rc1-clkctrl-mach-omap2' of https://github.com/t-kristo/linux-pm into omap-for-v4.16/soc
Diffstat (limited to 'arch/arm/mach-omap2/cm33xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cm33xx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/cm33xx.c b/arch/arm/mach-omap2/cm33xx.c index 0c9750fca387..1cc0247a2cb5 100644 --- a/arch/arm/mach-omap2/cm33xx.c +++ b/arch/arm/mach-omap2/cm33xx.c @@ -333,6 +333,11 @@ static int am33xx_clkdm_clk_disable(struct clockdomain *clkdm) return 0; } +static u32 am33xx_cm_xlate_clkctrl(u8 part, u16 inst, u16 offset) +{ + return cm_base.pa + inst + offset; +} + struct clkdm_ops am33xx_clkdm_operations = { .clkdm_sleep = am33xx_clkdm_sleep, .clkdm_wakeup = am33xx_clkdm_wakeup, @@ -347,6 +352,7 @@ static const struct cm_ll_data am33xx_cm_ll_data = { .wait_module_idle = &am33xx_cm_wait_module_idle, .module_enable = &am33xx_cm_module_enable, .module_disable = &am33xx_cm_module_disable, + .xlate_clkctrl = &am33xx_cm_xlate_clkctrl, }; int __init am33xx_cm_init(const struct omap_prcm_init_data *data) |