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

Commit ae709bf8 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'qcom-drivers-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/late

Qualcomm ARM Based Driver Updates for v4.18

* Various SMEM updates/fixes
* Add qcom_smem_virt_to_phys SMEM API
* Update MAINTAINERS to include qcom_scm pattern
* Add Qualcomm Command DB driver
* Add Qualcomm SCM compatible for IPQ4019
* Add MSM8998 to smd-rpm compatible list
* Add Qualcomm GENI based QUP wrapper
* Fix Qualcomm QMI buffer sizing bug

* tag 'qcom-drivers-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  soc: qcom: smem: introduce qcom_smem_virt_to_phys()
  soc: qcom: qmi: fix a buffer sizing bug
  MAINTAINERS: Update pattern for qcom_scm
  soc: Unconditionally include qcom Makefile
  soc: qcom: smem: check sooner in qcom_smem_set_global_partition()
  soc: qcom: smem: fix qcom_smem_set_global_partition()
  soc: qcom: smem: fix off-by-one error in qcom_smem_alloc_private()
  soc: qcom: smem: byte swap values properly
  soc: qcom: smem: return proper type for cached entry functions
  soc: qcom: smem: fix first cache entry calculation
  soc: qcom: cmd-db: Make endian-agnostic
  drivers: qcom: add command DB driver
  soc: qcom: Add GENI based QUP Wrapper driver
  soc: qcom: smd-rpm: Add msm8998 compatible
  firmware: qcom: scm: Add ipq4019 soc compatible

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 67b8d5c7 6d361c1d

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

+2 −1
Original line number Diff line number Diff line
@@ -11,9 +11,10 @@ Required properties: 
 * "qcom,scm-msm8660" for MSM8660 platforms

 * "qcom,scm-msm8690" for MSM8690 platforms

 * "qcom,scm-msm8996" for MSM8996 platforms

 * "qcom,scm-ipq4019" for IPQ4019 platforms

 * "qcom,scm" for later processors (MSM8916, APQ8084, MSM8974, etc)

- clocks: One to three clocks may be required based on compatible.

 * No clock required for "qcom,scm-msm8996"

 * No clock required for "qcom,scm-msm8996", "qcom,scm-ipq4019"

 * Only core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660", and "qcom,scm-msm8960"

 * Core, iface, and bus clocks required for "qcom,scm"

- clock-names: Must contain "core" for the core clock, "iface" for the interface

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

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ resources. 
		    "qcom,rpm-apq8084"

		    "qcom,rpm-msm8916"

		    "qcom,rpm-msm8974"

		    "qcom,rpm-msm8998"



- qcom,smd-channels:

	Usage: required

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1817,7 +1817,7 @@ F: drivers/spi/spi-qup.c 
F:	drivers/tty/serial/msm_serial.c

F:	drivers/*/pm8???-*

F:	drivers/mfd/ssbi.c

F:	drivers/firmware/qcom_scm.c

F:	drivers/firmware/qcom_scm*

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git



ARM/RADISYS ENP2611 MACHINE SUPPORT

drivers/firmware/qcom_scm.c

+3 −0
Original line number Diff line number Diff line
@@ -603,6 +603,9 @@ static const struct of_device_id qcom_scm_dt_match[] = { 
	{ .compatible = "qcom,scm-msm8996",

	  .data = NULL, /* no clocks */

	},

	{ .compatible = "qcom,scm-ipq4019",

	  .data = NULL, /* no clocks */

	},

	{ .compatible = "qcom,scm",

	  .data = (void *)(SCM_HAS_CORE_CLK

			   | SCM_HAS_IFACE_CLK

drivers/of/platform.c

+1 −0
Original line number Diff line number Diff line
@@ -494,6 +494,7 @@ EXPORT_SYMBOL_GPL(of_platform_default_populate); 
#ifndef CONFIG_PPC

static const struct of_device_id reserved_mem_matches[] = {

	{ .compatible = "qcom,rmtfs-mem" },

	{ .compatible = "qcom,cmd-db" },

	{ .compatible = "ramoops" },

	{}

};