Commit 18517746 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-for-5.9' of... 

Merge tag 'qcom-drivers-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/drivers

Qualcomm driver updates for v5.9

For RPMh this fixes an issue where ktime was used during suspend, allows
the driver to be used on ARM targets and some minor cleanups.

It adds support for the latest format version in the socinfo driver and
adds identifiers for SM8250 and SDM630.

SMD-RPM gains compatibles for MSM8994 and MSM8936 and the Qualcomm SCM
gains compatibles MSM8994 and IPQ8074.

The GENI core code gains interconnect path voting and performance level
support, with subsequent patches integrating this with the SPI, I2C,
UART and QSPI drivers.

Following this the KGDB support for the GENI serial driver is improved,
the performance related to chip-select is improved for SPI and QSPI.

* tag 'qcom-drivers-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (35 commits)
  soc: qcom: geni: Fix NULL pointer dereference
  tty: serial: qcom-geni-serial: Drop the icc bw votes in suspend for console
  serial: qcom_geni_serial: Always use 4 bytes per TX FIFO word
  serial: qcom_geni_serial: Make kgdb work even if UART isn't console
  spi: spi-geni-qcom: Get rid of most overhead in prepare_message()
  spi: spi-geni-qcom: Set the clock properly at runtime resume
  spi: spi-geni-qcom: Avoid clock setting if not needed
  spi: spi-qcom-qspi: Set an autosuspend delay of 250 ms
  spi: spi-qcom-qspi: Avoid clock setting if not needed
  spi: spi-qcom-qspi: Use OPP API to set clk/perf state
  firmware: qcom_scm: Add msm8994 compatible
  firmware: qcom_scm: Fix legacy convention SCM accessors
  <linux/of.h>: add stub for of_get_next_parent() to fix qcom build error
  dt-bindings: firmware: qcom: Add compatible for IPQ8074 SoC
  spi: spi-geni-qcom: Use OPP API to set clk/perf state
  tty: serial: qcom_geni_serial: Use OPP API to set clk/perf state
  spi: spi-qcom-qspi: Add interconnect support
  spi: spi-geni-qcom: Add interconnect support
  spi: spi-geni-qcom: Combine the clock setting code
  tty: serial: qcom_geni_serial: Add interconnect support
  ...

Link: https://lore.kernel.org/r/20200721044812.3429652-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e2837df6 03c900b3

Documentation/devicetree/bindings/firmware/qcom,scm.txt

+2 −0
Original line number Diff line number Diff line
@@ -11,10 +11,12 @@ Required properties: 
 * "qcom,scm-apq8084"

 * "qcom,scm-ipq4019"

 * "qcom,scm-ipq806x"

 * "qcom,scm-ipq8074"

 * "qcom,scm-msm8660"

 * "qcom,scm-msm8916"

 * "qcom,scm-msm8960"

 * "qcom,scm-msm8974"

 * "qcom,scm-msm8994"

 * "qcom,scm-msm8996"

 * "qcom,scm-msm8998"

 * "qcom,scm-sc7180"

Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt

+2 −0
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ resources. 
	Definition: must be one of:

		    "qcom,rpm-apq8084"

		    "qcom,rpm-msm8916"

		    "qcom,rpm-msm8936"

		    "qcom,rpm-msm8974"

		    "qcom,rpm-msm8976"

		    "qcom,rpm-msm8994"

		    "qcom,rpm-msm8998"

		    "qcom,rpm-sdm660"

		    "qcom,rpm-qcs404"

drivers/firmware/qcom_scm.c

+4 −4
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int __qcom_scm_set_dload_mode(struct device *dev, bool enable) 


	desc.args[1] = enable ? QCOM_SCM_BOOT_SET_DLOAD_MODE : 0;



	return qcom_scm_call(__scm->dev, &desc, NULL);

	return qcom_scm_call_atomic(__scm->dev, &desc, NULL);

}



static void qcom_scm_set_download_mode(bool enable)
@@ -650,7 +650,7 @@ int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val) 
	int ret;





	ret = qcom_scm_call(__scm->dev, &desc, &res);

	ret = qcom_scm_call_atomic(__scm->dev, &desc, &res);

	if (ret >= 0)

		*val = res.result[0];
@@ -669,8 +669,7 @@ int qcom_scm_io_writel(phys_addr_t addr, unsigned int val) 
		.owner = ARM_SMCCC_OWNER_SIP,

	};





	return qcom_scm_call(__scm->dev, &desc, NULL);

	return qcom_scm_call_atomic(__scm->dev, &desc, NULL);

}

EXPORT_SYMBOL(qcom_scm_io_writel);
@@ -1151,6 +1150,7 @@ static const struct of_device_id qcom_scm_dt_match[] = { 
							     SCM_HAS_IFACE_CLK |

							     SCM_HAS_BUS_CLK)

	},

	{ .compatible = "qcom,scm-msm8994" },

	{ .compatible = "qcom,scm-msm8996" },

	{ .compatible = "qcom,scm" },

	{}

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

+25 −1
Original line number Diff line number Diff line
@@ -557,6 +557,22 @@ static int geni_i2c_probe(struct platform_device *pdev) 
	gi2c->adap.dev.of_node = dev->of_node;

	strlcpy(gi2c->adap.name, "Geni-I2C", sizeof(gi2c->adap.name));



	ret = geni_icc_get(&gi2c->se, "qup-memory");

	if (ret)

		return ret;

	/*

	 * Set the bus quota for core and cpu to a reasonable value for

	 * register access.

	 * Set quota for DDR based on bus speed.

	 */

	gi2c->se.icc_paths[GENI_TO_CORE].avg_bw = GENI_DEFAULT_BW;

	gi2c->se.icc_paths[CPU_TO_GENI].avg_bw = GENI_DEFAULT_BW;

	gi2c->se.icc_paths[GENI_TO_DDR].avg_bw = Bps_to_icc(gi2c->clk_freq_out);



	ret = geni_icc_set_bw(&gi2c->se);

	if (ret)

		return ret;



	ret = geni_se_resources_on(&gi2c->se);

	if (ret) {

		dev_err(dev, "Error turning on resources %d\n", ret);
@@ -579,6 +595,10 @@ static int geni_i2c_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = geni_icc_disable(&gi2c->se);

	if (ret)

		return ret;



	dev_dbg(dev, "i2c fifo/se-dma mode. fifo depth:%d\n", tx_depth);



	gi2c->suspended = 1;
@@ -623,7 +643,7 @@ static int __maybe_unused geni_i2c_runtime_suspend(struct device *dev) 
		gi2c->suspended = 1;

	}



	return 0;

	return geni_icc_disable(&gi2c->se);

}



static int __maybe_unused geni_i2c_runtime_resume(struct device *dev)
@@ -631,6 +651,10 @@ static int __maybe_unused geni_i2c_runtime_resume(struct device *dev) 
	int ret;

	struct geni_i2c_dev *gi2c = dev_get_drvdata(dev);



	ret = geni_icc_enable(&gi2c->se);

	if (ret)

		return ret;



	ret = geni_se_resources_on(&gi2c->se);

	if (ret)

		return ret;

drivers/interconnect/qcom/bcm-voter.c

+1 −5
Original line number Diff line number Diff line
@@ -266,11 +266,7 @@ int qcom_icc_bcm_voter_commit(struct bcm_voter *voter) 
	if (!commit_idx[0])

		goto out;



	ret = rpmh_invalidate(voter->dev);

	if (ret) {

		pr_err("Error invalidating RPMH client (%d)\n", ret);

		goto out;

	}

	rpmh_invalidate(voter->dev);



	ret = rpmh_write_batch(voter->dev, RPMH_ACTIVE_ONLY_STATE,

			       cmds, commit_idx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE