Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb88b86c authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

bus: ti-sysc: allow reset sharing across devices 



Some devices need to share their reset signals, like DSP MMUs, thus drop
the exclusive notation from reset request. Also, balance the init time
reset count, otherwise the resets will never be applied post boot.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4345f0dc

drivers/bus/ti-sysc.c

+9 −3
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static void sysc_clkdm_allow_idle(struct sysc *ddata) 
static int sysc_init_resets(struct sysc *ddata)

{

	ddata->rsts =

		devm_reset_control_get_optional(ddata->dev, "rstctrl");

		devm_reset_control_get_optional_shared(ddata->dev, "rstctrl");

	if (IS_ERR(ddata->rsts))

		return PTR_ERR(ddata->rsts);
@@ -1527,7 +1527,7 @@ static int sysc_legacy_init(struct sysc *ddata) 
 */

static int sysc_rstctrl_reset_deassert(struct sysc *ddata, bool reset)

{

	int error, val;

	int error;



	if (!ddata->rsts)

		return 0;
@@ -1538,7 +1538,9 @@ static int sysc_rstctrl_reset_deassert(struct sysc *ddata, bool reset) 
			return error;

	}



	return reset_control_deassert(ddata->rsts);

	reset_control_deassert(ddata->rsts);



	return 0;

}



/*
@@ -2415,6 +2417,10 @@ static int sysc_probe(struct platform_device *pdev) 
		goto unprepare;

	}



	/* Balance reset counts */

	if (ddata->rsts)

		reset_control_assert(ddata->rsts);



	sysc_show_registers(ddata);



	ddata->dev->type = &sysc_device_type;