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

Commit 5aab1eef authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qcom-geni-se: Add debug logs for bus voting"

parents a7a52a19 db097e8b

drivers/i2c/busses/i2c-qcom-geni.c

+1 −0
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ static int geni_i2c_probe(struct platform_device *pdev) 
		return ret;

	}



	gi2c->i2c_rsc.ctrl_dev = gi2c->dev;

	gi2c->i2c_rsc.se_clk = devm_clk_get(&pdev->dev, "se-clk");

	if (IS_ERR(gi2c->i2c_rsc.se_clk)) {

		ret = PTR_ERR(gi2c->i2c_rsc.se_clk);

drivers/platform/msm/qcom-geni-se.c

+6 −6
Original line number Diff line number Diff line
@@ -675,9 +675,9 @@ static int geni_se_rmv_ab_ib(struct geni_se_device *geni_se_dev, 
						geni_se_dev->cur_ab,

						geni_se_dev->cur_ib);

	GENI_SE_DBG(geni_se_dev->log_ctx, false, NULL,

		    "%s: %lu:%lu (%lu:%lu) %d\n", __func__,

		    geni_se_dev->cur_ab, geni_se_dev->cur_ib,

		    rsc->ab, rsc->ib, bus_bw_update);

			"%s: %s: cur_ab_ib(%lu:%lu) req_ab_ib(%lu:%lu) %d\n",

			__func__, dev_name(rsc->ctrl_dev), geni_se_dev->cur_ab,

			geni_se_dev->cur_ib, rsc->ab, rsc->ib, bus_bw_update);

	mutex_unlock(&geni_se_dev->geni_dev_lock);

	return ret;

}
@@ -773,9 +773,9 @@ static int geni_se_add_ab_ib(struct geni_se_device *geni_se_dev, 
						geni_se_dev->cur_ab,

						geni_se_dev->cur_ib);

	GENI_SE_DBG(geni_se_dev->log_ctx, false, NULL,

		    "%s: %lu:%lu (%lu:%lu) %d\n", __func__,

		    geni_se_dev->cur_ab, geni_se_dev->cur_ib,

		    rsc->ab, rsc->ib, bus_bw_update);

			"%s: %s: cur_ab_ib(%lu:%lu) req_ab_ib(%lu:%lu) %d\n",

			__func__, dev_name(rsc->ctrl_dev), geni_se_dev->cur_ab,

			geni_se_dev->cur_ib, rsc->ab, rsc->ib, bus_bw_update);

	mutex_unlock(&geni_se_dev->geni_dev_lock);

	return ret;

}

drivers/spi/spi-geni-qcom.c

+1 −0
Original line number Diff line number Diff line
@@ -1367,6 +1367,7 @@ static int spi_geni_probe(struct platform_device *pdev) 
		goto spi_geni_probe_err;

	}



	geni_mas->spi_rsc.ctrl_dev = geni_mas->dev;

	rsc->geni_pinctrl = devm_pinctrl_get(&pdev->dev);

	if (IS_ERR_OR_NULL(rsc->geni_pinctrl)) {

		dev_err(&pdev->dev, "No pinctrl config specified!\n");

drivers/tty/serial/msm_geni_serial.c

+2 −0
Original line number Diff line number Diff line
@@ -2427,6 +2427,8 @@ static int msm_geni_serial_probe(struct platform_device *pdev) 
	if (ret)

		goto exit_geni_serial_probe;



	dev_port->serial_rsc.ctrl_dev = &pdev->dev;



	if (of_property_read_u32(pdev->dev.of_node, "qcom,wakeup-byte",

					&wake_char)) {

		dev_dbg(&pdev->dev, "No Wakeup byte specified\n");

include/linux/qcom-geni-se.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ enum se_protocol_types { 


/**

 * struct geni_se_rsc - GENI Serial Engine Resource

 * @ctrl_dev		Pointer to controller device.

 * @wrapper_dev:	Pointer to the parent QUPv3 core.

 * @se_clk:		Handle to the core serial engine clock.

 * @m_ahb_clk:		Handle to the primary AHB clock.
@@ -53,6 +54,7 @@ enum se_protocol_types { 
 * @geni_gpi_sleep:	Handle to the sleep pinctrl state.

 */

struct se_geni_rsc {

	struct device *ctrl_dev;

	struct device *wrapper_dev;

	struct clk *se_clk;

	struct clk *m_ahb_clk;