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

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

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

Qualcomm driver updates for v5.11

This adds support for the core power domains on MSM8916, MSM8939, SDM660
and SDX55. It adds SM8150 support to the last-level cache controller
driver and it makes it possible to build the Command DB and RPMh drivers
as modules.

It also contains a slew of smaller cleanups, style and bug fixes
throughout the various drivers.

* tag 'qcom-drivers-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (39 commits)
  soc: qcom: rpmhpd: Add SDX55 power domains
  dt-bindings: power: Add rpm power domain bindings for sdx55
  soc: qcom: rpmh: Use __fill_rpmh_msg API during rpmh_write()
  samples: qmi: Constify static qmi ops
  soc: qcom: pdr: Constify static qmi structs
  soc: qcom: initialize local variable
  soc: qcom: socinfo: add soc ids for msm8953 variants
  soc: qcom: geni: Remove "iova" check
  soc: qcom: llcc: Add configuration data for SM8150
  dt-bindings: msm: Add LLCC for SM8150
  soc: qcom: rpmh: Fix possible doc-rot in rpmh_write()'s header
  soc: qcom: kryo-l2-accessors: Fix misnaming of 'val'
  soc: qcom: rpmhpd: Provide some missing struct member descriptions
  soc: qcom: llcc-qcom: Fix expected kernel-doc formatting
  soc: qcom: smp2p: Remove unused struct attribute provide another
  soc: qcom: wcnss_ctrl: Demote non-conformant struct header and fix function headers
  soc: qcom: smsm: Fix some kernel-doc formatting and naming problems
  soc: qcom: smem: Fix formatting and missing documentation issues
  soc: qcom: qcom-geni-se: Fix misnamed function parameter 'rx_rfr'
  soc: qcom: qcom_aoss: Add missing description for 'cooling_devs'
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 00c543f6 9c456626

Documentation/devicetree/bindings/arm/msm/qcom,llcc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
    enum:

      - qcom,sc7180-llcc

      - qcom,sdm845-llcc

      - qcom,sm8150-llcc



  reg:

    items:

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

+4 −0
Original line number Diff line number Diff line
@@ -16,12 +16,16 @@ description: 
properties:

  compatible:

    enum:

      - qcom,msm8916-rpmpd

      - qcom,msm8939-rpmpd

      - qcom,msm8976-rpmpd

      - qcom,msm8996-rpmpd

      - qcom,msm8998-rpmpd

      - qcom,qcs404-rpmpd

      - qcom,sdm660-rpmpd

      - qcom,sc7180-rpmhpd

      - qcom,sdm845-rpmhpd

      - qcom,sdx55-rpmhpd

      - qcom,sm8150-rpmhpd

      - qcom,sm8250-rpmhpd

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

+2 −4
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, 
		geni_se_select_mode(se, GENI_SE_FIFO);



	writel_relaxed(len, se->base + SE_I2C_RX_TRANS_LEN);

	geni_se_setup_m_cmd(se, I2C_READ, m_param);



	if (dma_buf && geni_se_rx_dma_prep(se, dma_buf, len, &rx_dma)) {

		geni_se_select_mode(se, GENI_SE_FIFO);
@@ -373,8 +374,6 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, 
		dma_buf = NULL;

	}



	geni_se_setup_m_cmd(se, I2C_READ, m_param);



	time_left = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT);

	if (!time_left)

		geni_i2c_abort_xfer(gi2c);
@@ -408,6 +407,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, 
		geni_se_select_mode(se, GENI_SE_FIFO);



	writel_relaxed(len, se->base + SE_I2C_TX_TRANS_LEN);

	geni_se_setup_m_cmd(se, I2C_WRITE, m_param);



	if (dma_buf && geni_se_tx_dma_prep(se, dma_buf, len, &tx_dma)) {

		geni_se_select_mode(se, GENI_SE_FIFO);
@@ -415,8 +415,6 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, 
		dma_buf = NULL;

	}



	geni_se_setup_m_cmd(se, I2C_WRITE, m_param);



	if (!dma_buf) /* Get FIFO IRQ */

		writel_relaxed(1, se->base + SE_GENI_TX_WATERMARK_REG);

drivers/soc/qcom/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ config QCOM_AOSS_QMP 
	  Subsystem (AOSS) using Qualcomm Messaging Protocol (QMP).



config QCOM_COMMAND_DB

	bool "Qualcomm Command DB"

	tristate "Qualcomm Command DB"

	depends on ARCH_QCOM || COMPILE_TEST

	depends on OF_RESERVED_MEM

	help
@@ -108,8 +108,9 @@ config QCOM_RMTFS_MEM 
	  Say y here if you intend to boot the modem remoteproc.



config QCOM_RPMH

	bool "Qualcomm RPM-Hardened (RPMH) Communication"

	tristate "Qualcomm RPM-Hardened (RPMH) Communication"

	depends on ARCH_QCOM || COMPILE_TEST

	depends on (QCOM_COMMAND_DB || !QCOM_COMMAND_DB)

	help

	  Support for communication with the hardened-RPM blocks in

	  Qualcomm Technologies Inc (QTI) SoCs. RPMH communication uses an

drivers/soc/qcom/cmd-db.c

+7 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. */

/* Copyright (c) 2016-2018, 2020, The Linux Foundation. All rights reserved. */



#include <linux/debugfs.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_reserved_mem.h>
@@ -340,12 +341,14 @@ static const struct of_device_id cmd_db_match_table[] = { 
	{ .compatible = "qcom,cmd-db" },

	{ }

};

MODULE_DEVICE_TABLE(of, cmd_db_match_table);



static struct platform_driver cmd_db_dev_driver = {

	.probe  = cmd_db_dev_probe,

	.driver = {

		   .name = "cmd-db",

		   .of_match_table = cmd_db_match_table,

		   .suppress_bind_attrs = true,

	},

};
@@ -354,3 +357,6 @@ static int __init cmd_db_device_init(void) 
	return platform_driver_register(&cmd_db_dev_driver);

}

arch_initcall(cmd_db_device_init);



MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Command DB Driver");

MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE