UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'omap-for-v4.14/fixes' into omap-for-v4.15/fixes-v2

This commit is contained in:
Tony Lindgren 2017-11-28 08:22:57 -08:00
parent 2db57789e6 6301d58477
commit 124dcf7960
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-omap2/cm_common.c
View File

@ -68,14 +68,17 @@ void __init omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2)
int cm_split_idlest_reg(struct clk_omap_reg *idlest_reg, s16 *prcm_inst, int cm_split_idlest_reg(struct clk_omap_reg *idlest_reg, s16 *prcm_inst,
u8 *idlest_reg_id) u8 *idlest_reg_id)
{ {
int ret;
if (!cm_ll_data->split_idlest_reg) { if (!cm_ll_data->split_idlest_reg) {
WARN_ONCE(1, "cm: %s: no low-level function defined\n", WARN_ONCE(1, "cm: %s: no low-level function defined\n",
__func__); __func__);
return -EINVAL; return -EINVAL;
} }
return cm_ll_data->split_idlest_reg(idlest_reg, prcm_inst, ret = cm_ll_data->split_idlest_reg(idlest_reg, prcm_inst,
idlest_reg_id); idlest_reg_id);
*prcm_inst -= cm_base.offset;
return ret;
} }
/** /**
@ -337,6 +340,7 @@ int __init omap2_cm_base_init(void)
if (mem) { if (mem) {
mem->pa = res.start + data->offset; mem->pa = res.start + data->offset;
mem->va = data->mem + data->offset; mem->va = data->mem + data->offset;
mem->offset = data->offset;
} }
data->np = np; data->np = np;

1
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
View File

@ -1646,6 +1646,7 @@ static struct omap_hwmod omap3xxx_mmc3_hwmod = {
.main_clk = "mmchs3_fck", .main_clk = "mmchs3_fck",
.prcm = { .prcm = {
.omap2 = { .omap2 = {
.module_offs = CORE_MOD,
.prcm_reg_id = 1, .prcm_reg_id = 1,
.module_bit = OMAP3430_EN_MMC3_SHIFT, .module_bit = OMAP3430_EN_MMC3_SHIFT,
.idlest_reg_id = 1, .idlest_reg_id = 1,

1
arch/arm/mach-omap2/prcm-common.h
View File

@ -528,6 +528,7 @@ struct omap_prcm_irq_setup {
struct omap_domain_base { struct omap_domain_base {
u32 pa; u32 pa;
void __iomem *va; void __iomem *va;
s16 offset;
}; };
/** /**