Merge branch 'omap-for-v4.14/fixes' into omap-for-v4.15/fixes-v2 (124dcf79) · Commits · 戴 / test

arch/arm/mach-omap2/cm_common.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -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,
		u8 *idlest_reg_id)
		{
		int ret;
		if (!cm_ll_data->split_idlest_reg) {
		WARN_ONCE(1, "cm: %s: no low-level function defined\n",
		__func__);
		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);
		*prcm_inst -= cm_base.offset;
		return ret;
		}

		/**
		@@ -337,6 +340,7 @@ int __init omap2_cm_base_init(void)
		if (mem) {
		mem->pa = res.start + data->offset;
		mem->va = data->mem + data->offset;
		mem->offset = data->offset;
		}

		data->np = np;

+1 −0

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

+1 −0